Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
ef09ed20
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,发现更多精彩内容 >>
提交
ef09ed20
编写于
10月 24, 2020
作者:
V
Vadim Petrochenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resolve: Relax macro resolution consistency check to account for any errors
上级
2e8a54af
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
4 deletion
+29
-4
compiler/rustc_resolve/src/macros.rs
compiler/rustc_resolve/src/macros.rs
+4
-4
src/test/ui/macros/issue-78325-inconsistent-resolution.rs
src/test/ui/macros/issue-78325-inconsistent-resolution.rs
+12
-0
src/test/ui/macros/issue-78325-inconsistent-resolution.stderr
...test/ui/macros/issue-78325-inconsistent-resolution.stderr
+13
-0
未找到文件。
compiler/rustc_resolve/src/macros.rs
浏览文件 @
ef09ed20
...
...
@@ -19,7 +19,7 @@
use
rustc_hir
::
def
::{
self
,
DefKind
,
NonMacroAttrKind
};
use
rustc_hir
::
def_id
;
use
rustc_middle
::
middle
::
stability
;
use
rustc_middle
::
{
span_bug
,
ty
}
;
use
rustc_middle
::
ty
;
use
rustc_session
::
lint
::
builtin
::
UNUSED_MACROS
;
use
rustc_session
::
Session
;
use
rustc_span
::
edition
::
Edition
;
...
...
@@ -885,11 +885,11 @@ struct Flags: u8 {
initial_res
:
Option
<
Res
>
,
res
:
Res
|
{
if
let
Some
(
initial_res
)
=
initial_res
{
if
res
!=
initial_res
&&
res
!=
Res
::
Err
&&
this
.ambiguity_errors
.is_empty
()
{
if
res
!=
initial_res
{
// Make sure compilation does not succeed if preferred macro resolution
// has changed after the macro had been expanded. In theory all such
// situations should be reported as
ambiguity
errors, so this is a bug.
span_bug!
(
span
,
"inconsistent resolution for a macro"
);
// situations should be reported as errors, so this is a bug.
this
.session
.delay_span_bug
(
span
,
"inconsistent resolution for a macro"
);
}
}
else
{
// It's possible that the macro was unresolved (indeterminate) and silently
...
...
src/test/ui/macros/issue-78325-inconsistent-resolution.rs
0 → 100644
浏览文件 @
ef09ed20
macro_rules!
define_other_core
{
(
)
=>
{
extern
crate
std
as
core
;
//~^ ERROR macro-expanded `extern crate` items cannot shadow names passed with `--extern`
};
}
fn
main
()
{
core
::
panic!
();
}
define_other_core!
();
src/test/ui/macros/issue-78325-inconsistent-resolution.stderr
0 → 100644
浏览文件 @
ef09ed20
error: macro-expanded `extern crate` items cannot shadow names passed with `--extern`
--> $DIR/issue-78325-inconsistent-resolution.rs:3:9
|
LL | extern crate std as core;
| ^^^^^^^^^^^^^^^^^^^^^^^^^
...
LL | define_other_core!();
| --------------------- in this macro invocation
|
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to previous error
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录