Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pad size of TypeId and remove structural equality #99189

Closed
wants to merge 9 commits into from
Closed

Pad size of TypeId and remove structural equality #99189

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
642b8e1
Pad size of typeid and remove structuraleq
carbotaniuman Jul 12, 2022
61e9395
Actually delete derive
carbotaniuman Jul 12, 2022
0bb7737
Add stability attrs
carbotaniuman Jul 12, 2022
7985d93
Update tests
carbotaniuman Jul 13, 2022
b35362c
Try MaybeUninit
carbotaniuman Jul 21, 2022
34b2cce
Impl traits manually
carbotaniuman Jul 21, 2022
e531a9a
Fullly qualify
carbotaniuman Jul 21, 2022
ee6d19b
Fix
carbotaniuman Jul 21, 2022
53dcb86
Dead code warnings
carbotaniuman Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions library/core/src/any.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,22 @@ impl dyn Any + Send + Sync {
/// While `TypeId` implements `Hash`, `PartialOrd`, and `Ord`, it is worth
/// noting that the hashes and ordering will vary between Rust releases. Beware
/// of relying on them inside of your code!
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
#[derive(Clone, Copy, PartialOrd, Ord, Debug, Hash)]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct TypeId {
pad: u64,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have some comment why that field added, as it isn't obvious.

t: u64,
}

#[stable(feature = "rust1", since = "1.0.0")]
impl PartialEq for TypeId {
fn eq(&self, other: &Self) -> bool {
self.t == other.t
}
}
#[stable(feature = "rust1", since = "1.0.0")]
impl Eq for TypeId {}

impl TypeId {
/// Returns the `TypeId` of the type this generic function has been
/// instantiated with.
Expand All @@ -691,7 +701,7 @@ impl TypeId {
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
pub const fn of<T: ?Sized + 'static>() -> TypeId {
TypeId { t: intrinsics::type_id::<T>() }
TypeId { pad: 0, t: intrinsics::type_id::<T>() }
}
}

Expand Down