.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.67.0]
+        rust: [nightly, beta, stable, 1.70.0]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
@@ -37,14 +37,14 @@ jobs:
       - run: cargo test
 
   msrv:
-    name: Rust 1.56.0
+    name: Rust 1.61.0
     needs: pre_ci
     if: needs.pre_ci.outputs.continue
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.56.0
+      - uses: dtolnay/rust-toolchain@1.61.0
       - run: cargo check --manifest-path tests/crate/Cargo.toml
 
   minimal:
@@ -104,5 +104,6 @@ jobs:
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
       - uses: dtolnay/install@cargo-outdated
       - run: cargo outdated --workspace --exit-code 1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde-untagged"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["encoding", "no-std"]
 description = "Serde `Visitor` implementation for deserializing untagged enums"
@@ -9,11 +9,12 @@ edition = "2021"
 keywords = ["serde", "untagged"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/serde-untagged"
-rust-version = "1.56"
+rust-version = "1.61"
 
 [dependencies]
 erased-serde = { version = "0.4.2", default-features = false, features = ["alloc"] }
 serde = { version = "1.0.194", default-features = false, features = ["alloc"] }
+typeid = "1"
 
 [dev-dependencies]
 serde_derive = "1.0.194"

src/any.rs

@@ -1,8 +1,6 @@
 use alloc::boxed::Box;
 #[cfg(any(debug_assertions, miri))]
 use core::any::{self, TypeId};
-#[cfg(any(debug_assertions, miri))]
-use core::marker::PhantomData;
 use core::mem;
 
 pub(crate) struct ErasedValue {
@@ -25,7 +23,7 @@ impl ErasedValue {
                 drop::<T>
             },
             #[cfg(any(debug_assertions, miri))]
-            type_id: non_static_type_id::<T>(),
+            type_id: typeid::of::<T>(),
             #[cfg(any(debug_assertions, miri))]
             type_name: any::type_name::<T>(),
         }
@@ -35,7 +33,7 @@ impl ErasedValue {
         #[cfg(any(debug_assertions, miri))]
         assert_eq!(
             self.type_id,
-            non_static_type_id::<T>(),
+            typeid::of::<T>(),
             "ErasedValue mismatch: {} vs {}",
             self.type_name,
             any::type_name::<T>(),
@@ -52,26 +50,3 @@ impl Drop for ErasedValue {
         unsafe { (self.drop)(self.ptr) }
     }
 }
-
-#[cfg(any(debug_assertions, miri))]
-fn non_static_type_id<T: ?Sized>() -> TypeId {
-    trait NonStaticAny {
-        fn get_type_id(&self) -> TypeId
-        where
-            Self: 'static;
-    }
-
-    impl<T: ?Sized> NonStaticAny for PhantomData<T> {
-        fn get_type_id(&self) -> TypeId
-        where
-            Self: 'static,
-        {
-            TypeId::of::<T>()
-        }
-    }
-
-    let phantom_data = PhantomData::<T>;
-    NonStaticAny::get_type_id(unsafe {
-        mem::transmute::<&dyn NonStaticAny, &(dyn NonStaticAny + 'static)>(&phantom_data)
-    })
-}

src/lib.rs

@@ -183,7 +183,7 @@
 //! ```
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/serde-untagged/0.1.5")]
+#![doc(html_root_url = "https://docs.rs/serde-untagged/0.1.6")]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![allow(
     clippy::doc_markdown,