Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
a965beef
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,发现更多精彩内容 >>
提交
a965beef
编写于
8月 10, 2017
作者:
V
Vadim Petrochenkov
提交者:
Kornel
8月 10, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Better diagnostics and recovery for `const` in extern blocks
上级
ff0513c6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
12 deletion
+39
-12
src/libsyntax/parse/parser.rs
src/libsyntax/parse/parser.rs
+12
-12
src/test/ui/extern-const.rs
src/test/ui/extern-const.rs
+19
-0
src/test/ui/extern-const.stderr
src/test/ui/extern-const.stderr
+8
-0
未找到文件。
src/libsyntax/parse/parser.rs
浏览文件 @
a965beef
...
...
@@ -5518,12 +5518,11 @@ fn parse_item_foreign_fn(&mut self, vis: ast::Visibility, lo: Span, attrs: Vec<A
})
}
/// Parse a static item from a foreign module
/// Parse a static item from a foreign module.
/// Assumes that the `static` keyword is already parsed.
fn
parse_item_foreign_static
(
&
mut
self
,
vis
:
ast
::
Visibility
,
lo
:
Span
,
attrs
:
Vec
<
Attribute
>
)
->
PResult
<
'a
,
ForeignItem
>
{
self
.expect_keyword
(
keywords
::
Static
)
?
;
let
mutbl
=
self
.eat_keyword
(
keywords
::
Mut
);
let
ident
=
self
.parse_ident
()
?
;
self
.expect
(
&
token
::
Colon
)
?
;
let
ty
=
self
.parse_ty
()
?
;
...
...
@@ -5997,21 +5996,22 @@ fn parse_foreign_item(&mut self) -> PResult<'a, Option<ForeignItem>> {
let
lo
=
self
.span
;
let
visibility
=
self
.parse_visibility
(
false
)
?
;
if
self
.check_keyword
(
keywords
::
Static
)
{
// FOREIGN STATIC ITEM
// FOREIGN STATIC ITEM
// Treat `const` as `static` for error recovery, but don't add it to expected tokens.
if
self
.check_keyword
(
keywords
::
Static
)
||
self
.token
.is_keyword
(
keywords
::
Const
)
{
if
self
.token
.is_keyword
(
keywords
::
Const
)
{
self
.diagnostic
()
.struct_span_err
(
self
.span
,
"extern items cannot be `const`"
)
.span_label
(
self
.span
,
"use `static` instead"
)
.emit
();
}
self
.bump
();
// `static` or `const`
return
Ok
(
Some
(
self
.parse_item_foreign_static
(
visibility
,
lo
,
attrs
)
?
));
}
// FOREIGN FUNCTION ITEM
if
self
.check_keyword
(
keywords
::
Fn
)
{
// FOREIGN FUNCTION ITEM
return
Ok
(
Some
(
self
.parse_item_foreign_fn
(
visibility
,
lo
,
attrs
)
?
));
}
if
self
.check_keyword
(
keywords
::
Const
)
{
let
mut
err
=
self
.span_fatal
(
self
.span
,
"extern items cannot be `const`"
);
err
.help
(
"use `static` instead"
);
return
Err
(
err
);
}
// FIXME #5668: this will occur for a macro invocation:
match
self
.parse_macro_use_or_failure
(
attrs
,
true
,
false
,
lo
,
visibility
)
?
{
Some
(
item
)
=>
{
...
...
src/test/ui/extern-const.rs
0 → 100644
浏览文件 @
a965beef
// 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.
// compile-flags: -Z continue-parse-after-error
extern
"C"
{
const
C
:
u8
;
//~ ERROR extern items cannot be `const`
}
fn
main
()
{
let
x
=
C
;
}
src/test/ui/extern-const.stderr
0 → 100644
浏览文件 @
a965beef
error: extern items cannot be `const`
--> $DIR/extern-const.rs:14:5
|
14 | const C: u8; //~ ERROR extern items cannot be `const`
| ^^^^^ use `static` instead
error: aborting due to previous error
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录