Improve `Self`.

b13392f7 · Jeffrey Seyfried · 754fdad4 · b13392f7
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

src/librustc_resolve/lib.rs src/librustc_resolve/lib.rs +5 -1

未找到文件。
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1519,7 +1519,11 @@ fn resolve_ident_in_lexical_scope(&mut self,
                                      path_span: Span)
                                      -> Option<LexicalScopeBinding<'a>> {
        if ns == TypeNS {
-            ident.ctxt = ident.ctxt.modern();
+            ident.ctxt = if ident.name == keywords::SelfType.name() {
+                SyntaxContext::empty() // FIXME(jseyfried) improve `Self` hygiene
+            } else {
+                ident.ctxt.modern()
+            }
        }

        // Walk backwards up the ribs in scope.