Skip to content

Commit 2849b0f

Browse files
committed
---
yaml --- r: 276808 b: refs/heads/try c: b83739a h: refs/heads/master
1 parent 69ed8e8 commit 2849b0f

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: fc06ea5f9c904df1325b9e886353e561ea2ba385
4+
refs/heads/try: b83739af4e4687469638f760bba60c9ad362ec34
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_resolve/resolve_imports.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ impl ImportDirectiveSubclass {
5959
#[derive(Debug,Clone)]
6060
pub struct ImportDirective<'a> {
6161
module_path: Vec<Name>,
62+
target_module: Cell<Option<Module<'a>>>, // the resolution of `module_path`
6263
subclass: ImportDirectiveSubclass,
6364
span: Span,
6465
id: NodeId,
@@ -76,6 +77,7 @@ impl<'a> ImportDirective<'a> {
7677
-> Self {
7778
ImportDirective {
7879
module_path: module_path,
80+
target_module: Cell::new(None),
7981
subclass: subclass,
8082
span: span,
8183
id: id,
@@ -435,6 +437,7 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
435437
Indeterminate => return Indeterminate,
436438
Failed(err) => return Failed(err),
437439
};
440+
directive.target_module.set(Some(target_module));
438441

439442
let (source, target, value_determined, type_determined) = match directive.subclass {
440443
SingleImport { source, target, ref value_determined, ref type_determined } =>

0 commit comments

Comments
 (0)