Skip to content

Commit 0ad160a

Browse files
compiler-errorscompiler-errors
committed
Add lifetime_capture_rules_2024
1 parent ec94480 commit 0ad160a

File tree

8 files changed

+71
-8
lines changed

8 files changed

+71
-8
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1571,8 +1571,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
15711571
Vec::new()
15721572
}
15731573
hir::OpaqueTyOrigin::FnReturn(..) => {
1574-
if let FnDeclKind::Impl | FnDeclKind::Trait =
1575-
fn_kind.expect("expected RPITs to be lowered with a FnKind")
1574+
if matches!(
1575+
fn_kind.expect("expected RPITs to be lowered with a FnKind"),
1576+
FnDeclKind::Impl | FnDeclKind::Trait
1577+
) || self.tcx.features().lifetime_capture_rules_2024
15761578
{
15771579
// return-position impl trait in trait was decided to capture all
15781580
// in-scope lifetimes, which we collect for all opaques during resolution.

‎compiler/rustc_feature/src/unstable.rs

+2
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ declare_features! (
195195
(internal, intrinsics, "1.0.0", None, None),
196196
/// Allows using `#[lang = ".."]` attribute for linking items to special compiler logic.
197197
(internal, lang_items, "1.0.0", None, None),
198+
/// Changes `impl Trait` to capture all lifetimes in scope.
199+
(unstable, lifetime_capture_rules_2024, "CURRENT_RUSTC_VERSION", None, None),
198200
/// Allows `#[link(..., cfg(..))]`; perma-unstable per #37406
199201
(unstable, link_cfg, "1.14.0", None, None),
200202
/// Allows the `multiple_supertrait_upcastable` lint.

‎compiler/rustc_span/src/symbol.rs

+1
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,7 @@ symbols! {
929929
lib,
930930
libc,
931931
lifetime,
932+
lifetime_capture_rules_2024,
932933
lifetimes,
933934
likely,
934935
line,

‎tests/ui/feature-gates/feature-gate-lifetime-capture-rules-2024.rs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fn foo(x: &Vec<i32>) -> impl Sized {
2+
x
3+
//~^ ERROR hidden type for `impl Sized` captures lifetime that does not appear in bounds
4+
}
5+
6+
fn main() {}

‎tests/ui/feature-gates/feature-gate-lifetime-capture-rules-2024.stderr

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
error[E0700]: hidden type for `impl Sized` captures lifetime that does not appear in bounds
2+
--> $DIR/feature-gate-lifetime-capture-rules-2024.rs:2:5
3+
|
4+
LL | fn foo(x: &Vec<i32>) -> impl Sized {
5+
| --------- ---------- opaque type defined here
6+
| |
7+
| hidden type `&Vec<i32>` captures the anonymous lifetime defined here
8+
LL | x
9+
| ^
10+
|
11+
help: to declare that `impl Sized` captures `'_`, you can add an explicit `'_` lifetime bound
12+
|
13+
LL | fn foo(x: &Vec<i32>) -> impl Sized + '_ {
14+
| ++++
15+
16+
error: aborting due to 1 previous error
17+
18+
For more information about this error, try `rustc --explain E0700`.

‎tests/ui/impl-trait/variance.new.stderr

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
error: [*, o]
2+
--> $DIR/variance.rs:12:36
3+
|
4+
LL | fn not_captured_early<'a: 'a>() -> impl Sized {}
5+
| ^^^^^^^^^^
6+
7+
error: [*, o]
8+
--> $DIR/variance.rs:16:32
9+
|
10+
LL | fn captured_early<'a: 'a>() -> impl Sized + Captures<'a> {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error: [o]
14+
--> $DIR/variance.rs:18:40
15+
|
16+
LL | fn not_captured_late<'a>(_: &'a ()) -> impl Sized {}
17+
| ^^^^^^^^^^
18+
19+
error: [o]
20+
--> $DIR/variance.rs:22:36
21+
|
22+
LL | fn captured_late<'a>(_: &'a ()) -> impl Sized + Captures<'a> {}
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
24+
25+
error: aborting due to 4 previous errors
26+

‎tests/ui/impl-trait/variance.stderr ‎tests/ui/impl-trait/variance.old.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: [*]
2-
--> $DIR/variance.rs:8:36
2+
--> $DIR/variance.rs:12:36
33
|
44
LL | fn not_captured_early<'a: 'a>() -> impl Sized {}
55
| ^^^^^^^^^^
66

77
error: [*, o]
8-
--> $DIR/variance.rs:10:32
8+
--> $DIR/variance.rs:16:32
99
|
1010
LL | fn captured_early<'a: 'a>() -> impl Sized + Captures<'a> {}
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: []
14-
--> $DIR/variance.rs:12:40
14+
--> $DIR/variance.rs:18:40
1515
|
1616
LL | fn not_captured_late<'a>(_: &'a ()) -> impl Sized {}
1717
| ^^^^^^^^^^
1818

1919
error: [o]
20-
--> $DIR/variance.rs:14:36
20+
--> $DIR/variance.rs:22:36
2121
|
2222
LL | fn captured_late<'a>(_: &'a ()) -> impl Sized + Captures<'a> {}
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/impl-trait/variance.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1+
// revisions: old new
2+
3+
#![cfg_attr(new, feature(lifetime_capture_rules_2024))]
4+
15
#![feature(rustc_attrs)]
26
#![allow(internal_features)]
37
#![rustc_variance_of_opaques]
48

59
trait Captures<'a> {}
610
impl<T> Captures<'_> for T {}
711

8-
fn not_captured_early<'a: 'a>() -> impl Sized {} //~ [*]
12+
fn not_captured_early<'a: 'a>() -> impl Sized {}
13+
//[old]~^ [*]
14+
//[new]~^^ [*, o]
915

1016
fn captured_early<'a: 'a>() -> impl Sized + Captures<'a> {} //~ [*, o]
1117

12-
fn not_captured_late<'a>(_: &'a ()) -> impl Sized {} //~ []
18+
fn not_captured_late<'a>(_: &'a ()) -> impl Sized {}
19+
//[old]~^ []
20+
//[new]~^^ [o]
1321

1422
fn captured_late<'a>(_: &'a ()) -> impl Sized + Captures<'a> {} //~ [o]
1523

0 commit comments

Comments
 (0)