2
2
use std:: { cmp, convert:: TryFrom } ;
3
3
4
4
use proc_macro2:: { Ident , Span , TokenStream , TokenTree } ;
5
- use quote:: { quote, quote_spanned , ToTokens } ;
5
+ use quote:: { quote, ToTokens } ;
6
6
use syn:: {
7
7
parse:: { Parse , ParseStream , Parser } ,
8
8
punctuated:: Punctuated ,
@@ -553,7 +553,7 @@ fn get_struct_fields(input: &DeriveInput) -> Result<&Fields> {
553
553
554
554
/// Extract the `Fields` off a `DeriveInput`, or, in the `enum` case, off
555
555
/// those of the `enum_variant`, when provided (e.g., for `Zeroable`).
556
- ///
556
+ ///
557
557
/// We purposely allow not providing an `enum_variant` for cases where
558
558
/// the caller wants to reject supporting `enum`s (e.g., `NoPadding`).
559
559
fn get_fields (
@@ -664,7 +664,7 @@ fn generate_checked_bit_pattern_enum_without_fields(
664
664
) ?;
665
665
666
666
let check = if count == 0 {
667
- quote_spanned ! ( span => false )
667
+ quote ! ( false )
668
668
} else if max - min == count - 1 {
669
669
// contiguous range
670
670
let min_lit = LitInt :: new ( & format ! ( "{}" , min) , span) ;
@@ -962,22 +962,20 @@ fn generate_checked_bit_pattern_enum_with_fields(
962
962
/// is equal to the sum of the size of it's fields
963
963
fn generate_assert_no_padding ( input : & DeriveInput ) -> Result < TokenStream > {
964
964
let struct_type = & input. ident ;
965
- let span = input. ident . span ( ) ;
966
965
let enum_variant = None ; // `no padding` check is not supported for `enum`s yet.
967
966
let fields = get_fields ( input, enum_variant) ?;
968
967
969
968
let mut field_types = get_field_types ( & fields) ;
970
969
let size_sum = if let Some ( first) = field_types. next ( ) {
971
- let size_first = quote_spanned ! ( span => :: core:: mem:: size_of:: <#first>( ) ) ;
972
- let size_rest =
973
- quote_spanned ! ( span => #( + :: core:: mem:: size_of:: <#field_types>( ) ) * ) ;
970
+ let size_first = quote ! ( :: core:: mem:: size_of:: <#first>( ) ) ;
971
+ let size_rest = quote ! ( #( + :: core:: mem:: size_of:: <#field_types>( ) ) * ) ;
974
972
975
- quote_spanned ! ( span => #size_first #size_rest)
973
+ quote ! ( #size_first #size_rest)
976
974
} else {
977
- quote_spanned ! ( span => 0 )
975
+ quote ! ( 0 )
978
976
} ;
979
977
980
- Ok ( quote_spanned ! { span => const _: fn ( ) = || {
978
+ Ok ( quote ! { const _: fn ( ) = || {
981
979
#[ doc( hidden) ]
982
980
struct TypeWithoutPadding ( [ u8 ; #size_sum] ) ;
983
981
let _ = :: core:: mem:: transmute:: <#struct_type, TypeWithoutPadding >;
@@ -991,9 +989,8 @@ fn generate_fields_are_trait(
991
989
let ( impl_generics, _ty_generics, where_clause) =
992
990
input. generics . split_for_impl ( ) ;
993
991
let fields = get_fields ( input, enum_variant) ?;
994
- let span = input. span ( ) ;
995
992
let field_types = get_field_types ( & fields) ;
996
- Ok ( quote_spanned ! { span => #( const _: fn ( ) = || {
993
+ Ok ( quote ! { #( const _: fn ( ) = || {
997
994
#[ allow( clippy:: missing_const_for_fn) ]
998
995
#[ doc( hidden) ]
999
996
fn check #impl_generics ( ) #where_clause {
0 commit comments