From f54663767d205ebcc2eb7630f63dfea99e4add31 Mon Sep 17 00:00:00 2001 From: Tony Yang Date: Tue, 26 Oct 2021 11:34:03 +0100 Subject: [PATCH] Remove redundant Aligner The `Aligner` struct seems to be unnecessary. Previously noted by @arthurprs https://github.com/rust-lang/rust/pull/44963#discussion_r145340754 Reddit discussion: https://www.reddit.com/r/rust/comments/pfvvz2/aligner_and_cachealigned/ Playground: https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=fa7ca554922755f9d1b62b017d785c6f --- library/std/src/sync/mpsc/cache_aligned.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/library/std/src/sync/mpsc/cache_aligned.rs b/library/std/src/sync/mpsc/cache_aligned.rs index b0842144328..f95b0ddd589 100644 --- a/library/std/src/sync/mpsc/cache_aligned.rs +++ b/library/std/src/sync/mpsc/cache_aligned.rs @@ -2,10 +2,7 @@ use crate::ops::{Deref, DerefMut}; #[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)] #[repr(align(64))] -pub(super) struct Aligner; - -#[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub(super) struct CacheAligned(pub T, pub Aligner); +pub(super) struct CacheAligned(pub T); impl Deref for CacheAligned { type Target = T; @@ -22,6 +19,6 @@ impl DerefMut for CacheAligned { impl CacheAligned { pub(super) fn new(t: T) -> Self { - CacheAligned(t, Aligner) + CacheAligned(t) } }