Skip to content

Commit dfffdcb

Browse files
committed
---
yaml --- r: 273889 b: refs/heads/beta c: b83739a h: refs/heads/master i: 273887: b11c9c6
1 parent 9cab203 commit dfffdcb

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: fc06ea5f9c904df1325b9e886353e561ea2ba385
26+
refs/heads/beta: b83739af4e4687469638f760bba60c9ad362ec34
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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)