Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
a0d8b794
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,发现更多精彩内容 >>
提交
a0d8b794
编写于
12月 28, 2019
作者:
V
Vadim Petrochenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resolve: Minor cleanup of duplicate macro reexports
上级
f564c4db
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
33 deletion
+9
-33
src/librustc_resolve/resolve_imports.rs
src/librustc_resolve/resolve_imports.rs
+1
-25
src/test/ui/issues/issue-38715.rs
src/test/ui/issues/issue-38715.rs
+1
-1
src/test/ui/issues/issue-38715.stderr
src/test/ui/issues/issue-38715.stderr
+7
-7
未找到文件。
src/librustc_resolve/resolve_imports.rs
浏览文件 @
a0d8b794
...
...
@@ -528,31 +528,7 @@ impl<'a> Resolver<'a> {
resolution
.shadowed_glob
=
Some
(
glob_binding
);
}
(
false
,
false
)
=>
{
if
let
(
&
NameBindingKind
::
Res
(
_
,
true
),
&
NameBindingKind
::
Res
(
_
,
true
))
=
(
&
old_binding
.kind
,
&
binding
.kind
)
{
this
.session
.struct_span_err
(
binding
.span
,
&
format!
(
"a macro named `{}` has already been exported"
,
key
.ident
),
)
.span_label
(
binding
.span
,
format!
(
"`{}` already exported"
,
key
.ident
),
)
.span_note
(
old_binding
.span
,
"previous macro export is now shadowed"
,
)
.emit
();
resolution
.binding
=
Some
(
binding
);
}
else
{
return
Err
(
old_binding
);
}
return
Err
(
old_binding
);
}
}
}
else
{
...
...
src/test/ui/issues/issue-38715.rs
浏览文件 @
a0d8b794
...
...
@@ -2,6 +2,6 @@
macro_rules!
foo
{
(
$i:ident
)
=>
{}
}
#[macro_export]
macro_rules!
foo
{
()
=>
{}
}
//~ ERROR
a macro named `foo` has already been exported
macro_rules!
foo
{
()
=>
{}
}
//~ ERROR
the name `foo` is defined multiple times
fn
main
()
{}
src/test/ui/issues/issue-38715.stderr
浏览文件 @
a0d8b794
error
: a macro named `foo` has already been exported
error
[E0428]: the name `foo` is defined multiple times
--> $DIR/issue-38715.rs:5:1
|
LL | macro_rules! foo { ($i:ident) => {} }
| ---------------- previous definition of the macro `foo` here
...
LL | macro_rules! foo { () => {} }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `foo` already exported
|
note: previous macro export is now shadowed
--> $DIR/issue-38715.rs:2:1
| ^^^^^^^^^^^^^^^^ `foo` redefined here
|
LL | macro_rules! foo { ($i:ident) => {} }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: `foo` must be defined only once in the macro namespace of this module
error: aborting due to previous error
For more information about this error, try `rustc --explain E0428`.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录