Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
5a4e0b14
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,发现更多精彩内容 >>
提交
5a4e0b14
编写于
4月 25, 2016
作者:
J
Jeffrey Seyfried
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove use of `ast_map.span_if_local()` and improve diagnostics
上级
60c8f7db
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
13 deletion
+8
-13
src/librustc_resolve/lib.rs
src/librustc_resolve/lib.rs
+6
-11
src/test/compile-fail/const-pattern-irrefutable.rs
src/test/compile-fail/const-pattern-irrefutable.rs
+2
-2
未找到文件。
src/librustc_resolve/lib.rs
浏览文件 @
5a4e0b14
...
...
@@ -141,7 +141,7 @@ enum ResolutionError<'a> {
/// error E0413: declaration shadows an enum variant or unit-like struct in scope
DeclarationShadowsEnumVariantOrUnitLikeStruct
(
Name
),
/// error E0414: only irrefutable patterns allowed here
OnlyIrrefutablePatternsAllowedHere
(
DefId
,
Name
),
OnlyIrrefutablePatternsAllowedHere
(
Name
),
/// error E0415: identifier is bound more than once in this parameter list
IdentifierBoundMoreThanOnceInParameterList
(
&
'a
str
),
/// error E0416: identifier is bound more than once in the same pattern
...
...
@@ -323,7 +323,7 @@ fn resolve_struct_error<'b, 'a: 'b, 'tcx: 'a>(resolver: &'b Resolver<'a, 'tcx>,
or unit-like struct in scope"
,
name
)
}
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
(
did
,
name
)
=>
{
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
(
name
)
=>
{
let
mut
err
=
struct_span_err!
(
resolver
.session
,
span
,
E0414
,
...
...
@@ -331,14 +331,10 @@ fn resolve_struct_error<'b, 'a: 'b, 'tcx: 'a>(resolver: &'b Resolver<'a, 'tcx>,
err
.span_note
(
span
,
"there already is a constant in scope sharing the same
\
name as this pattern"
);
if
let
Some
(
sp
)
=
resolver
.ast_map
.span_if_local
(
did
)
{
err
.span_note
(
sp
,
"constant defined here"
);
}
if
let
Some
(
binding
)
=
resolver
.current_module
.resolve_name_in_lexical_scope
(
name
,
ValueNS
)
{
if
binding
.is_import
()
{
err
.span_note
(
binding
.span
,
"constant imported here"
);
}
let
participle
=
if
binding
.is_import
()
{
"imported"
}
else
{
"defined"
};
err
.span_note
(
binding
.span
,
&
format!
(
"constant {} here"
,
participle
));
}
err
}
...
...
@@ -2248,12 +2244,11 @@ fn resolve_pattern(&mut self,
depth
:
0
,
});
}
FoundConst
(
def
,
name
)
=>
{
FoundConst
(
_
,
name
)
=>
{
resolve_error
(
self
,
pattern
.span
,
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
(
def
.def_id
(),
name
)
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
(
name
)
);
self
.record_def
(
pattern
.id
,
err_path_resolution
());
}
...
...
src/test/compile-fail/const-pattern-irrefutable.rs
浏览文件 @
5a4e0b14
...
...
@@ -9,8 +9,8 @@
// except according to those terms.
mod
foo
{
pub
const
b
:
u8
=
2
;
//~ NOTE constant defined here
pub
const
d
:
u8
=
2
;
//~ NOTE constant defined here
pub
const
b
:
u8
=
2
;
pub
const
d
:
u8
=
2
;
}
use
foo
::
b
as
c
;
//~ NOTE constant imported here
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录