---

yaml
---
r: 272262
b: refs/heads/auto
c: b83739a
h: refs/heads/master

Author: jseyfried

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: fc06ea5f9c904df1325b9e886353e561ea2ba385
+refs/heads/auto: b83739af4e4687469638f760bba60c9ad362ec34
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_resolve/resolve_imports.rs

@@ -59,6 +59,7 @@ impl ImportDirectiveSubclass {
 #[derive(Debug,Clone)]
 pub struct ImportDirective<'a> {
     module_path: Vec<Name>,
+    target_module: Cell<Option<Module<'a>>>, // the resolution of `module_path`
     subclass: ImportDirectiveSubclass,
     span: Span,
     id: NodeId,
@@ -76,6 +77,7 @@ impl<'a> ImportDirective<'a> {
                -> Self {
         ImportDirective {
             module_path: module_path,
+            target_module: Cell::new(None),
             subclass: subclass,
             span: span,
             id: id,
@@ -435,6 +437,7 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
             Indeterminate => return Indeterminate,
             Failed(err) => return Failed(err),
         };
+        directive.target_module.set(Some(target_module));
 
         let (source, target, value_determined, type_determined) = match directive.subclass {
             SingleImport { source, target, ref value_determined, ref type_determined } =>