Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
d107d225
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d107d225
编写于
8月 17, 2016
作者:
J
Jeffrey Seyfried
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor `module.add_import_directive()` -> `resolver.add_import_directive()`.
上级
aef6971c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
10 deletion
+11
-10
src/librustc_resolve/build_reduced_graph.rs
src/librustc_resolve/build_reduced_graph.rs
+3
-3
src/librustc_resolve/resolve_imports.rs
src/librustc_resolve/resolve_imports.rs
+8
-7
未找到文件。
src/librustc_resolve/build_reduced_graph.rs
浏览文件 @
d107d225
...
...
@@ -130,7 +130,7 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, parent_ref: &mut Module<
let
subclass
=
ImportDirectiveSubclass
::
single
(
binding
.name
,
source_name
);
let
span
=
view_path
.span
;
parent
.add_import_directive
(
module_path
,
subclass
,
span
,
item
.id
,
vis
);
self
.add_import_directive
(
module_path
,
subclass
,
span
,
item
.id
,
vis
);
self
.unresolved_imports
+=
1
;
}
ViewPathList
(
_
,
ref
source_items
)
=>
{
...
...
@@ -176,14 +176,14 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, parent_ref: &mut Module<
};
let
subclass
=
ImportDirectiveSubclass
::
single
(
rename
,
name
);
let
(
span
,
id
)
=
(
source_item
.span
,
source_item
.node
.id
());
parent
.add_import_directive
(
module_path
,
subclass
,
span
,
id
,
vis
);
self
.add_import_directive
(
module_path
,
subclass
,
span
,
id
,
vis
);
self
.unresolved_imports
+=
1
;
}
}
ViewPathGlob
(
_
)
=>
{
let
subclass
=
GlobImport
{
is_prelude
:
is_prelude
};
let
span
=
view_path
.span
;
parent
.add_import_directive
(
module_path
,
subclass
,
span
,
item
.id
,
vis
);
self
.add_import_directive
(
module_path
,
subclass
,
span
,
item
.id
,
vis
);
self
.unresolved_imports
+=
1
;
}
}
...
...
src/librustc_resolve/resolve_imports.rs
浏览文件 @
d107d225
...
...
@@ -212,8 +212,11 @@ pub fn resolve_name(&self, name: Name, ns: Namespace, allow_private_imports: boo
Failed
(
None
)
}
}
pub
fn
add_import_directive
(
&
self
,
impl
<
'a
>
Resolver
<
'a
>
{
// Add an import directive to the current module.
pub
fn
add_import_directive
(
&
mut
self
,
module_path
:
Vec
<
Name
>
,
subclass
:
ImportDirectiveSubclass
,
span
:
Span
,
...
...
@@ -228,23 +231,21 @@ pub fn add_import_directive(&self,
vis
:
vis
,
});
self
.unresolved_imports
.borrow_mut
()
.push
(
directive
);
self
.
current_module.
unresolved_imports
.borrow_mut
()
.push
(
directive
);
match
directive
.subclass
{
SingleImport
{
target
,
..
}
=>
{
for
&
ns
in
&
[
ValueNS
,
TypeNS
]
{
self
.resolution
(
target
,
ns
)
.borrow_mut
()
.single_imports
.add_directive
(
directive
);
let
mut
resolution
=
self
.current_module
.resolution
(
target
,
ns
)
.borrow_mut
();
resolution
.single_imports
.add_directive
(
directive
);
}
}
// We don't add prelude imports to the globs since they only affect lexical scopes,
// which are not relevant to import resolution.
GlobImport
{
is_prelude
:
true
}
=>
{}
GlobImport
{
..
}
=>
self
.globs
.borrow_mut
()
.push
(
directive
),
GlobImport
{
..
}
=>
self
.
current_module.
globs
.borrow_mut
()
.push
(
directive
),
}
}
}
impl
<
'a
>
Resolver
<
'a
>
{
// Given a binding and an import directive that resolves to it,
// return the corresponding binding defined by the import directive.
fn
import
(
&
mut
self
,
binding
:
&
'a
NameBinding
<
'a
>
,
directive
:
&
'a
ImportDirective
<
'a
>
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录