Skip to content

Commit 058f940

Browse files
compiler-errorscompiler-errors
committed
Bless tests
1 parent 8767491 commit 058f940

24 files changed

+83
-80
lines changed

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
3838
match param.kind {
3939
hir::GenericParamKind::Lifetime { .. } => (),
4040
hir::GenericParamKind::Type { .. } => {
41-
// TODO:
41+
// We shift the predicate by one because for a non-lifetime binder like,
42+
// `for<T> T: Trait`, we start out with a `T` with a debruijn index of `N`,
43+
// but we need to shift it to be `N + 1` when we construct a clause below.
4244
let param_ty = ty::shift_vars(self.tcx(), self.lower_ty_param(param.hir_id), 1);
4345
let mut bounds = Vec::new();
4446
// Params are implicitly sized unless a `?Sized` bound is found
@@ -57,10 +59,22 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
5759
let param_def_id = param.def_id.to_def_id();
5860
let ct_ty = tcx.type_of(param_def_id).instantiate_identity();
5961
let ct = self.lower_const_param(param_def_id, param.hir_id);
60-
predicates.insert((
61-
ty::ClauseKind::ConstArgHasType(ct, ct_ty).upcast(tcx),
62-
param.span,
63-
));
62+
if let ty::ConstKind::Bound(..) = ct.kind() {
63+
// We don't allow const params in non-lifetime binders today.
64+
tcx.dcx().span_delayed_bug(
65+
tcx.def_span(param_def_id),
66+
"const param in non-lifetime binder not allowed",
67+
);
68+
} else {
69+
predicates.insert((
70+
ty::Binder::bind_with_vars(
71+
ty::ClauseKind::ConstArgHasType(ct, ct_ty),
72+
ty::List::empty(),
73+
)
74+
.upcast(tcx),
75+
param.span,
76+
));
77+
}
6478
}
6579
}
6680
}

‎compiler/rustc_infer/src/infer/relate/higher_ranked.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl<'tcx> InferCtxt<'tcx> {
7272

7373
let next_universe = self.create_next_universe();
7474

75-
// TODO: Deduplicate this with above.
75+
// FIXME(non_lifetime_binders): Deduplicate this with above.
7676
let delegate = FnMutDelegate {
7777
regions: &mut |br: ty::BoundRegion| {
7878
ty::Region::new_placeholder(

‎compiler/rustc_middle/src/ty/mod.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,10 @@ impl<'tcx> ParamEnv<'tcx> {
999999
ParamEnvAnd { param_env: self, value }
10001000
}
10011001

1002-
/// TODO:
1002+
/// Creates a new param-env by augmenting the previous param-env with more predicates.
1003+
///
1004+
/// N.B. this method does not elaborate the assumptions, and you probably should do that.
1005+
// FIXME(non_lifetime_binders): We should elaborate these predicates somewhere.
10031006
pub fn extend(self, tcx: TyCtxt<'tcx>, assumptions: ty::Clauses<'tcx>) -> Self {
10041007
if assumptions.is_empty() {
10051008
self

‎src/tools/clippy/clippy_lints/src/lifetimes.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ where
633633
bounded_ty,
634634
bounds,
635635
bound_generic_params,
636+
bound_assumptions: _,
636637
origin: _,
637638
}) = predicate.kind
638639
{

‎tests/crashes/120033.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ pub struct Bar<T: ?AutoTrait> {}
99

1010
pub fn f<T1, T2>()
1111
where
12-
T1: for<T> Foo<usize, Bar = Bar<T>>,
13-
T2: for<L, T> Foo<usize, Bar<T> = T1::Bar<T>>,
12+
T1: for<T: ?Sized> Foo<usize, Bar = Bar<T>>,
13+
T2: for<L: ?Sized, T: ?Sized> Foo<usize, Bar<T> = T1::Bar<T>>,
1414
{}

‎tests/ui/attributes/dump-preds.stderr‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@ error: rustc_dump_predicates
44
LL | trait Trait<T>: Iterator<Item: Copy>
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: Binder { value: TraitPredicate(<Self as std::iter::Iterator>, polarity:Positive), bound_vars: [] }
8-
= note: Binder { value: TraitPredicate(<<Self as std::iter::Iterator>::Item as std::marker::Copy>, polarity:Positive), bound_vars: [] }
9-
= note: Binder { value: TraitPredicate(<T as std::marker::Sized>, polarity:Positive), bound_vars: [] }
10-
= note: Binder { value: TraitPredicate(<std::string::String as std::convert::From<T>>, polarity:Positive), bound_vars: [] }
11-
= note: Binder { value: TraitPredicate(<Self as Trait<T>>, polarity:Positive), bound_vars: [] }
7+
= note: Binder { value: TraitPredicate(<Self as std::iter::Iterator>, polarity:Positive), bound_vars: [], clauses: [] }
8+
= note: Binder { value: TraitPredicate(<<Self as std::iter::Iterator>::Item as std::marker::Copy>, polarity:Positive), bound_vars: [], clauses: [] }
9+
= note: Binder { value: TraitPredicate(<T as std::marker::Sized>, polarity:Positive), bound_vars: [], clauses: [] }
10+
= note: Binder { value: TraitPredicate(<std::string::String as std::convert::From<T>>, polarity:Positive), bound_vars: [], clauses: [] }
11+
= note: Binder { value: TraitPredicate(<Self as Trait<T>>, polarity:Positive), bound_vars: [], clauses: [] }
1212

1313
error: rustc_dump_predicates
1414
--> $DIR/dump-preds.rs:13:5
1515
|
1616
LL | type Assoc<P: Eq>: std::ops::Deref<Target = ()>
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1818
|
19-
= note: Binder { value: TraitPredicate(<Self as std::iter::Iterator>, polarity:Positive), bound_vars: [] }
20-
= note: Binder { value: TraitPredicate(<<Self as std::iter::Iterator>::Item as std::marker::Copy>, polarity:Positive), bound_vars: [] }
21-
= note: Binder { value: TraitPredicate(<T as std::marker::Sized>, polarity:Positive), bound_vars: [] }
22-
= note: Binder { value: TraitPredicate(<std::string::String as std::convert::From<T>>, polarity:Positive), bound_vars: [] }
23-
= note: Binder { value: TraitPredicate(<Self as Trait<T>>, polarity:Positive), bound_vars: [] }
24-
= note: Binder { value: TraitPredicate(<P as std::marker::Sized>, polarity:Positive), bound_vars: [] }
25-
= note: Binder { value: TraitPredicate(<P as std::cmp::Eq>, polarity:Positive), bound_vars: [] }
26-
= note: Binder { value: TraitPredicate(<<Self as Trait<T>>::Assoc<()> as std::marker::Copy>, polarity:Positive), bound_vars: [] }
19+
= note: Binder { value: TraitPredicate(<Self as std::iter::Iterator>, polarity:Positive), bound_vars: [], clauses: [] }
20+
= note: Binder { value: TraitPredicate(<<Self as std::iter::Iterator>::Item as std::marker::Copy>, polarity:Positive), bound_vars: [], clauses: [] }
21+
= note: Binder { value: TraitPredicate(<T as std::marker::Sized>, polarity:Positive), bound_vars: [], clauses: [] }
22+
= note: Binder { value: TraitPredicate(<std::string::String as std::convert::From<T>>, polarity:Positive), bound_vars: [], clauses: [] }
23+
= note: Binder { value: TraitPredicate(<Self as Trait<T>>, polarity:Positive), bound_vars: [], clauses: [] }
24+
= note: Binder { value: TraitPredicate(<P as std::marker::Sized>, polarity:Positive), bound_vars: [], clauses: [] }
25+
= note: Binder { value: TraitPredicate(<P as std::cmp::Eq>, polarity:Positive), bound_vars: [], clauses: [] }
26+
= note: Binder { value: TraitPredicate(<<Self as Trait<T>>::Assoc<()> as std::marker::Copy>, polarity:Positive), bound_vars: [], clauses: [] }
2727

2828
error: rustc_dump_item_bounds
2929
--> $DIR/dump-preds.rs:13:5
3030
|
3131
LL | type Assoc<P: Eq>: std::ops::Deref<Target = ()>
3232
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3333
|
34-
= note: Binder { value: ProjectionPredicate(AliasTerm { args: [Alias(Projection, AliasTy { args: [Self/#0, T/#1, P/#2], def_id: DefId(..), .. })], def_id: DefId(..), .. }, Term::Ty(())), bound_vars: [] }
35-
= note: Binder { value: TraitPredicate(<<Self as Trait<T>>::Assoc<P> as std::ops::Deref>, polarity:Positive), bound_vars: [] }
36-
= note: Binder { value: TraitPredicate(<<Self as Trait<T>>::Assoc<P> as std::marker::Sized>, polarity:Positive), bound_vars: [] }
34+
= note: Binder { value: ProjectionPredicate(AliasTerm { args: [Alias(Projection, AliasTy { args: [Self/#0, T/#1, P/#2], def_id: DefId(..), .. })], def_id: DefId(..), .. }, Term::Ty(())), bound_vars: [], clauses: [] }
35+
= note: Binder { value: TraitPredicate(<<Self as Trait<T>>::Assoc<P> as std::ops::Deref>, polarity:Positive), bound_vars: [], clauses: [] }
36+
= note: Binder { value: TraitPredicate(<<Self as Trait<T>>::Assoc<P> as std::marker::Sized>, polarity:Positive), bound_vars: [], clauses: [] }
3737

3838
error: aborting due to 3 previous errors
3939

‎tests/ui/closures/binder/bounds-on-closure-type-binders.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ trait Trait {}
99
fn main() {
1010
// Regression test for issue #119067
1111
let _ = for<T: Trait> || -> () {};
12-
//~^ ERROR bounds cannot be used in this context
13-
//~| ERROR late-bound type parameter not allowed on closures
12+
//~^ ERROR late-bound type parameter not allowed on closures
1413
}

‎tests/ui/closures/binder/bounds-on-closure-type-binders.stderr‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
error: bounds cannot be used in this context
2-
--> $DIR/bounds-on-closure-type-binders.rs:11:20
3-
|
4-
LL | let _ = for<T: Trait> || -> () {};
5-
| ^^^^^
6-
71
error: late-bound type parameter not allowed on closures
82
--> $DIR/bounds-on-closure-type-binders.rs:11:17
93
|
104
LL | let _ = for<T: Trait> || -> () {};
115
| ^
126

13-
error: aborting due to 2 previous errors
7+
error: aborting due to 1 previous error
148

‎tests/ui/stats/input-stats.stderr‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,36 +143,36 @@ hir-stats Attribute 128 ( 1.4%) 4 32
143143
hir-stats FieldDef 128 ( 1.4%) 2 64
144144
hir-stats GenericArgs 144 ( 1.6%) 3 48
145145
hir-stats Variant 144 ( 1.6%) 2 72
146-
hir-stats GenericBound 256 ( 2.9%) 4 64
147-
hir-stats - Trait 256 ( 2.9%) 4
148146
hir-stats Block 288 ( 3.2%) 6 48
147+
hir-stats GenericBound 320 ( 3.5%) 4 80
148+
hir-stats - Trait 320 ( 3.5%) 4
149149
hir-stats Pat 360 ( 4.0%) 5 72
150150
hir-stats - Struct 72 ( 0.8%) 1
151151
hir-stats - Wild 72 ( 0.8%) 1
152152
hir-stats - Binding 216 ( 2.4%) 3
153-
hir-stats GenericParam 400 ( 4.5%) 5 80
153+
hir-stats GenericParam 400 ( 4.4%) 5 80
154154
hir-stats Generics 560 ( 6.2%) 10 56
155155
hir-stats Ty 720 ( 8.0%) 15 48
156156
hir-stats - Ptr 48 ( 0.5%) 1
157157
hir-stats - Ref 48 ( 0.5%) 1
158-
hir-stats - Path 624 ( 7.0%) 13
159-
hir-stats Expr 768 ( 8.6%) 12 64
158+
hir-stats - Path 624 ( 6.9%) 13
159+
hir-stats Expr 768 ( 8.5%) 12 64
160160
hir-stats - InlineAsm 64 ( 0.7%) 1
161161
hir-stats - Match 64 ( 0.7%) 1
162162
hir-stats - Path 64 ( 0.7%) 1
163163
hir-stats - Struct 64 ( 0.7%) 1
164164
hir-stats - Lit 128 ( 1.4%) 2
165-
hir-stats - Block 384 ( 4.3%) 6
166-
hir-stats Item 968 (10.8%) 11 88
165+
hir-stats - Block 384 ( 4.2%) 6
166+
hir-stats Item 968 (10.7%) 11 88
167167
hir-stats - Enum 88 ( 1.0%) 1
168168
hir-stats - ExternCrate 88 ( 1.0%) 1
169169
hir-stats - ForeignMod 88 ( 1.0%) 1
170170
hir-stats - Impl 88 ( 1.0%) 1
171171
hir-stats - Trait 88 ( 1.0%) 1
172-
hir-stats - Fn 176 ( 2.0%) 2
172+
hir-stats - Fn 176 ( 1.9%) 2
173173
hir-stats - Use 352 ( 3.9%) 4
174-
hir-stats Path 1_240 (13.8%) 31 40
175-
hir-stats PathSegment 1_920 (21.4%) 40 48
174+
hir-stats Path 1_240 (13.7%) 31 40
175+
hir-stats PathSegment 1_920 (21.2%) 40 48
176176
hir-stats ----------------------------------------------------------------
177-
hir-stats Total 8_976 180
177+
hir-stats Total 9_040 180
178178
hir-stats

‎tests/ui/symbol-names/basic.legacy.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_ZN5basic4main17hc88b9d80a69d119aE)
1+
error: symbol-name(_ZN5basic4main17h204cbd963724a7dbE)
22
--> $DIR/basic.rs:8:1
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(basic::main::hc88b9d80a69d119a)
7+
error: demangling(basic::main::h204cbd963724a7db)
88
--> $DIR/basic.rs:8:1
99
|
1010
LL | #[rustc_symbol_name]

0 commit comments

Comments
 (0)