enable non-exhaustive on stable

Author: dimpolo

partialdebug-derive/src/lib.rs

@@ -8,9 +8,7 @@ use syn::*;
 
 /// The non-exhaustive version of `PartialDebug`
 ///
-/// Requires the `unstable` feature.
 /// Only available for structs with named fields.
-#[cfg(feature = "unstable")]
 #[proc_macro_derive(NonExhaustivePartialDebug)]
 pub fn derive_non_exhaustive(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemStruct);
@@ -27,19 +25,7 @@ pub fn derive_non_exhaustive(input: TokenStream) -> TokenStream {
         }
     };
 
-    let as_debug_all_fields = fields.iter().map(|field| {
-        let name = &field.ident;
-        quote! {
-            match ::partialdebug::specialization::AsDebug::as_debug(&self. #name) {
-                ::core::option::Option::None => {
-                    __exhaustive = false;
-                }
-                ::core::option::Option::Some(field) => {
-                    __s.field(stringify!(#name), field);
-                }
-            }
-        }
-    });
+    let as_debug_all_fields = fields.iter().map(gen_field_as_debug_non_exhaustive);
 
     let expanded = quote! {
         impl #impl_generics ::core::fmt::Debug for #name #ty_generics #where_clause{
@@ -61,6 +47,39 @@ pub fn derive_non_exhaustive(input: TokenStream) -> TokenStream {
     TokenStream::from(expanded)
 }
 
+#[cfg(feature = "unstable")]
+fn gen_field_as_debug_non_exhaustive(field: &Field) -> TokenStream2 {
+    let name = &field.ident;
+
+    quote! {
+        match ::partialdebug::specialization::AsDebug::as_debug(&self. #name) {
+            ::core::option::Option::None => {
+                __exhaustive = false;
+            }
+            ::core::option::Option::Some(field) => {
+                __s.field(stringify!(#name), field);
+            }
+        }
+    }
+}
+
+#[cfg(not(feature = "unstable"))]
+fn gen_field_as_debug_non_exhaustive(field: &Field) -> TokenStream2 {
+    let name = &field.ident;
+    let field_type = &field.ty;
+
+    quote! {
+        match ::partialdebug::no_specialization::DebugDetector::<#field_type>::as_debug(&self. #name) {
+            ::core::option::Option::None => {
+                __exhaustive = false;
+            }
+            ::core::option::Option::Some(field) => {
+                __s.field(stringify!(#name), field);
+            }
+        }
+    }
+}
+
 /// The placeholder version of `PartialDebug`
 #[proc_macro_derive(PlaceholderPartialDebug, attributes(debug_placeholder))]
 pub fn derive_placeholder(input: TokenStream) -> TokenStream {
@@ -159,7 +178,7 @@ fn struct_field_conversions<'a>(
             }
             Some(name) => (quote! {self.#name}, Some(quote! {stringify!(#name),})),
         };
-        gen_field_as_debug(field, placeholder, field_handle, name_arg)
+        gen_field_as_debug_placeholder(field, placeholder, field_handle, name_arg)
     })
 }
 
@@ -175,12 +194,12 @@ fn enum_field_conversions<'a>(
             }
             Some(name) => (quote! {#name}, Some(quote! {stringify!(#name),})),
         };
-        gen_field_as_debug(field, placeholder, field_handle, name_arg)
+        gen_field_as_debug_placeholder(field, placeholder, field_handle, name_arg)
     })
 }
 
 #[cfg(feature = "unstable")]
-fn gen_field_as_debug(
+fn gen_field_as_debug_placeholder(
     field: &Field,
     placeholder: &Option<String>,
     field_handle: TokenStream2,
@@ -203,7 +222,7 @@ fn gen_field_as_debug(
 }
 
 #[cfg(not(feature = "unstable"))]
-fn gen_field_as_debug(
+fn gen_field_as_debug_placeholder(
     field: &Field,
     placeholder: &Option<String>,
     field_handle: TokenStream2,

src/lib.rs

@@ -1,7 +1,7 @@
 //! Derive Debug for types where not all fields implement Debug.
 //!
 //! This crate works on stable and with `no_std`.
-//! On nightly the `unstable` feature can be used for specialization-based trait detection and/or `..` formatting.
+//! On nightly the `unstable` feature can be used for specialization-based trait detection.
 //!
 //! ### Placeholder with Type Info
 //!
@@ -61,36 +61,30 @@
 //! ### Non-Exhaustive
 //!
 //! Only available for structs with named fields.
-
-#![cfg_attr(
-    feature = "unstable",
-    doc = r##"
-```
-#![feature(debug_non_exhaustive)]
-use partialdebug::non_exhaustive::PartialDebug;
-# struct DNA;
-#
-#[derive(PartialDebug)]
-struct Dog {
-    legs: usize,
-    eyes: usize,
-    dna: DNA,
-}
-# impl Dog {
-#     fn new() -> Dog {
-#         Dog {
-#             legs: 4,
-#             eyes: 2,
-#             dna: DNA,
-#         }
-#     }
-# }
-#
-assert_eq!(format!("{:?}", Dog::new()), "Dog { legs: 4, eyes: 2, .. }");
-```
-"##
-)]
-
+//!
+//! ```
+//! use partialdebug::non_exhaustive::PartialDebug;
+//! # struct DNA;
+//! #
+//! #[derive(PartialDebug)]
+//! struct Dog {
+//!     legs: usize,
+//!     eyes: usize,
+//!     dna: DNA,
+//! }
+//! # impl Dog {
+//! #     fn new() -> Dog {
+//! #         Dog {
+//! #             legs: 4,
+//! #             eyes: 2,
+//! #             dna: DNA,
+//! #         }
+//! #     }
+//! # }
+//! #
+//! assert_eq!(format!("{:?}", Dog::new()), "Dog { legs: 4, eyes: 2, .. }");
+//! ```
+//!
 //! ### Caveats
 //!
 //! Trait detection for generic types requires specialization.
@@ -142,7 +136,8 @@ pub mod placeholder {
 }
 
 /// The non exhaustive version of `PartialDebug`
-#[cfg(feature = "unstable")]
 pub mod non_exhaustive {
+    #[cfg(not(feature = "unstable"))]
+    pub use crate::no_specialization::NotDebug as PartialDebug; // needs to be in scope
     pub use partialdebug_derive::NonExhaustivePartialDebug as PartialDebug;
 }

tests/hygiene.rs

@@ -1,6 +1,5 @@
 #![no_implicit_prelude]
 #![no_std]
-#![cfg_attr(feature = "unstable", feature(debug_non_exhaustive))]
 #![allow(dead_code)]
 
 use ::partialdebug;