Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
f8b6108d
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,发现更多精彩内容 >>
提交
f8b6108d
编写于
2月 05, 2017
作者:
E
est31
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Stabilize static in const
Closes #35897.
上级
10f6a5c4
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
3 addition
and
34 deletion
+3
-34
src/librustc/middle/resolve_lifetime.rs
src/librustc/middle/resolve_lifetime.rs
+1
-13
src/libsyntax/feature_gate.rs
src/libsyntax/feature_gate.rs
+2
-3
src/test/compile-fail/feature-gate-static-in-const.rs
src/test/compile-fail/feature-gate-static-in-const.rs
+0
-14
src/test/compile-fail/rfc1623.rs
src/test/compile-fail/rfc1623.rs
+0
-1
src/test/incremental/change_add_field/struct_point.rs
src/test/incremental/change_add_field/struct_point.rs
+0
-1
src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
...ncremental/change_pub_inherent_method_sig/struct_point.rs
+0
-1
src/test/run-pass/rfc1623.rs
src/test/run-pass/rfc1623.rs
+0
-1
未找到文件。
src/librustc/middle/resolve_lifetime.rs
浏览文件 @
f8b6108d
...
...
@@ -238,8 +238,6 @@ enum Elide {
FreshLateAnon
(
Cell
<
u32
>
),
/// Always use this one lifetime.
Exact
(
Region
),
/// Like `Exact(Static)` but requires `#![feature(static_in_const)]`.
Static
,
/// Less or more than one lifetime were found, error on unspecified.
Error
(
Vec
<
ElisionFailureInfo
>
)
}
...
...
@@ -324,7 +322,7 @@ fn visit_item(&mut self, item: &'tcx hir::Item) {
hir
::
ItemConst
(
..
)
=>
{
// No lifetime parameters, but implied 'static.
let
scope
=
Scope
::
Elision
{
elide
:
Elide
::
Static
,
elide
:
Elide
::
Exact
(
Region
::
Static
)
,
s
:
ROOT_SCOPE
};
self
.with
(
scope
,
|
_
,
this
|
intravisit
::
walk_item
(
this
,
item
));
...
...
@@ -1307,16 +1305,6 @@ fn resolve_elided_lifetimes(&mut self, lifetime_refs: &[hir::Lifetime]) {
return
;
}
Elide
::
Exact
(
l
)
=>
l
.shifted
(
late_depth
),
Elide
::
Static
=>
{
if
!
self
.sess.features
.borrow
()
.static_in_const
{
self
.sess
.struct_span_err
(
span
,
"this needs a `'static` lifetime or the
\
`static_in_const` feature, see #35897"
)
.emit
();
}
Region
::
Static
}
Elide
::
Error
(
ref
e
)
=>
break
Some
(
e
)
};
for
lifetime_ref
in
lifetime_refs
{
...
...
src/libsyntax/feature_gate.rs
浏览文件 @
f8b6108d
...
...
@@ -281,9 +281,6 @@ pub fn new() -> Features {
// Allows untagged unions `union U { ... }`
(
active
,
untagged_unions
,
"1.13.0"
,
Some
(
32836
)),
// elide `'static` lifetimes in `static`s and `const`s
(
active
,
static_in_const
,
"1.13.0"
,
Some
(
35897
)),
// Used to identify the `compiler_builtins` crate
// rustc internal
(
active
,
compiler_builtins
,
"1.13.0"
,
None
),
...
...
@@ -382,6 +379,8 @@ pub fn new() -> Features {
(
accepted
,
item_like_imports
,
"1.14.0"
,
Some
(
35120
)),
// Allows using `Self` and associated types in struct expressions and patterns.
(
accepted
,
more_struct_aliases
,
"1.16.0"
,
Some
(
37544
)),
// elide `'static` lifetimes in `static`s and `const`s
(
accepted
,
static_in_const
,
"1.17.0"
,
Some
(
35897
)),
);
// (changing above list without updating src/doc/reference.md makes @cmr sad)
...
...
src/test/compile-fail/feature-gate-static-in-const.rs
已删除
100644 → 0
浏览文件 @
10f6a5c4
// Copyright 2015 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.
static
FOO
:
&
str
=
"this will work once static_in_const is stable"
;
//~^ ERROR: this needs a `'static` lifetime or the `static_in_const` feature
fn
main
()
{}
src/test/compile-fail/rfc1623.rs
浏览文件 @
f8b6108d
...
...
@@ -7,7 +7,6 @@
// <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.
#![feature(static_in_const)]
#![allow(dead_code)]
fn
non_elidable
<
'a
,
'b
>
(
a
:
&
'a
u8
,
b
:
&
'b
u8
)
->
&
'a
u8
{
...
...
src/test/incremental/change_add_field/struct_point.rs
浏览文件 @
f8b6108d
...
...
@@ -18,7 +18,6 @@
#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
#![feature(static_in_const)]
#![allow(dead_code)]
// These are expected to require translation.
...
...
src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
浏览文件 @
f8b6108d
...
...
@@ -15,7 +15,6 @@
#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
#![feature(static_in_const)]
#![allow(dead_code)]
// These are expected to require translation.
...
...
src/test/run-pass/rfc1623.rs
浏览文件 @
f8b6108d
...
...
@@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(static_in_const)]
#![allow(dead_code)]
// very simple test for a 'static static with default lifetime
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录