Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
d8062a93
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,发现更多精彩内容 >>
提交
d8062a93
编写于
11月 12, 2015
作者:
M
Manish Goregaokar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add more comprehensive diagnostics for irrefutable pattern error with constants
Fixes #7526
上级
8c743a95
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
7 deletion
+15
-7
src/librustc_resolve/lib.rs
src/librustc_resolve/lib.rs
+15
-7
未找到文件。
src/librustc_resolve/lib.rs
浏览文件 @
d8062a93
...
@@ -153,7 +153,7 @@ pub enum ResolutionError<'a> {
...
@@ -153,7 +153,7 @@ pub enum ResolutionError<'a> {
/// error E0413: declaration shadows an enum variant or unit-like struct in scope
/// error E0413: declaration shadows an enum variant or unit-like struct in scope
DeclarationShadowsEnumVariantOrUnitLikeStruct
(
Name
),
DeclarationShadowsEnumVariantOrUnitLikeStruct
(
Name
),
/// error E0414: only irrefutable patterns allowed here
/// error E0414: only irrefutable patterns allowed here
OnlyIrrefutablePatternsAllowedHere
,
OnlyIrrefutablePatternsAllowedHere
(
DefId
,
Name
)
,
/// error E0415: identifier is bound more than once in this parameter list
/// error E0415: identifier is bound more than once in this parameter list
IdentifierBoundMoreThanOnceInParameterList
(
&
'a
str
),
IdentifierBoundMoreThanOnceInParameterList
(
&
'a
str
),
/// error E0416: identifier is bound more than once in the same pattern
/// error E0416: identifier is bound more than once in the same pattern
...
@@ -283,8 +283,16 @@ fn resolve_error<'b, 'a:'b, 'tcx:'a>(resolver: &'b Resolver<'a, 'tcx>, span: syn
...
@@ -283,8 +283,16 @@ fn resolve_error<'b, 'a:'b, 'tcx:'a>(resolver: &'b Resolver<'a, 'tcx>, span: syn
scope"
,
scope"
,
name
);
name
);
},
},
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
=>
{
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
(
did
,
name
)
=>
{
span_err!
(
resolver
.session
,
span
,
E0414
,
"only irrefutable patterns allowed here"
);
span_err!
(
resolver
.session
,
span
,
E0414
,
"only irrefutable patterns allowed here"
);
resolver
.session
.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
)
{
resolver
.session
.span_note
(
sp
,
"constant defined here"
);
}
if
let
Some
(
directive
)
=
resolver
.current_module.import_resolutions
.borrow
()
.get
(
&
name
)
{
let
item
=
resolver
.ast_map
.expect_item
(
directive
.value_id
);
resolver
.session
.span_note
(
item
.span
,
"constant imported here"
);
}
},
},
ResolutionError
::
IdentifierBoundMoreThanOnceInParameterList
(
identifier
)
=>
{
ResolutionError
::
IdentifierBoundMoreThanOnceInParameterList
(
identifier
)
=>
{
span_err!
(
resolver
.session
,
span
,
E0415
,
span_err!
(
resolver
.session
,
span
,
E0415
,
...
@@ -632,7 +640,7 @@ enum NameSearchType {
...
@@ -632,7 +640,7 @@ enum NameSearchType {
#[derive(Copy,
Clone)]
#[derive(Copy,
Clone)]
enum
BareIdentifierPatternResolution
{
enum
BareIdentifierPatternResolution
{
FoundStructOrEnumVariant
(
Def
,
LastPrivate
),
FoundStructOrEnumVariant
(
Def
,
LastPrivate
),
FoundConst
(
Def
,
LastPrivate
),
FoundConst
(
Def
,
LastPrivate
,
Name
),
BareIdentifierPatternUnresolved
BareIdentifierPatternUnresolved
}
}
...
@@ -2685,7 +2693,7 @@ struct or enum variant",
...
@@ -2685,7 +2693,7 @@ struct or enum variant",
renamed
)
renamed
)
);
);
}
}
FoundConst
(
def
,
lp
)
if
const_ok
=>
{
FoundConst
(
def
,
lp
,
_
)
if
const_ok
=>
{
debug!
(
"(resolving pattern) resolving `{}` to
\
debug!
(
"(resolving pattern) resolving `{}` to
\
constant"
,
constant"
,
renamed
);
renamed
);
...
@@ -2700,11 +2708,11 @@ struct or enum variant",
...
@@ -2700,11 +2708,11 @@ struct or enum variant",
depth
:
0
depth
:
0
});
});
}
}
FoundConst
(
..
)
=>
{
FoundConst
(
def
,
_
,
name
)
=>
{
resolve_error
(
resolve_error
(
self
,
self
,
pattern
.span
,
pattern
.span
,
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
ResolutionError
::
OnlyIrrefutablePatternsAllowedHere
(
def
.def_id
(),
name
)
);
);
}
}
BareIdentifierPatternUnresolved
=>
{
BareIdentifierPatternUnresolved
=>
{
...
@@ -2929,7 +2937,7 @@ fn resolve_bare_identifier_pattern(&mut self, name: Name, span: Span)
...
@@ -2929,7 +2937,7 @@ fn resolve_bare_identifier_pattern(&mut self, name: Name, span: Span)
return
FoundStructOrEnumVariant
(
def
,
LastMod
(
AllPublic
));
return
FoundStructOrEnumVariant
(
def
,
LastMod
(
AllPublic
));
}
}
def
@
DefConst
(
..
)
|
def
@
DefAssociatedConst
(
..
)
=>
{
def
@
DefConst
(
..
)
|
def
@
DefAssociatedConst
(
..
)
=>
{
return
FoundConst
(
def
,
LastMod
(
AllPublic
));
return
FoundConst
(
def
,
LastMod
(
AllPublic
)
,
name
);
}
}
DefStatic
(
..
)
=>
{
DefStatic
(
..
)
=>
{
resolve_error
(
self
,
resolve_error
(
self
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录