Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
60a1d4e6
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,发现更多精彩内容 >>
提交
60a1d4e6
编写于
9月 19, 2018
作者:
V
Vadim Petrochenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resolve: Keep more precise traces for expanded macro resolutions
`NameBinding`s instead of `Def`s
上级
050bd329
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
16 deletion
+16
-16
src/librustc_resolve/lib.rs
src/librustc_resolve/lib.rs
+2
-1
src/librustc_resolve/macros.rs
src/librustc_resolve/macros.rs
+14
-15
未找到文件。
src/librustc_resolve/lib.rs
浏览文件 @
60a1d4e6
...
...
@@ -1014,7 +1014,8 @@ pub struct ModuleData<'a> {
normal_ancestor_id
:
DefId
,
resolutions
:
RefCell
<
FxHashMap
<
(
Ident
,
Namespace
),
&
'a
RefCell
<
NameResolution
<
'a
>>>>
,
legacy_macro_resolutions
:
RefCell
<
Vec
<
(
Ident
,
MacroKind
,
ParentScope
<
'a
>
,
Option
<
Def
>
)
>>
,
legacy_macro_resolutions
:
RefCell
<
Vec
<
(
Ident
,
MacroKind
,
ParentScope
<
'a
>
,
Option
<&
'a
NameBinding
<
'a
>>
)
>>
,
macro_resolutions
:
RefCell
<
Vec
<
(
Box
<
[
Ident
]
>
,
Span
)
>>
,
builtin_attrs
:
RefCell
<
Vec
<
(
Ident
,
ParentScope
<
'a
>
)
>>
,
...
...
src/librustc_resolve/macros.rs
浏览文件 @
60a1d4e6
...
...
@@ -506,21 +506,19 @@ pub fn resolve_macro_to_def_inner(
def
}
else
{
let
def
=
match
self
.early_resolve_ident_in_lexical_scope
(
path
[
0
],
MacroNS
,
Some
(
kind
),
parent_scope
,
false
,
force
,
span
)
{
Ok
(
binding
)
=>
Ok
(
binding
.def_ignoring_ambiguity
()),
let
binding
=
self
.early_resolve_ident_in_lexical_scope
(
path
[
0
],
MacroNS
,
Some
(
kind
),
parent_scope
,
false
,
force
,
span
);
match
binding
{
Ok
(
..
)
=>
{}
Err
(
Determinacy
::
Determined
)
=>
self
.found_unresolved_macro
=
true
,
Err
(
Determinacy
::
Undetermined
)
=>
return
Err
(
Determinacy
::
Undetermined
),
Err
(
Determinacy
::
Determined
)
=>
{
self
.found_unresolved_macro
=
true
;
Err
(
Determinacy
::
Determined
)
}
};
}
parent_scope
.module.legacy_macro_resolutions
.borrow_mut
()
.push
((
path
[
0
],
kind
,
parent_scope
.clone
(),
def
.ok
()));
.push
((
path
[
0
],
kind
,
parent_scope
.clone
(),
binding
.ok
()));
def
binding
.map
(|
binding
|
binding
.def_ignoring_ambiguity
())
}
}
...
...
@@ -866,15 +864,16 @@ pub fn finalize_current_module_macro_resolutions(&mut self) {
let
legacy_macro_resolutions
=
mem
::
replace
(
&
mut
*
module
.legacy_macro_resolutions
.borrow_mut
(),
Vec
::
new
());
for
(
ident
,
kind
,
parent_scope
,
initial_
def
)
in
legacy_macro_resolutions
{
for
(
ident
,
kind
,
parent_scope
,
initial_
binding
)
in
legacy_macro_resolutions
{
let
binding
=
self
.early_resolve_ident_in_lexical_scope
(
ident
,
MacroNS
,
Some
(
kind
),
&
parent_scope
,
true
,
true
,
ident
.span
);
match
binding
{
Ok
(
binding
)
=>
{
self
.record_use
(
ident
,
MacroNS
,
binding
);
let
def
=
binding
.def_ignoring_ambiguity
();
if
let
Some
(
initial_def
)
=
initial_def
{
if
let
Some
(
initial_binding
)
=
initial_binding
{
self
.record_use
(
ident
,
MacroNS
,
initial_binding
);
let
initial_def
=
initial_binding
.def_ignoring_ambiguity
();
if
self
.ambiguity_errors
.is_empty
()
&&
def
!=
initial_def
&&
def
!=
Def
::
Err
{
// Make sure compilation does not succeed if preferred macro resolution
...
...
@@ -894,7 +893,7 @@ pub fn finalize_current_module_macro_resolutions(&mut self) {
}
}
Err
(
..
)
=>
{
assert
!
(
initial_
def
.is_none
());
assert
!
(
initial_
binding
.is_none
());
let
bang
=
if
kind
==
MacroKind
::
Bang
{
"!"
}
else
{
""
};
let
msg
=
format!
(
"cannot find {} `{}{}` in this scope"
,
kind
.descr
(),
ident
,
bang
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录