Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
b0f880dd
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
b0f880dd
编写于
12月 30, 2017
作者:
Z
Zack M. Davis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
in which leading zeroes on tuple-struct accesses are abjured
Resolves #47073.
上级
54d7285a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
48 addition
and
3 deletion
+48
-3
src/libsyntax/parse/parser.rs
src/libsyntax/parse/parser.rs
+12
-3
src/test/ui/issue-47073-zero-padded-tuple-struct-indices.rs
src/test/ui/issue-47073-zero-padded-tuple-struct-indices.rs
+22
-0
src/test/ui/issue-47073-zero-padded-tuple-struct-indices.stderr
...st/ui/issue-47073-zero-padded-tuple-struct-indices.stderr
+14
-0
未找到文件。
src/libsyntax/parse/parser.rs
浏览文件 @
b0f880dd
...
...
@@ -2592,7 +2592,7 @@ fn parse_dot_or_call_expr_with_(&mut self, e0: P<Expr>, lo: Span) -> PResult<'a,
token
::
Ident
(
..
)
=>
{
e
=
self
.parse_dot_suffix
(
e
,
lo
)
?
;
}
token
::
Literal
(
token
::
Integer
(
n
),
suf
)
=>
{
token
::
Literal
(
token
::
Integer
(
index_ident
),
suf
)
=>
{
let
sp
=
self
.span
;
// A tuple index may not have a suffix
...
...
@@ -2602,16 +2602,25 @@ fn parse_dot_or_call_expr_with_(&mut self, e0: P<Expr>, lo: Span) -> PResult<'a,
hi
=
self
.span
;
self
.bump
();
let
index
=
n
.as_str
()
.parse
::
<
usize
>
()
.ok
();
let
invalid_msg
=
"invalid tuple or struct index"
;
let
index
=
index_ident
.as_str
()
.parse
::
<
usize
>
()
.ok
();
match
index
{
Some
(
n
)
=>
{
if
n
.to_string
()
!=
index_ident
.as_str
()
{
let
mut
err
=
self
.struct_span_err
(
self
.prev_span
,
invalid_msg
);
err
.span_suggestion
(
self
.prev_span
,
"try simplifying the index"
,
n
.to_string
());
err
.emit
();
}
let
id
=
respan
(
dot_span
.to
(
hi
),
n
);
let
field
=
self
.mk_tup_field
(
e
,
id
);
e
=
self
.mk_expr
(
lo
.to
(
hi
),
field
,
ThinVec
::
new
());
}
None
=>
{
let
prev_span
=
self
.prev_span
;
self
.span_err
(
prev_span
,
"invalid tuple or tuple struct index"
);
self
.span_err
(
prev_span
,
invalid_msg
);
}
}
}
...
...
src/test/ui/issue-47073-zero-padded-tuple-struct-indices.rs
0 → 100644
浏览文件 @
b0f880dd
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
type
Guilty
=
bool
;
type
FineDollars
=
u32
;
struct
Verdict
(
Guilty
,
Option
<
FineDollars
>
);
fn
main
()
{
let
justice
=
Verdict
(
true
,
Some
(
2718
));
let
_
condemned
=
justice
.00
;
//~^ ERROR invalid tuple or struct index
let
_
punishment
=
justice
.001
;
//~^ ERROR invalid tuple or struct index
}
src/test/ui/issue-47073-zero-padded-tuple-struct-indices.stderr
0 → 100644
浏览文件 @
b0f880dd
error: invalid tuple or struct index
--> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:18:30
|
18 | let _condemned = justice.00;
| ^^ help: try simplifying the index: `0`
error: invalid tuple or struct index
--> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:20:31
|
20 | let _punishment = justice.001;
| ^^^ help: try simplifying the index: `1`
error: aborting due to 2 previous errors
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录