Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
197326d1
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,发现更多精彩内容 >>
提交
197326d1
编写于
2月 24, 2016
作者:
J
Jeffrey Seyfried
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve: include normal modules in the ribs
上级
d3929b2c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
15 deletion
+43
-15
src/librustc_resolve/lib.rs
src/librustc_resolve/lib.rs
+21
-15
src/test/compile-fail/issue-31845.rs
src/test/compile-fail/issue-31845.rs
+22
-0
未找到文件。
src/librustc_resolve/lib.rs
浏览文件 @
197326d1
...
...
@@ -731,8 +731,8 @@ enum RibKind<'a> {
// We're in a constant item. Can't refer to dynamic stuff.
ConstantItemRibKind
,
// We passed through a
n anonymous
module.
Anonymous
ModuleRibKind
(
Module
<
'a
>
),
// We passed through a module.
ModuleRibKind
(
Module
<
'a
>
),
}
#[derive(Copy,
Clone)]
...
...
@@ -1653,16 +1653,20 @@ fn report_unresolved_imports(&mut self, module_: Module<'a>) {
fn
with_scope
<
F
>
(
&
mut
self
,
id
:
NodeId
,
f
:
F
)
where
F
:
FnOnce
(
&
mut
Resolver
)
{
let
orig_module
=
self
.current_module
;
if
let
Some
(
module
)
=
self
.current_module.module_children
.borrow
()
.get
(
&
id
)
{
// Move down in the graph.
let
orig_module
=
::
std
::
mem
::
replace
(
&
mut
self
.current_module
,
module
);
self
.value_ribs
.push
(
Rib
::
new
(
ModuleRibKind
(
module
)));
self
.type_ribs
.push
(
Rib
::
new
(
ModuleRibKind
(
module
)));
// Move down in the graph.
if
let
Some
(
module
)
=
orig_module
.module_children
.borrow
()
.get
(
&
id
)
{
self
.current_module
=
module
;
}
f
(
self
);
f
(
self
);
self
.current_module
=
orig_module
;
self
.current_module
=
orig_module
;
self
.value_ribs
.pop
();
self
.type_ribs
.pop
();
}
else
{
f
(
self
);
}
}
/// Searches the current set of local scopes for labels.
...
...
@@ -2239,8 +2243,8 @@ fn resolve_block(&mut self, block: &Block) {
if
let
Some
(
anonymous_module
)
=
anonymous_module
{
debug!
(
"(resolving block) found anonymous module, moving down"
);
self
.value_ribs
.push
(
Rib
::
new
(
Anonymous
ModuleRibKind
(
anonymous_module
)));
self
.type_ribs
.push
(
Rib
::
new
(
Anonymous
ModuleRibKind
(
anonymous_module
)));
self
.value_ribs
.push
(
Rib
::
new
(
ModuleRibKind
(
anonymous_module
)));
self
.type_ribs
.push
(
Rib
::
new
(
ModuleRibKind
(
anonymous_module
)));
self
.current_module
=
anonymous_module
;
}
else
{
self
.value_ribs
.push
(
Rib
::
new
(
NormalRibKind
));
...
...
@@ -2817,7 +2821,7 @@ fn adjust_local_def(&mut self, local_def: LocalDef, span: Span) -> Option<Def> {
Def
::
Local
(
_
,
node_id
)
=>
{
for
rib
in
ribs
{
match
rib
.kind
{
NormalRibKind
|
Anonymous
ModuleRibKind
(
..
)
=>
{
NormalRibKind
|
ModuleRibKind
(
..
)
=>
{
// Nothing to do. Continue.
}
ClosureRibKind
(
function_id
)
=>
{
...
...
@@ -2866,7 +2870,7 @@ fn adjust_local_def(&mut self, local_def: LocalDef, span: Span) -> Option<Def> {
for
rib
in
ribs
{
match
rib
.kind
{
NormalRibKind
|
MethodRibKind
|
ClosureRibKind
(
..
)
|
Anonymous
ModuleRibKind
(
..
)
=>
{
ModuleRibKind
(
..
)
=>
{
// Nothing to do. Continue.
}
ItemRibKind
=>
{
...
...
@@ -3024,7 +3028,7 @@ fn resolve_identifier_in_local_ribs(&mut self,
}
}
if
let
Anonymous
ModuleRibKind
(
module
)
=
self
.get_ribs
(
namespace
)[
i
]
.kind
{
if
let
ModuleRibKind
(
module
)
=
self
.get_ribs
(
namespace
)[
i
]
.kind
{
if
let
Success
(
binding
)
=
self
.resolve_name_in_module
(
module
,
ident
.unhygienic_name
,
namespace
,
...
...
@@ -3034,6 +3038,8 @@ fn resolve_identifier_in_local_ribs(&mut self,
return
Some
(
LocalDef
::
from_def
(
def
));
}
}
// We can only see through anonymous modules
if
module
.def
.is_some
()
{
return
None
;
}
}
}
...
...
src/test/compile-fail/issue-31845.rs
0 → 100644
浏览文件 @
197326d1
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// Checks lexical scopes cannot see through normal module boundries
fn
f
()
{
fn
g
()
{}
mod
foo
{
fn
h
()
{
g
();
//~ ERROR unresolved name
}
}
}
fn
main
()
{}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录