@@ -11,8 +11,14 @@ unsafe extern "C" fn _Unwind_Resume() {
11
11
intrinsics:: unreachable ( ) ;
12
12
}
13
13
14
+ #[ lang = "pointee_sized" ]
15
+ pub trait PointeeSized { }
16
+
17
+ #[ lang = "meta_sized" ]
18
+ pub trait MetaSized : PointeeSized { }
19
+
14
20
#[ lang = "sized" ]
15
- pub trait Sized { }
21
+ pub trait Sized : MetaSized { }
16
22
17
23
#[ lang = "destruct" ]
18
24
pub trait Destruct { }
@@ -21,35 +27,35 @@ pub trait Destruct {}
21
27
pub trait Tuple { }
22
28
23
29
#[ lang = "unsize" ]
24
- pub trait Unsize < T : ? Sized > { }
30
+ pub trait Unsize < T : PointeeSized > : PointeeSized { }
25
31
26
32
#[ lang = "coerce_unsized" ]
27
33
pub trait CoerceUnsized < T > { }
28
34
29
- impl < ' a , ' b : ' a , T : ? Sized + Unsize < U > , U : ? Sized > CoerceUnsized < & ' a U > for & ' b T { }
30
- impl < ' a , T : ? Sized + Unsize < U > , U : ? Sized > CoerceUnsized < & ' a mut U > for & ' a mut T { }
31
- impl < T : ? Sized + Unsize < U > , U : ? Sized > CoerceUnsized < * const U > for * const T { }
32
- impl < T : ? Sized + Unsize < U > , U : ? Sized > CoerceUnsized < * mut U > for * mut T { }
35
+ impl < ' a , ' b : ' a , T : PointeeSized + Unsize < U > , U : PointeeSized > CoerceUnsized < & ' a U > for & ' b T { }
36
+ impl < ' a , T : PointeeSized + Unsize < U > , U : PointeeSized > CoerceUnsized < & ' a mut U > for & ' a mut T { }
37
+ impl < T : PointeeSized + Unsize < U > , U : PointeeSized > CoerceUnsized < * const U > for * const T { }
38
+ impl < T : PointeeSized + Unsize < U > , U : PointeeSized > CoerceUnsized < * mut U > for * mut T { }
33
39
34
40
#[ lang = "dispatch_from_dyn" ]
35
41
pub trait DispatchFromDyn < T > { }
36
42
37
43
// &T -> &U
38
- impl < ' a , T : ? Sized + Unsize < U > , U : ? Sized > DispatchFromDyn < & ' a U > for & ' a T { }
44
+ impl < ' a , T : PointeeSized + Unsize < U > , U : PointeeSized > DispatchFromDyn < & ' a U > for & ' a T { }
39
45
// &mut T -> &mut U
40
- impl < ' a , T : ? Sized + Unsize < U > , U : ? Sized > DispatchFromDyn < & ' a mut U > for & ' a mut T { }
46
+ impl < ' a , T : PointeeSized + Unsize < U > , U : PointeeSized > DispatchFromDyn < & ' a mut U > for & ' a mut T { }
41
47
// *const T -> *const U
42
- impl < T : ? Sized + Unsize < U > , U : ? Sized > DispatchFromDyn < * const U > for * const T { }
48
+ impl < T : PointeeSized + Unsize < U > , U : PointeeSized > DispatchFromDyn < * const U > for * const T { }
43
49
// *mut T -> *mut U
44
- impl < T : ? Sized + Unsize < U > , U : ? Sized > DispatchFromDyn < * mut U > for * mut T { }
45
- impl < T : ? Sized + Unsize < U > , U : ? Sized > DispatchFromDyn < Box < U , ( ) > > for Box < T , ( ) > { }
50
+ impl < T : PointeeSized + Unsize < U > , U : PointeeSized > DispatchFromDyn < * mut U > for * mut T { }
51
+ impl < T : MetaSized + Unsize < U > , U : MetaSized > DispatchFromDyn < Box < U , ( ) > > for Box < T , ( ) > { }
46
52
47
53
#[ lang = "legacy_receiver" ]
48
54
pub trait LegacyReceiver { }
49
55
50
- impl < T : ? Sized > LegacyReceiver for & T { }
51
- impl < T : ? Sized > LegacyReceiver for & mut T { }
52
- impl < T : ? Sized , A : Allocator > LegacyReceiver for Box < T , A > { }
56
+ impl < T : PointeeSized > LegacyReceiver for & T { }
57
+ impl < T : PointeeSized > LegacyReceiver for & mut T { }
58
+ impl < T : MetaSized > LegacyReceiver for Box < T > { }
53
59
54
60
#[ lang = "receiver" ]
55
61
trait Receiver {
@@ -74,9 +80,9 @@ impl Copy for isize {}
74
80
impl Copy for f32 { }
75
81
impl Copy for f64 { }
76
82
impl Copy for char { }
77
- impl < ' a , T : ? Sized > Copy for & ' a T { }
78
- impl < T : ? Sized > Copy for * const T { }
79
- impl < T : ? Sized > Copy for * mut T { }
83
+ impl < ' a , T : PointeeSized > Copy for & ' a T { }
84
+ impl < T : PointeeSized > Copy for * const T { }
85
+ impl < T : PointeeSized > Copy for * mut T { }
80
86
81
87
#[ lang = "sync" ]
82
88
pub unsafe trait Sync { }
@@ -92,17 +98,17 @@ unsafe impl Sync for i16 {}
92
98
unsafe impl Sync for i32 { }
93
99
unsafe impl Sync for isize { }
94
100
unsafe impl Sync for char { }
95
- unsafe impl < ' a , T : ? Sized > Sync for & ' a T { }
101
+ unsafe impl < ' a , T : PointeeSized > Sync for & ' a T { }
96
102
unsafe impl Sync for [ u8 ; 16 ] { }
97
103
98
104
#[ lang = "freeze" ]
99
105
unsafe auto trait Freeze { }
100
106
101
- unsafe impl < T : ? Sized > Freeze for PhantomData < T > { }
102
- unsafe impl < T : ? Sized > Freeze for * const T { }
103
- unsafe impl < T : ? Sized > Freeze for * mut T { }
104
- unsafe impl < T : ? Sized > Freeze for & T { }
105
- unsafe impl < T : ? Sized > Freeze for & mut T { }
107
+ unsafe impl < T : PointeeSized > Freeze for PhantomData < T > { }
108
+ unsafe impl < T : PointeeSized > Freeze for * const T { }
109
+ unsafe impl < T : PointeeSized > Freeze for * mut T { }
110
+ unsafe impl < T : PointeeSized > Freeze for & T { }
111
+ unsafe impl < T : PointeeSized > Freeze for & mut T { }
106
112
107
113
#[ lang = "structural_peq" ]
108
114
pub trait StructuralPartialEq { }
@@ -447,7 +453,7 @@ pub enum Option<T> {
447
453
pub use Option :: * ;
448
454
449
455
#[ lang = "phantom_data" ]
450
- pub struct PhantomData < T : ? Sized > ;
456
+ pub struct PhantomData < T : PointeeSized > ;
451
457
452
458
#[ lang = "fn_once" ]
453
459
#[ rustc_paren_sugar]
@@ -564,18 +570,18 @@ impl Allocator for Global {}
564
570
#[ repr( transparent) ]
565
571
#[ rustc_layout_scalar_valid_range_start( 1 ) ]
566
572
#[ rustc_nonnull_optimization_guaranteed]
567
- pub struct NonNull < T : ? Sized > ( pub * const T ) ;
573
+ pub struct NonNull < T : PointeeSized > ( pub * const T ) ;
568
574
569
- impl < T : ? Sized , U : ? Sized > CoerceUnsized < NonNull < U > > for NonNull < T > where T : Unsize < U > { }
570
- impl < T : ? Sized , U : ? Sized > DispatchFromDyn < NonNull < U > > for NonNull < T > where T : Unsize < U > { }
575
+ impl < T : PointeeSized , U : PointeeSized > CoerceUnsized < NonNull < U > > for NonNull < T > where T : Unsize < U > { }
576
+ impl < T : PointeeSized , U : PointeeSized > DispatchFromDyn < NonNull < U > > for NonNull < T > where T : Unsize < U > { }
571
577
572
- pub struct Unique < T : ? Sized > {
578
+ pub struct Unique < T : PointeeSized > {
573
579
pub pointer : NonNull < T > ,
574
580
pub _marker : PhantomData < T > ,
575
581
}
576
582
577
- impl < T : ? Sized , U : ? Sized > CoerceUnsized < Unique < U > > for Unique < T > where T : Unsize < U > { }
578
- impl < T : ? Sized , U : ? Sized > DispatchFromDyn < Unique < U > > for Unique < T > where T : Unsize < U > { }
583
+ impl < T : PointeeSized , U : PointeeSized > CoerceUnsized < Unique < U > > for Unique < T > where T : Unsize < U > { }
584
+ impl < T : PointeeSized , U : PointeeSized > DispatchFromDyn < Unique < U > > for Unique < T > where T : Unsize < U > { }
579
585
580
586
#[ lang = "owned_box" ]
581
587
pub struct Box < T : ?Sized , A : Allocator = Global > ( Unique < T > , A ) ;
0 commit comments