Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4bd78b0

Browse files
authoredJul 8, 2024
Rollup merge of #120248 - WaffleLapkin:bonk-ptr-object-casts, r=compiler-errors,oli-obk,lnicola
Make casts of pointers to trait objects stricter This is an attempt to `fix` rust-lang/rust#120222 and rust-lang/rust#120217. This is done by adding restrictions on casting pointers to trait objects. Before this PR the rules were as follows: > When casting `*const X<dyn A>` -> `*const Y<dyn B>`, principal traits in `A` and `B` must refer to the same trait definition (or no trait). With this PR the rules are changed to > When casting `*const X<dyn Src>` -> `*const Y<dyn Dst>` > - if `Dst` has a principal trait `DstP`, > - `Src` must have a principal trait `SrcP` > - `dyn SrcP` and `dyn DstP` must be the same type (modulo the trait object lifetime, `dyn T+'a` -> `dyn T+'b` is allowed) > - Auto traits in `Dst` must be a subset of auto traits in `Src` > - Not adhering to this is currently a FCW (warn-by-default + `FutureReleaseErrorReportInDeps`), instead of an error > - if `Src` has a principal trait `Dst` must as well > - this restriction will be removed in a follow up PR This ensures that 1. Principal trait's generic arguments match (no `*const dyn Tr<A>` -> `*const dyn Tr<B>` casts, which are a problem for [#120222](rust-lang/rust#120222)) 2. Principal trait's lifetime arguments match (no `*const dyn Tr<'a>` -> `*const dyn Tr<'b>` casts, which are a problem for [#120217](rust-lang/rust#120217)) 3. No auto traits can be _added_ (this is a problem for arbitrary self types, see [this comment](rust-lang/rust#120248 (comment))) Some notes: - We only care about the metadata/last field, so you can still cast `*const dyn T` to `*const WithHeader<dyn T>`, etc - The lifetime of the trait object itself (`dyn A + 'lt`) is not checked, so you can still cast `*mut FnOnce() + '_` to `*mut FnOnce() + 'static`, etc - This feels fishy, but I couldn't come up with a reason it must be checked The diagnostics are currently not great, to say the least, but as far as I can tell this correctly fixes the issues. cc `@oli-obk` `@compiler-errors` `@lcnr`
2 parents 7a4e9a0 + 0cea755 commit 4bd78b0

File tree

1 file changed

+0
-71
lines changed

1 file changed

+0
-71
lines changed
 

‎crates/stdx/src/anymap.rs

-71
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ pub type RawMap<A> = hash_map::HashMap<TypeId, Box<A>, BuildHasherDefault<TypeId
6868
/// The type parameter `A` allows you to use a different value type; normally you will want
6969
/// it to be `core::any::Any` (also known as `std::any::Any`), but there are other choices:
7070
///
71-
/// - If you want the entire map to be cloneable, use `CloneAny` instead of `Any`; with
72-
/// that, you can only add types that implement `Clone` to the map.
7371
/// - You can add on `+ Send` or `+ Send + Sync` (e.g. `Map<dyn Any + Send>`) to add those
7472
/// auto traits.
7573
///
@@ -79,9 +77,6 @@ pub type RawMap<A> = hash_map::HashMap<TypeId, Box<A>, BuildHasherDefault<TypeId
7977
/// also spelled [`AnyMap`] for convenience.
8078
/// - <code>[Map]&lt;dyn [core::any::Any] + Send&gt;</code>
8179
/// - <code>[Map]&lt;dyn [core::any::Any] + Send + Sync&gt;</code>
82-
/// - <code>[Map]&lt;dyn [CloneAny]&gt;</code>
83-
/// - <code>[Map]&lt;dyn [CloneAny] + Send&gt;</code>
84-
/// - <code>[Map]&lt;dyn [CloneAny] + Send + Sync&gt;</code>
8580
///
8681
/// ## Example
8782
///
@@ -205,12 +200,6 @@ mod tests {
205200
assert_debug::<Map<dyn Any>>();
206201
assert_debug::<Map<dyn Any + Send>>();
207202
assert_debug::<Map<dyn Any + Send + Sync>>();
208-
assert_send::<Map<dyn CloneAny + Send>>();
209-
assert_send::<Map<dyn CloneAny + Send + Sync>>();
210-
assert_sync::<Map<dyn CloneAny + Send + Sync>>();
211-
assert_debug::<Map<dyn CloneAny>>();
212-
assert_debug::<Map<dyn CloneAny + Send>>();
213-
assert_debug::<Map<dyn CloneAny + Send + Sync>>();
214203
}
215204

216205
#[test]
@@ -232,53 +221,6 @@ mod tests {
232221
}
233222
}
234223

235-
// impl some traits for dyn Any
236-
use core::fmt;
237-
238-
#[doc(hidden)]
239-
pub trait CloneToAny {
240-
/// Clone `self` into a new `Box<dyn CloneAny>` object.
241-
fn clone_to_any(&self) -> Box<dyn CloneAny>;
242-
}
243-
244-
impl<T: Any + Clone> CloneToAny for T {
245-
#[inline]
246-
fn clone_to_any(&self) -> Box<dyn CloneAny> {
247-
Box::new(self.clone())
248-
}
249-
}
250-
251-
macro_rules! impl_clone {
252-
($t:ty) => {
253-
impl Clone for Box<$t> {
254-
#[inline]
255-
fn clone(&self) -> Box<$t> {
256-
// SAFETY: this dance is to reapply any Send/Sync marker. I’m not happy about this
257-
// approach, given that I used to do it in safe code, but then came a dodgy
258-
// future-compatibility warning where_clauses_object_safety, which is spurious for
259-
// auto traits but still super annoying (future-compatibility lints seem to mean
260-
// your bin crate needs a corresponding allow!). Although I explained my plight¹
261-
// and it was all explained and agreed upon, no action has been taken. So I finally
262-
// caved and worked around it by doing it this way, which matches what’s done for
263-
// core::any², so it’s probably not *too* bad.
264-
//
265-
// ¹ https://github.com/rust-lang/rust/issues/51443#issuecomment-421988013
266-
// ² https://github.com/rust-lang/rust/blob/e7825f2b690c9a0d21b6f6d84c404bb53b151b38/library/alloc/src/boxed.rs#L1613-L1616
267-
let clone: Box<dyn CloneAny> = (**self).clone_to_any();
268-
let raw: *mut dyn CloneAny = Box::into_raw(clone);
269-
unsafe { Box::from_raw(raw as *mut $t) }
270-
}
271-
}
272-
273-
impl fmt::Debug for $t {
274-
#[inline]
275-
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
276-
f.pad(stringify!($t))
277-
}
278-
}
279-
};
280-
}
281-
282224
/// Methods for downcasting from an `Any`-like trait object.
283225
///
284226
/// This should only be implemented on trait objects for subtraits of `Any`, though you can
@@ -350,16 +292,3 @@ macro_rules! implement {
350292
implement!(Any);
351293
implement!(Any + Send);
352294
implement!(Any + Send + Sync);
353-
354-
/// [`Any`], but with cloning.
355-
///
356-
/// Every type with no non-`'static` references that implements `Clone` implements `CloneAny`.
357-
/// See [`core::any`] for more details on `Any` in general.
358-
pub trait CloneAny: Any + CloneToAny {}
359-
impl<T: Any + Clone> CloneAny for T {}
360-
implement!(CloneAny);
361-
implement!(CloneAny + Send);
362-
implement!(CloneAny + Send + Sync);
363-
impl_clone!(dyn CloneAny);
364-
impl_clone!(dyn CloneAny + Send);
365-
impl_clone!(dyn CloneAny + Send + Sync);

0 commit comments

Comments
 (0)
Failed to load comments.