diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-03 23:25:46 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-11 00:12:08 +0300 |
| commit | 8bc187d1047b3680efe2cda53dcc83f45012578b (patch) | |
| tree | ef88eb8c2435d3033fc8c6cb999e7984235677d4 | |
| parent | 3041ec61185d6f9795ff16cc345e8f11b06edbbf (diff) | |
| download | rust-8bc187d1047b3680efe2cda53dcc83f45012578b.tar.gz rust-8bc187d1047b3680efe2cda53dcc83f45012578b.zip | |
resolve: Include stdlib prelude into name lookup in macro namespace
This is going to be used when built-in macros are defined through libcore and made available to other crates through standard library prelude
| -rw-r--r-- | src/librustc_resolve/macros.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index 30969948c4c..7cb33ca3ed4 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -867,7 +867,7 @@ impl<'a> Resolver<'a> { } } } - WhereToResolve::MacroUsePrelude => WhereToResolve::BuiltinMacros, + WhereToResolve::MacroUsePrelude => WhereToResolve::StdLibPrelude, WhereToResolve::BuiltinMacros => WhereToResolve::BuiltinAttrs, WhereToResolve::BuiltinAttrs => WhereToResolve::LegacyPluginHelpers, WhereToResolve::LegacyPluginHelpers => break, // nowhere else to search @@ -877,7 +877,7 @@ impl<'a> Resolver<'a> { WhereToResolve::StdLibPrelude => match ns { TypeNS => WhereToResolve::BuiltinTypes, ValueNS => break, // nowhere else to search - MacroNS => unreachable!(), + MacroNS => WhereToResolve::BuiltinMacros, } WhereToResolve::BuiltinTypes => break, // nowhere else to search }; |
