Revert "Work around ICE in rustc: the naive layout isn't refined by t…

…he actual layout" Fixed in nightly-2023-07-23. This reverts commit a186f88.
dtolnay · Jul 23, 2023 · 2537c60 · 2537c60
1 parent e528e11
commit 2537c60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -246,9 +246,7 @@ document_iter! {
 mod void_iter {
     enum Void {}
 
-    // https://github.com/rust-lang/rust/issues/113941
-    const WORK_AROUND_RUST_ISSUE_113941: usize = 1;
-    pub struct Iter<T>([*const T; WORK_AROUND_RUST_ISSUE_113941], Void);
+    pub struct Iter<T>([*const T; 0], Void);
 
     unsafe impl<T> Send for Iter<T> {}
     unsafe impl<T> Sync for Iter<T> {}

diff --git a/tests/test.rs b/tests/test.rs
@@ -4,7 +4,6 @@ struct Thing(usize);
 
 #[test]
 fn test_iter() {
-    // https://github.com/rust-lang/rust/issues/113941
-    assert_eq!(16, mem::size_of::<inventory::iter<Thing>>()); // FIXME
-    assert_eq!(8, mem::align_of::<inventory::iter<Thing>>()); // FIXME
+    assert_eq!(0, mem::size_of::<inventory::iter<Thing>>());
+    assert_eq!(1, mem::align_of::<inventory::iter<Thing>>());
 }