Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
b5b403ab
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,发现更多精彩内容 >>
提交
b5b403ab
编写于
12月 21, 2013
作者:
P
Patrick Walton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
librustc: De-`@mut` `Module::external_module_children`
上级
ea63a185
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
45 addition
and
17 deletion
+45
-17
src/librustc/middle/resolve.rs
src/librustc/middle/resolve.rs
+45
-17
未找到文件。
src/librustc/middle/resolve.rs
浏览文件 @
b5b403ab
...
...
@@ -425,7 +425,7 @@ struct Module {
// The external module children of this node that were declared with
// `extern mod`.
external_module_children
:
@
mut
HashMap
<
Name
,
@
Module
>
,
external_module_children
:
RefCell
<
HashMap
<
Name
,
@
Module
>
>
,
// The anonymous children of this node. Anonymous children are pseudo-
// modules that are implicitly created around items contained within
...
...
@@ -472,7 +472,7 @@ fn new(parent_link: ParentLink,
is_public
:
is_public
,
children
:
@
mut
HashMap
::
new
(),
imports
:
@
mut
~
[],
external_module_children
:
@
mut
HashMap
::
new
(
),
external_module_children
:
RefCell
::
new
(
HashMap
::
new
()
),
anonymous_children
:
@
mut
HashMap
::
new
(),
import_resolutions
:
@
mut
HashMap
::
new
(),
glob_count
:
Cell
::
new
(
0
),
...
...
@@ -1506,9 +1506,13 @@ fn build_reduced_graph_for_view_item(&mut self,
false
,
true
);
parent
.external_module_children
.insert
(
name
.name
,
external_module
);
{
let
mut
external_module_children
=
parent
.external_module_children
.borrow_mut
();
external_module_children
.get
()
.insert
(
name
.name
,
external_module
);
}
self
.build_reduced_graph_for_external_crate
(
external_module
);
...
...
@@ -2352,13 +2356,18 @@ fn get_binding(this: &mut Resolver,
match
type_result
{
BoundResult
(
..
)
=>
{}
_
=>
{
match
containing_module
.external_module_children
.find
(
&
source
.name
)
{
let
module_opt
=
{
let
mut
external_module_children
=
containing_module
.external_module_children
.borrow_mut
();
external_module_children
.get
()
.find_copy
(
&
source
.name
)
};
match
module_opt
{
None
=>
{}
// Continue.
Some
(
module
)
=>
{
let
name_bindings
=
@
mut
Resolver
::
create_name_bindings_from_module
(
*
module
);
module
);
type_result
=
BoundResult
(
containing_module
,
name_bindings
);
used_public
=
true
;
...
...
@@ -2565,10 +2574,14 @@ fn resolve_glob_import(&mut self,
}
// Add external module children from the containing module.
for
(
&
name
,
module
)
in
containing_module
.external_module_children
.iter
()
{
let
name_bindings
=
@
mut
Resolver
::
create_name_bindings_from_module
(
*
module
);
merge_import_resolution
(
name
,
name_bindings
);
{
let
external_module_children
=
containing_module
.external_module_children
.borrow
();
for
(
&
name
,
module
)
in
external_module_children
.get
()
.iter
()
{
let
name_bindings
=
@
mut
Resolver
::
create_name_bindings_from_module
(
*
module
);
merge_import_resolution
(
name
,
name_bindings
);
}
}
// Record the destination of this import
...
...
@@ -2861,12 +2874,17 @@ fn resolve_item_in_lexical_scope(&mut self,
// Search for external modules.
if
namespace
==
TypeNS
{
match
module_
.external_module_children
.find
(
&
name
.name
)
{
let
module_opt
=
{
let
external_module_children
=
module_
.external_module_children
.borrow
();
external_module_children
.get
()
.find_copy
(
&
name
.name
)
};
match
module_opt
{
None
=>
{}
Some
(
module
)
=>
{
let
name_bindings
=
@
mut
Resolver
::
create_name_bindings_from_module
(
*
module
);
module
);
debug!
(
"lower name bindings succeeded"
);
return
Success
((
Target
::
new
(
module_
,
name_bindings
),
false
));
}
...
...
@@ -3133,12 +3151,17 @@ fn resolve_name_in_module(&mut self,
// Finally, search through external children.
if
namespace
==
TypeNS
{
match
module_
.external_module_children
.find
(
&
name
.name
)
{
let
module_opt
=
{
let
external_module_children
=
module_
.external_module_children
.borrow
();
external_module_children
.get
()
.find_copy
(
&
name
.name
)
};
match
module_opt
{
None
=>
{}
Some
(
module
)
=>
{
let
name_bindings
=
@
mut
Resolver
::
create_name_bindings_from_module
(
*
module
);
module
);
return
Success
((
Target
::
new
(
module_
,
name_bindings
),
false
));
}
}
...
...
@@ -4664,7 +4687,12 @@ fn resolve_definition_of_name_in_module(&mut self,
// Finally, search through external children.
if
namespace
==
TypeNS
{
match
containing_module
.external_module_children
.find
(
&
name
.name
)
{
let
module_opt
=
{
let
external_module_children
=
containing_module
.external_module_children
.borrow
();
external_module_children
.get
()
.find_copy
(
&
name
.name
)
};
match
module_opt
{
None
=>
{}
Some
(
module
)
=>
{
match
module
.def_id
.get
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录