Skip to content

Commit 8b9344a

Browse files
spastorinospastorino
committed
Fix object safety checks for new RPITITs
1 parent fa421ec commit 8b9344a

File tree

4 files changed

+61
-9
lines changed

4 files changed

+61
-9
lines changed

‎compiler/rustc_trait_selection/src/traits/object_safety.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use super::{elaborate_predicates, elaborate_trait_ref};
1313
use crate::infer::TyCtxtInferExt;
1414
use crate::traits::query::evaluate_obligation::InferCtxtExt;
1515
use crate::traits::{self, Obligation, ObligationCause};
16-
use hir::def::DefKind;
1716
use rustc_errors::{DelayDm, FatalError, MultiSpan};
1817
use rustc_hir as hir;
1918
use rustc_hir::def_id::DefId;
@@ -855,7 +854,7 @@ fn contains_illegal_self_type_reference<'tcx, T: TypeVisitable<TyCtxt<'tcx>>>(
855854
}
856855
}
857856
ty::Alias(ty::Projection, ref data)
858-
if self.tcx.def_kind(data.def_id) == DefKind::ImplTraitPlaceholder =>
857+
if self.tcx.is_impl_trait_in_trait(data.def_id) =>
859858
{
860859
// We'll deny these later in their own pass
861860
ControlFlow::Continue(())
@@ -922,7 +921,7 @@ pub fn contains_illegal_impl_trait_in_trait<'tcx>(
922921
ty.skip_binder().walk().find_map(|arg| {
923922
if let ty::GenericArgKind::Type(ty) = arg.unpack()
924923
&& let ty::Alias(ty::Projection, proj) = ty.kind()
925-
&& tcx.def_kind(proj.def_id) == DefKind::ImplTraitPlaceholder
924+
&& tcx.is_impl_trait_in_trait(proj.def_id)
926925
{
927926
Some(MethodViolationCode::ReferencesImplTraitInTrait(tcx.def_span(proj.def_id)))
928927
} else {

‎tests/ui/impl-trait/in-trait/object-safety.stderr ‎tests/ui/impl-trait/in-trait/object-safety.current.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0038]: the trait `Foo` cannot be made into an object
2-
--> $DIR/object-safety.rs:17:33
2+
--> $DIR/object-safety.rs:20:33
33
|
44
LL | let i = Box::new(42_u32) as Box<dyn Foo>;
55
| ^^^^^^^^^^^^ `Foo` cannot be made into an object
66
|
77
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
8-
--> $DIR/object-safety.rs:7:22
8+
--> $DIR/object-safety.rs:10:22
99
|
1010
LL | trait Foo {
1111
| --- this trait cannot be made into an object...
@@ -14,13 +14,13 @@ LL | fn baz(&self) -> impl Debug;
1414
= help: consider moving `baz` to another trait
1515

1616
error[E0038]: the trait `Foo` cannot be made into an object
17-
--> $DIR/object-safety.rs:20:13
17+
--> $DIR/object-safety.rs:23:13
1818
|
1919
LL | let s = i.baz();
2020
| ^^^^^^^ `Foo` cannot be made into an object
2121
|
2222
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
23-
--> $DIR/object-safety.rs:7:22
23+
--> $DIR/object-safety.rs:10:22
2424
|
2525
LL | trait Foo {
2626
| --- this trait cannot be made into an object...
@@ -29,13 +29,13 @@ LL | fn baz(&self) -> impl Debug;
2929
= help: consider moving `baz` to another trait
3030

3131
error[E0038]: the trait `Foo` cannot be made into an object
32-
--> $DIR/object-safety.rs:17:13
32+
--> $DIR/object-safety.rs:20:13
3333
|
3434
LL | let i = Box::new(42_u32) as Box<dyn Foo>;
3535
| ^^^^^^^^^^^^^^^^ `Foo` cannot be made into an object
3636
|
3737
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
38-
--> $DIR/object-safety.rs:7:22
38+
--> $DIR/object-safety.rs:10:22
3939
|
4040
LL | trait Foo {
4141
| --- this trait cannot be made into an object...

‎tests/ui/impl-trait/in-trait/object-safety.next.stderr

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
error[E0038]: the trait `Foo` cannot be made into an object
2+
--> $DIR/object-safety.rs:20:33
3+
|
4+
LL | let i = Box::new(42_u32) as Box<dyn Foo>;
5+
| ^^^^^^^^^^^^ `Foo` cannot be made into an object
6+
|
7+
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
8+
--> $DIR/object-safety.rs:10:22
9+
|
10+
LL | trait Foo {
11+
| --- this trait cannot be made into an object...
12+
LL | fn baz(&self) -> impl Debug;
13+
| ^^^^^^^^^^ ...because method `baz` references an `impl Trait` type in its return type
14+
= help: consider moving `baz` to another trait
15+
16+
error[E0038]: the trait `Foo` cannot be made into an object
17+
--> $DIR/object-safety.rs:23:13
18+
|
19+
LL | let s = i.baz();
20+
| ^^^^^^^ `Foo` cannot be made into an object
21+
|
22+
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
23+
--> $DIR/object-safety.rs:10:22
24+
|
25+
LL | trait Foo {
26+
| --- this trait cannot be made into an object...
27+
LL | fn baz(&self) -> impl Debug;
28+
| ^^^^^^^^^^ ...because method `baz` references an `impl Trait` type in its return type
29+
= help: consider moving `baz` to another trait
30+
31+
error[E0038]: the trait `Foo` cannot be made into an object
32+
--> $DIR/object-safety.rs:20:13
33+
|
34+
LL | let i = Box::new(42_u32) as Box<dyn Foo>;
35+
| ^^^^^^^^^^^^^^^^ `Foo` cannot be made into an object
36+
|
37+
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
38+
--> $DIR/object-safety.rs:10:22
39+
|
40+
LL | trait Foo {
41+
| --- this trait cannot be made into an object...
42+
LL | fn baz(&self) -> impl Debug;
43+
| ^^^^^^^^^^ ...because method `baz` references an `impl Trait` type in its return type
44+
= help: consider moving `baz` to another trait
45+
= note: required for `Box<u32>` to implement `CoerceUnsized<Box<dyn Foo>>`
46+
= note: required by cast to type `Box<dyn Foo>`
47+
48+
error: aborting due to 3 previous errors
49+
50+
For more information about this error, try `rustc --explain E0038`.

‎tests/ui/impl-trait/in-trait/object-safety.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// [next] compile-flags: -Zlower-impl-trait-in-trait-to-assoc-ty
2+
// revisions: current next
3+
14
#![feature(return_position_impl_trait_in_trait)]
25
#![allow(incomplete_features)]
36

0 commit comments

Comments
 (0)