diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2017-12-04 21:17:42 -0800 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2017-12-05 17:23:01 -0800 |
| commit | 1b9d0584a044cf63259601498cfd2a70ab213284 (patch) | |
| tree | 215c07a34ef951949cca383c3cb5fa35db4d9625 /src/librustc_resolve | |
| parent | 58e80400b24c09624ee602746c80d25aa18e0c86 (diff) | |
| download | rust-1b9d0584a044cf63259601498cfd2a70ab213284.tar.gz rust-1b9d0584a044cf63259601498cfd2a70ab213284.zip | |
Add field `is_import` to `def::Export`.
Diffstat (limited to 'src/librustc_resolve')
| -rw-r--r-- | src/librustc_resolve/build_reduced_graph.rs | 4 | ||||
| -rw-r--r-- | src/librustc_resolve/macros.rs | 1 | ||||
| -rw-r--r-- | src/librustc_resolve/resolve_imports.rs | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs index f19c1998d10..33fe432f067 100644 --- a/src/librustc_resolve/build_reduced_graph.rs +++ b/src/librustc_resolve/build_reduced_graph.rs @@ -466,7 +466,7 @@ impl<'a> Resolver<'a> { /// Builds the reduced graph for a single item in an external crate. fn build_reduced_graph_for_external_crate_def(&mut self, parent: Module<'a>, child: Export) { - let Export { ident, def, vis, span } = child; + let Export { ident, def, vis, span, .. } = child; let def_id = def.def_id(); let expansion = Mark::root(); // FIXME(jseyfried) intercrate hygiene match def { @@ -672,7 +672,7 @@ impl<'a> Resolver<'a> { let result = self.resolve_ident_in_module(module, ident, MacroNS, false, false, span); if let Ok(binding) = result { let (def, vis) = (binding.def(), binding.vis); - self.macro_exports.push(Export { ident, def, vis, span }); + self.macro_exports.push(Export { ident, def, vis, span, is_import: true }); } else { span_err!(self.session, span, E0470, "reexported macro not found"); } diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index ad1e70a5c6e..f2162f2321f 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -751,6 +751,7 @@ impl<'a> Resolver<'a> { def: def, vis: ty::Visibility::Public, span: item.span, + is_import: false, }); } else { self.unused_macros.insert(def_id); diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs index e885ec53631..ed66a1c2d79 100644 --- a/src/librustc_resolve/resolve_imports.rs +++ b/src/librustc_resolve/resolve_imports.rs @@ -866,6 +866,7 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> { def: def, span: binding.span, vis: binding.vis, + is_import: true, }); } } |