Small cleanup improvements

juntyr · Dec 8, 2023 · ac5ad2c · ac5ad2c
1 parent 47f0e52
commit ac5ad2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/const-type-layout-derive/src/lib.rs b/const-type-layout-derive/src/lib.rs
@@ -14,10 +14,6 @@ use proc_macro2::Literal;
 use quote::{quote, quote_spanned};
 use syn::{parse_macro_input, spanned::Spanned};
 
-// TODO:
-// - wait for `const_heap` feature to be implemented for a workaround the graph
-//   size limitation: https://github.com/rust-lang/rust/issues/79597
-
 #[proc_macro_error]
 #[proc_macro_derive(TypeLayout, attributes(layout))]
 pub fn derive_type_layout(input: TokenStream) -> TokenStream {

diff --git a/src/impls/core/sync/atomic.rs b/src/impls/core/sync/atomic.rs
@@ -1,5 +1,4 @@
 use crate::{
-    impls::leak_uninit_ptr,
     typeset::{tset, ComputeTypeSet, ExpandTypeSet, Set},
     Field, MaybeUninhabited, TypeLayout, TypeLayoutInfo, TypeStructure,
 };
@@ -119,7 +118,7 @@ macro_rules! impl_atomic_ptr_layout {
 
             unsafe fn uninit() -> MaybeUninhabited<core::mem::MaybeUninit<Self>> {
                 MaybeUninhabited::Inhabited(core::mem::MaybeUninit::new(
-                    Self::new(leak_uninit_ptr())
+                    Self::new(core::ptr::NonNull::dangling().as_ptr())
                 ))
             }
         }

diff --git a/src/lib.rs b/src/lib.rs
@@ -257,7 +257,8 @@ pub unsafe trait TypeLayout: Sized {
     unsafe fn uninit() -> MaybeUninhabited<core::mem::MaybeUninit<Self>>;
 }
 
-pub trait TypeGraphLayout: ~const TypeLayout {
+#[const_trait]
+pub trait TypeGraphLayout: ~const TypeLayout + typeset::ComputeTypeSet {
     const TYPE_GRAPH: TypeLayoutGraph<'static>;
 }
 

diff --git a/try-crate/src/main.rs b/try-crate/src/main.rs
@@ -234,6 +234,8 @@ fn main() {
 
     println!("{:#?}", <*const u8>::TYPE_GRAPH);
     println!("{:#?}", <*mut u8>::TYPE_GRAPH);
+    println!("{:#?}", <core::ptr::NonNull<u8>>::TYPE_GRAPH);
+    println!("{:#?}", <core::sync::atomic::AtomicPtr<u8>>::TYPE_GRAPH);
     println!("{:#?}", <&u8>::TYPE_GRAPH);
     println!("{:#?}", <&mut u8>::TYPE_GRAPH);
 
@@ -264,7 +266,8 @@ fn non_static_ref<'a>(_val: &'a u128) {
     println!("{:#?}", <Referencing<&'a u8>>::TYPE_GRAPH);
 }
 
-// const SERIALISED_LIST_U8_LAYOUT: [u8; const_type_layout::serialised_type_graph_len::<List<u8>>()] =
+// const SERIALISED_LIST_U8_LAYOUT: [u8;
+// const_type_layout::serialised_type_graph_len::<List<u8>>()] =
 //     const_type_layout::serialise_type_graph::<List<u8>>();
 
 #[derive(