Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
60133aa6
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,发现更多精彩内容 >>
提交
60133aa6
编写于
7月 14, 2015
作者:
G
Guillaume Gomez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove macro, import function and enum
上级
31262c20
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
155 addition
and
158 deletion
+155
-158
src/librustc_resolve/build_reduced_graph.rs
src/librustc_resolve/build_reduced_graph.rs
+10
-9
src/librustc_resolve/lib.rs
src/librustc_resolve/lib.rs
+142
-147
src/librustc_resolve/resolve_imports.rs
src/librustc_resolve/resolve_imports.rs
+3
-2
未找到文件。
src/librustc_resolve/build_reduced_graph.rs
浏览文件 @
60133aa6
...
...
@@ -26,6 +26,7 @@
use
Resolver
;
use
resolve_imports
::
Shadowable
;
use
TypeNsDef
;
use
{
resolve_error
,
ResolutionError
};
use
self
::
DuplicateCheckingMode
::
*
;
use
self
::
NamespaceError
::
*
;
...
...
@@ -208,12 +209,12 @@ fn add_child(&self,
// Return an error here by looking up the namespace that
// had the duplicate.
let
ns
=
ns
.unwrap
();
::
resolve_error
(
resolve_error
(
self
,
sp
,
&
::
ResolutionError
::
DuplicateDefinition
(
ResolutionError
::
DuplicateDefinition
(
namespace_error_to_string
(
duplicate_type
),
&*
token
::
get_name
(
name
)
)
name
)
);
{
let
r
=
child
.span_for_namespace
(
ns
);
...
...
@@ -307,9 +308,9 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, parent: &Rc<Module>) ->
full_path
.segments
.last
()
.unwrap
()
.identifier.name
;
if
&
token
::
get_name
(
source_name
)[
..
]
==
"mod"
||
&
token
::
get_name
(
source_name
)[
..
]
==
"self"
{
::
resolve_error
(
self
,
resolve_error
(
self
,
view_path
.span
,
&
::
ResolutionError
::
SelfImportsOnlyAllowedWithin
ResolutionError
::
SelfImportsOnlyAllowedWithin
);
}
...
...
@@ -330,10 +331,10 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, parent: &Rc<Module>) ->
_
=>
None
})
.collect
::
<
Vec
<
Span
>>
();
if
mod_spans
.len
()
>
1
{
::
resolve_error
(
resolve_error
(
self
,
mod_spans
[
0
],
&
::
ResolutionError
::
SelfImportCanOnlyAppearOnceInTheList
ResolutionError
::
SelfImportCanOnlyAppearOnceInTheList
);
for
other_span
in
mod_spans
.iter
()
.skip
(
1
)
{
self
.session
.span_note
(
*
other_span
,
...
...
@@ -349,10 +350,10 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, parent: &Rc<Module>) ->
let
name
=
match
module_path
.last
()
{
Some
(
name
)
=>
*
name
,
None
=>
{
::
resolve_error
(
resolve_error
(
self
,
source_item
.span
,
&
::
ResolutionError
::
ResolutionError
::
SelfImportOnlyInImportListWithNonEmptyPrefix
);
continue
;
...
...
src/librustc_resolve/lib.rs
浏览文件 @
60133aa6
此差异已折叠。
点击以展开。
src/librustc_resolve/resolve_imports.rs
浏览文件 @
60133aa6
...
...
@@ -22,6 +22,7 @@
use
Resolver
;
use
UseLexicalScopeFlag
;
use
{
names_to_string
,
module_to_string
};
use
{
resolve_error
,
ResolutionError
};
use
build_reduced_graph
;
...
...
@@ -272,9 +273,9 @@ fn resolve_imports_for_module(&mut self, module: Rc<Module>) {
Some
((
span
,
msg
))
=>
(
span
,
format!
(
". {}"
,
msg
)),
None
=>
(
import_directive
.span
,
String
::
new
())
};
::
resolve_error
(
self
.resolver
,
resolve_error
(
self
.resolver
,
span
,
&
::
ResolutionError
::
UnresolvedImport
(
ResolutionError
::
UnresolvedImport
(
Some
((
&*
import_path_to_string
(
&
import_directive
.module_path
,
import_directive
.subclass
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录