Skip to content

Commit d4a6e7d

Browse files
compiler-errorscompiler-errors
committed
Add hir::Node::PreciseCapturingNonLifetimeArg
1 parent 62307e5 commit d4a6e7d

File tree

14 files changed

+110
-38
lines changed

14 files changed

+110
-38
lines changed

‎compiler/rustc_ast_lowering/src/index.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,4 +382,21 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
382382
ArrayLen::Body(..) => intravisit::walk_array_len(self, len),
383383
}
384384
}
385+
386+
fn visit_precise_capturing_arg(
387+
&mut self,
388+
arg: &'hir PreciseCapturingArg<'hir>,
389+
) -> Self::Result {
390+
match arg {
391+
PreciseCapturingArg::Lifetime(_) => {
392+
// This is represented as a `Node::Lifetime`, intravisit will get to it below.
393+
},
394+
PreciseCapturingArg::Param(param) => self.insert(
395+
param.ident.span,
396+
param.hir_id,
397+
Node::PreciseCapturingNonLifetimeArg(param),
398+
),
399+
}
400+
intravisit::walk_precise_capturing_arg(self, arg);
401+
}
385402
}

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,11 +1787,15 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
17871787
PreciseCapturingArg::Lifetime(lt) => {
17881788
hir::PreciseCapturingArg::Lifetime(self.lower_lifetime(lt))
17891789
}
1790-
PreciseCapturingArg::Arg(_, node_id) => {
1790+
PreciseCapturingArg::Arg(ident, node_id) => {
17911791
let res = self.resolver.get_partial_res(*node_id).map_or(Res::Err, |partial_res| {
17921792
partial_res.full_res().expect("no partial res expected for precise capture arg")
17931793
});
1794-
hir::PreciseCapturingArg::Param(self.lower_res(res), self.lower_node_id(*node_id))
1794+
hir::PreciseCapturingArg::Param(hir::PreciseCapturingNonLifetimeArg {
1795+
hir_id: self.lower_node_id(*node_id),
1796+
ident: self.lower_ident(*ident),
1797+
res: self.lower_res(res),
1798+
})
17951799
}
17961800
}))
17971801
}

‎compiler/rustc_hir/src/hir.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2565,7 +2565,14 @@ pub struct OpaqueTy<'hir> {
25652565
pub enum PreciseCapturingArg<'hir> {
25662566
Lifetime(&'hir Lifetime),
25672567
/// Non-lifetime argument (type or const)
2568-
Param(Res, HirId),
2568+
Param(PreciseCapturingNonLifetimeArg),
2569+
}
2570+
2571+
#[derive(Debug, Clone, Copy, HashStable_Generic)]
2572+
pub struct PreciseCapturingNonLifetimeArg {
2573+
pub hir_id: HirId,
2574+
pub ident: Ident,
2575+
pub res: Res,
25692576
}
25702577

25712578
/// From whence the opaque type came.
@@ -3542,6 +3549,7 @@ pub enum Node<'hir> {
35423549
WhereBoundPredicate(&'hir WhereBoundPredicate<'hir>),
35433550
// FIXME: Merge into `Node::Infer`.
35443551
ArrayLenInfer(&'hir InferArg),
3552+
PreciseCapturingNonLifetimeArg(&'hir PreciseCapturingNonLifetimeArg),
35453553
// Created by query feeding
35463554
Synthetic,
35473555
// Span by reference to minimize `Node`'s size
@@ -3578,6 +3586,7 @@ impl<'hir> Node<'hir> {
35783586
Node::TypeBinding(b) => Some(b.ident),
35793587
Node::PatField(f) => Some(f.ident),
35803588
Node::ExprField(f) => Some(f.ident),
3589+
Node::PreciseCapturingNonLifetimeArg(a) => Some(a.ident),
35813590
Node::Param(..)
35823591
| Node::AnonConst(..)
35833592
| Node::ConstBlock(..)

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ pub fn walk_precise_capturing_arg<'v, V: Visitor<'v>>(
11421142
) -> V::Result {
11431143
match *arg {
11441144
PreciseCapturingArg::Lifetime(lt) => visitor.visit_lifetime(lt),
1145-
PreciseCapturingArg::Param(_, hir_id) => visitor.visit_id(hir_id),
1145+
PreciseCapturingArg::Param(param) => visitor.visit_id(param.hir_id),
11461146
}
11471147
}
11481148

‎compiler/rustc_hir_analysis/src/check/check.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,9 @@ fn check_opaque_precise_captures<'tcx>(tcx: TyCtxt<'tcx>, opaque_def_id: LocalDe
491491
for arg in precise_capturing_args {
492492
match *arg {
493493
hir::PreciseCapturingArg::Lifetime(&hir::Lifetime { hir_id, .. })
494-
| hir::PreciseCapturingArg::Param(_, hir_id) => match tcx.named_bound_var(hir_id) {
494+
| hir::PreciseCapturingArg::Param(hir::PreciseCapturingNonLifetimeArg {
495+
hir_id, ..
496+
}) => match tcx.named_bound_var(hir_id) {
495497
Some(ResolvedArg::EarlyBound(def_id)) => {
496498
expected_captures.insert(def_id);
497499
}

‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,10 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
578578
});
579579
}
580580
},
581-
hir::PreciseCapturingArg::Param(res, hir_id) => match res {
581+
hir::PreciseCapturingArg::Param(param) => match param.res {
582582
Res::Def(DefKind::TyParam | DefKind::ConstParam, def_id)
583583
| Res::SelfTyParam { trait_: def_id } => {
584-
self.resolve_type_ref(def_id.expect_local(), hir_id);
584+
self.resolve_type_ref(def_id.expect_local(), param.hir_id);
585585
}
586586
Res::Err => {}
587587
_ => {

‎compiler/rustc_hir_pretty/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ impl<'a> State<'a> {
9999
Node::PatField(a) => self.print_patfield(a),
100100
Node::Arm(a) => self.print_arm(a),
101101
Node::Infer(_) => self.word("_"),
102+
Node::PreciseCapturingNonLifetimeArg(param) => self.print_ident(param.ident),
102103
Node::Block(a) => {
103104
// Containing cbox, will be closed by print-block at `}`.
104105
self.cbox(INDENT_UNIT);

‎compiler/rustc_middle/src/hir/map/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,7 @@ impl<'hir> Map<'hir> {
909909
Node::Crate(item) => item.spans.inner_span,
910910
Node::WhereBoundPredicate(pred) => pred.span,
911911
Node::ArrayLenInfer(inf) => inf.span,
912+
Node::PreciseCapturingNonLifetimeArg(param) => param.ident.span,
912913
Node::Synthetic => unreachable!(),
913914
Node::Err(span) => *span,
914915
}
@@ -1176,6 +1177,7 @@ fn hir_id_to_string(map: Map<'_>, id: HirId) -> String {
11761177
Node::ArrayLenInfer(_) => node_str("array len infer"),
11771178
Node::Synthetic => unreachable!(),
11781179
Node::Err(_) => node_str("error"),
1180+
Node::PreciseCapturingNonLifetimeArg(_param) => node_str("parameter"),
11791181
}
11801182
}
11811183

‎tests/ui/impl-trait/precise-capturing/forgot-to-capture-lifetime.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#![feature(precise_capturing)]
22
//~^ WARN the feature `precise_capturing` is incomplete
33

4-
fn type_param<T>() -> impl use<> Sized {}
5-
//~^ ERROR `impl Trait` must mention all type parameters in scope
4+
fn lifetime_in_bounds<'a>(x: &'a ()) -> impl use<> Into<&'a ()> { x }
5+
//~^ ERROR `impl Trait` captures lifetime parameter, but it is not mentioned in `use<...>` precise captures list
6+
7+
fn lifetime_in_hidden<'a>(x: &'a ()) -> impl use<> Sized { x }
8+
//~^ ERROR hidden type for `impl Sized` captures lifetime that does not appear in bounds
69

710
fn main() {}

‎tests/ui/impl-trait/precise-capturing/forgot-to-capture-lifetime.stderr

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,29 @@ LL | #![feature(precise_capturing)]
77
= note: see issue #123432 <https://github.com/rust-lang/rust/issues/123432> for more information
88
= note: `#[warn(incomplete_features)]` on by default
99

10-
error: `impl Trait` must mention all type parameters in scope
11-
--> $DIR/forgot-to-capture-lifetime.rs:4:15
10+
error: `impl Trait` captures lifetime parameter, but it is not mentioned in `use<...>` precise captures list
11+
--> $DIR/forgot-to-capture-lifetime.rs:4:58
1212
|
13-
LL | fn type_param<T>() -> impl use<> Sized {}
14-
| ^ ---------------- type parameter is implicitly captured by this `impl Trait`
13+
LL | fn lifetime_in_bounds<'a>(x: &'a ()) -> impl use<> Into<&'a ()> { x }
14+
| -- -----------------^^----
15+
| | |
16+
| | lifetime captured due to being mentioned in the bounds of the `impl Trait`
17+
| this lifetime parameter is captured
18+
19+
error[E0700]: hidden type for `impl Sized` captures lifetime that does not appear in bounds
20+
--> $DIR/forgot-to-capture-lifetime.rs:7:60
21+
|
22+
LL | fn lifetime_in_hidden<'a>(x: &'a ()) -> impl use<> Sized { x }
23+
| -- ---------------- ^
24+
| | |
25+
| | opaque type defined here
26+
| hidden type `&'a ()` captures the lifetime `'a` as defined here
27+
|
28+
help: to declare that `impl Sized` captures `'a`, you can add an explicit `'a` lifetime bound
1529
|
16-
= note: currently, all type parameters are required to be mentioned in the precise captures list
30+
LL | fn lifetime_in_hidden<'a>(x: &'a ()) -> impl use<> Sized + 'a { x }
31+
| ++++
1732

18-
error: aborting due to 1 previous error; 1 warning emitted
33+
error: aborting due to 2 previous errors; 1 warning emitted
1934

35+
For more information about this error, try `rustc --explain E0700`.

‎tests/ui/impl-trait/precise-capturing/forgot-to-capture-type.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#![feature(precise_capturing)]
22
//~^ WARN the feature `precise_capturing` is incomplete
33

4-
fn lifetime_in_bounds<'a>(x: &'a ()) -> impl use<> Into<&'a ()> { x }
5-
//~^ ERROR `impl Trait` captures lifetime parameter, but it is not mentioned in `use<...>` precise captures list
4+
fn type_param<T>() -> impl use<> Sized {}
5+
//~^ ERROR `impl Trait` must mention all type parameters in scope
66

7-
fn lifetime_in_hidden<'a>(x: &'a ()) -> impl use<> Sized { x }
8-
//~^ ERROR hidden type for `impl Sized` captures lifetime that does not appear in bounds
7+
trait Foo {
8+
//~^ ERROR `impl Trait` must mention all type parameters in scope
9+
fn bar() -> impl use<> Sized;
10+
}
911

1012
fn main() {}

‎tests/ui/impl-trait/precise-capturing/forgot-to-capture-type.stderr

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,24 @@ LL | #![feature(precise_capturing)]
77
= note: see issue #123432 <https://github.com/rust-lang/rust/issues/123432> for more information
88
= note: `#[warn(incomplete_features)]` on by default
99

10-
error: `impl Trait` captures lifetime parameter, but it is not mentioned in `use<...>` precise captures list
11-
--> $DIR/forgot-to-capture-type.rs:4:58
10+
error: `impl Trait` must mention all type parameters in scope
11+
--> $DIR/forgot-to-capture-type.rs:4:15
1212
|
13-
LL | fn lifetime_in_bounds<'a>(x: &'a ()) -> impl use<> Into<&'a ()> { x }
14-
| -- -----------------^^----
15-
| | |
16-
| | lifetime captured due to being mentioned in the bounds of the `impl Trait`
17-
| this lifetime parameter is captured
18-
19-
error[E0700]: hidden type for `impl Sized` captures lifetime that does not appear in bounds
20-
--> $DIR/forgot-to-capture-type.rs:7:60
13+
LL | fn type_param<T>() -> impl use<> Sized {}
14+
| ^ ---------------- type parameter is implicitly captured by this `impl Trait`
2115
|
22-
LL | fn lifetime_in_hidden<'a>(x: &'a ()) -> impl use<> Sized { x }
23-
| -- ---------------- ^
24-
| | |
25-
| | opaque type defined here
26-
| hidden type `&'a ()` captures the lifetime `'a` as defined here
16+
= note: currently, all type parameters are required to be mentioned in the precise captures list
17+
18+
error: `impl Trait` must mention all type parameters in scope
19+
--> $DIR/forgot-to-capture-type.rs:7:1
2720
|
28-
help: to declare that `impl Sized` captures `'a`, you can add an explicit `'a` lifetime bound
21+
LL | trait Foo {
22+
| ^^^^^^^^^
23+
LL |
24+
LL | fn bar() -> impl use<> Sized;
25+
| ---------------- type parameter is implicitly captured by this `impl Trait`
2926
|
30-
LL | fn lifetime_in_hidden<'a>(x: &'a ()) -> impl use<> Sized + 'a { x }
31-
| ++++
27+
= note: currently, all type parameters are required to be mentioned in the precise captures list
3228

3329
error: aborting due to 2 previous errors; 1 warning emitted
3430

35-
For more information about this error, try `rustc --explain E0700`.

‎tests/ui/impl-trait/precise-capturing/self-capture.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//@ check-pass
2+
3+
#![feature(precise_capturing)]
4+
//~^ WARN the feature `precise_capturing` is incomplete
5+
6+
trait Foo {
7+
fn bar<'a>() -> impl use<Self> Sized;
8+
}
9+
10+
fn main() {}

‎tests/ui/impl-trait/precise-capturing/self-capture.stderr

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
warning: the feature `precise_capturing` is incomplete and may not be safe to use and/or cause compiler crashes
2+
--> $DIR/self-capture.rs:3:12
3+
|
4+
LL | #![feature(precise_capturing)]
5+
| ^^^^^^^^^^^^^^^^^
6+
|
7+
= note: see issue #123432 <https://github.com/rust-lang/rust/issues/123432> for more information
8+
= note: `#[warn(incomplete_features)]` on by default
9+
10+
warning: 1 warning emitted
11+

0 commit comments

Comments
 (0)