Resolve non_local_definitions warnings in rustc 1.78-nightly

derive/src/de.rs

@@ -2,7 +2,7 @@ use crate::{attr, bound};
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::{
-    parse_quote, Data, DataEnum, DataStruct, DeriveInput, Error, Fields, FieldsNamed, Ident, Result,
+    parse_quote, Data, DataEnum, DataStruct, DeriveInput, Error, Fields, FieldsNamed, Result,
 };
 
 pub fn derive(input: DeriveInput) -> Result<TokenStream> {
@@ -26,10 +26,6 @@ pub fn derive(input: DeriveInput) -> Result<TokenStream> {
 pub fn derive_struct(input: &DeriveInput, fields: &FieldsNamed) -> Result<TokenStream> {
     let ident = &input.ident;
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
-    let dummy = Ident::new(
-        &format!("_IMPL_MINIDESERIALIZE_FOR_{}", ident),
-        Span::call_site(),
-    );
 
     let fieldname = fields.named.iter().map(|f| &f.ident).collect::<Vec<_>>();
     let fieldty = fields.named.iter().map(|f| &f.ty);
@@ -46,7 +42,7 @@ pub fn derive_struct(input: &DeriveInput, fields: &FieldsNamed) -> Result<TokenS
 
     Ok(quote! {
         #[allow(non_upper_case_globals)]
-        const #dummy: () = {
+        const _: () = {
             #[repr(C)]
             struct __Visitor #impl_generics #where_clause {
                 __out: miniserde::__private::Option<#ident #ty_generics>,
@@ -117,10 +113,6 @@ pub fn derive_enum(input: &DeriveInput, enumeration: &DataEnum) -> Result<TokenS
     }
 
     let ident = &input.ident;
-    let dummy = Ident::new(
-        &format!("_IMPL_MINIDESERIALIZE_FOR_{}", ident),
-        Span::call_site(),
-    );
 
     let var_idents = enumeration
         .variants
@@ -141,7 +133,7 @@ pub fn derive_enum(input: &DeriveInput, enumeration: &DataEnum) -> Result<TokenS
 
     Ok(quote! {
         #[allow(non_upper_case_globals)]
-        const #dummy: () = {
+        const _: () = {
             #[repr(C)]
             struct __Visitor {
                 __out: miniserde::__private::Option<#ident>,

derive/src/ser.rs

@@ -2,7 +2,7 @@ use crate::{attr, bound};
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::{
-    parse_quote, Data, DataEnum, DataStruct, DeriveInput, Error, Fields, FieldsNamed, Ident, Result,
+    parse_quote, Data, DataEnum, DataStruct, DeriveInput, Error, Fields, FieldsNamed, Result,
 };
 
 pub fn derive(input: DeriveInput) -> Result<TokenStream> {
@@ -26,10 +26,6 @@ pub fn derive(input: DeriveInput) -> Result<TokenStream> {
 fn derive_struct(input: &DeriveInput, fields: &FieldsNamed) -> Result<TokenStream> {
     let ident = &input.ident;
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
-    let dummy = Ident::new(
-        &format!("_IMPL_MINISERIALIZE_FOR_{}", ident),
-        Span::call_site(),
-    );
 
     let fieldname = &fields.named.iter().map(|f| &f.ident).collect::<Vec<_>>();
     let fieldstr = fields
@@ -46,7 +42,7 @@ fn derive_struct(input: &DeriveInput, fields: &FieldsNamed) -> Result<TokenStrea
 
     Ok(quote! {
         #[allow(non_upper_case_globals)]
-        const #dummy: () = {
+        const _: () = {
             impl #impl_generics miniserde::Serialize for #ident #ty_generics #bounded_where_clause {
                 fn begin(&self) -> miniserde::ser::Fragment {
                     miniserde::ser::Fragment::Map(miniserde::__private::Box::new(__Map {
@@ -89,10 +85,6 @@ fn derive_enum(input: &DeriveInput, enumeration: &DataEnum) -> Result<TokenStrea
     }
 
     let ident = &input.ident;
-    let dummy = Ident::new(
-        &format!("_IMPL_MINISERIALIZE_FOR_{}", ident),
-        Span::call_site(),
-    );
 
     let var_idents = enumeration
         .variants
@@ -113,7 +105,7 @@ fn derive_enum(input: &DeriveInput, enumeration: &DataEnum) -> Result<TokenStrea
 
     Ok(quote! {
         #[allow(non_upper_case_globals)]
-        const #dummy: () = {
+        const _: () = {
             impl miniserde::Serialize for #ident {
                 fn begin(&self) -> miniserde::ser::Fragment {
                     match self {

src/de/impls.rs

@@ -2,7 +2,6 @@ use crate::de::{Deserialize, Map, Seq, Visitor};
 use crate::error::{Error, Result};
 use crate::ignore::Ignore;
 use crate::ptr::NonuniqueBox;
-use crate::Place;
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
 use alloc::collections::BTreeMap;
@@ -18,36 +17,45 @@ use std::hash::{BuildHasher, Hash};
 
 impl Deserialize for () {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<()> {
             fn null(&mut self) -> Result<()> {
                 self.out = Some(());
                 Ok(())
             }
         }
+
         Place::new(out)
     }
 }
 
 impl Deserialize for bool {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<bool> {
             fn boolean(&mut self, b: bool) -> Result<()> {
                 self.out = Some(b);
                 Ok(())
             }
         }
+
         Place::new(out)
     }
 }
 
 impl Deserialize for String {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<String> {
             fn string(&mut self, s: &str) -> Result<()> {
                 self.out = Some(s.to_owned());
                 Ok(())
             }
         }
+
         Place::new(out)
     }
 }
@@ -56,6 +64,8 @@ macro_rules! signed {
     ($ty:ident) => {
         impl Deserialize for $ty {
             fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+                make_place!(Place);
+
                 impl Visitor for Place<$ty> {
                     fn negative(&mut self, n: i64) -> Result<()> {
                         if n >= $ty::min_value() as i64 {
@@ -75,6 +85,7 @@ macro_rules! signed {
                         }
                     }
                 }
+
                 Place::new(out)
             }
         }
@@ -90,6 +101,8 @@ macro_rules! unsigned {
     ($ty:ident) => {
         impl Deserialize for $ty {
             fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+                make_place!(Place);
+
                 impl Visitor for Place<$ty> {
                     fn nonnegative(&mut self, n: u64) -> Result<()> {
                         if n <= $ty::max_value() as u64 {
@@ -100,6 +113,7 @@ macro_rules! unsigned {
                         }
                     }
                 }
+
                 Place::new(out)
             }
         }
@@ -115,6 +129,8 @@ macro_rules! float {
     ($ty:ident) => {
         impl Deserialize for $ty {
             fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+                make_place!(Place);
+
                 impl Visitor for Place<$ty> {
                     fn negative(&mut self, n: i64) -> Result<()> {
                         self.out = Some(n as $ty);
@@ -131,6 +147,7 @@ macro_rules! float {
                         Ok(())
                     }
                 }
+
                 Place::new(out)
             }
         }
@@ -141,6 +158,8 @@ float!(f64);
 
 impl<T: Deserialize> Deserialize for Box<T> {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<T: Deserialize> Visitor for Place<Box<T>> {
             fn null(&mut self) -> Result<()> {
                 let mut out = None;
@@ -266,7 +285,10 @@ impl<T: Deserialize> Deserialize for Option<T> {
     fn default() -> Option<Self> {
         Some(None)
     }
+
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<T: Deserialize> Visitor for Place<Option<T>> {
             fn null(&mut self) -> Result<()> {
                 self.out = Some(None);
@@ -315,6 +337,8 @@ impl<T: Deserialize> Deserialize for Option<T> {
 
 impl<A: Deserialize, B: Deserialize> Deserialize for (A, B) {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<A: Deserialize, B: Deserialize> Visitor for Place<(A, B)> {
             fn seq(&mut self) -> Result<Box<dyn Seq + '_>> {
                 Ok(Box::new(TupleBuilder {
@@ -356,6 +380,8 @@ impl<A: Deserialize, B: Deserialize> Deserialize for (A, B) {
 
 impl<T: Deserialize> Deserialize for Vec<T> {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<T: Deserialize> Visitor for Place<Vec<T>> {
             fn seq(&mut self) -> Result<Box<dyn Seq + '_>> {
                 Ok(Box::new(VecBuilder {
@@ -399,6 +425,8 @@ impl<T: Deserialize> Deserialize for Vec<T> {
 
 impl<T: Deserialize, const N: usize> Deserialize for [T; N] {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<T: Deserialize, const N: usize> Visitor for Place<[T; N]> {
             fn seq(&mut self) -> Result<Box<dyn Seq + '_>> {
                 Ok(Box::new(ArrayBuilder {
@@ -469,6 +497,8 @@ where
     H: BuildHasher + Default,
 {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<K, V, H> Visitor for Place<HashMap<K, V, H>>
         where
             K: FromStr + Hash + Eq,
@@ -529,6 +559,8 @@ where
 
 impl<K: FromStr + Ord, V: Deserialize> Deserialize for BTreeMap<K, V> {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl<K: FromStr + Ord, V: Deserialize> Visitor for Place<BTreeMap<K, V>> {
             fn map(&mut self) -> Result<Box<dyn Map + '_>> {
                 Ok(Box::new(MapBuilder {

src/json/array.rs

@@ -3,7 +3,6 @@ use crate::error::Result;
 use crate::json::{drop, Value};
 use crate::private;
 use crate::ser::{Fragment, Serialize};
-use crate::Place;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::fmt::{self, Debug};
@@ -113,6 +112,8 @@ impl Serialize for Array {
 
 impl Deserialize for Array {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<Array> {
             fn seq(&mut self) -> Result<Box<dyn Seq + '_>> {
                 Ok(Box::new(ArrayBuilder {

src/json/number.rs

@@ -1,7 +1,6 @@
 use crate::de::{Deserialize, Visitor};
 use crate::error::Result;
 use crate::ser::{Fragment, Serialize};
-use crate::Place;
 use core::fmt::{self, Display};
 
 /// A JSON number represented by some Rust primitive.
@@ -34,6 +33,8 @@ impl Serialize for Number {
 
 impl Deserialize for Number {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<Number> {
             fn negative(&mut self, n: i64) -> Result<()> {
                 self.out = Some(Number::I64(n));

src/json/object.rs

@@ -2,7 +2,6 @@ use crate::de::{Deserialize, Map, Visitor};
 use crate::error::Result;
 use crate::json::{drop, Value};
 use crate::ser::{self, Fragment, Serialize};
-use crate::Place;
 use alloc::borrow::{Cow, ToOwned};
 use alloc::boxed::Box;
 use alloc::collections::{btree_map, BTreeMap};
@@ -116,6 +115,8 @@ impl Serialize for Object {
 
 impl Deserialize for Object {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<Object> {
             fn map(&mut self) -> Result<Box<dyn Map + '_>> {
                 Ok(Box::new(ObjectBuilder {

src/json/value.rs

@@ -2,7 +2,6 @@ use crate::de::{Deserialize, Map, Seq, Visitor};
 use crate::error::Result;
 use crate::json::{Array, Number, Object};
 use crate::ser::{Fragment, Serialize};
-use crate::Place;
 use alloc::borrow::{Cow, ToOwned};
 use alloc::boxed::Box;
 use alloc::string::String;
@@ -72,6 +71,8 @@ impl Serialize for Value {
 
 impl Deserialize for Value {
     fn begin(out: &mut Option<Self>) -> &mut dyn Visitor {
+        make_place!(Place);
+
         impl Visitor for Place<Value> {
             fn null(&mut self) -> Result<()> {
                 self.out = Some(Value::Null);

src/lib.rs

@@ -197,7 +197,5 @@ pub use crate::error::{Error, Result};
 #[doc(inline)]
 pub use crate::ser::Serialize;
 
-make_place!(Place);
-
 #[allow(non_camel_case_types)]
 struct private;