Skip to content

Commit 79a15d0

Browse files
authored
Remove incorrect spanned quote usage (#279)
1 parent 7b98ff1 commit 79a15d0

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

derive/src/traits.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
use std::{cmp, convert::TryFrom};
33

44
use proc_macro2::{Ident, Span, TokenStream, TokenTree};
5-
use quote::{quote, quote_spanned, ToTokens};
5+
use quote::{quote, ToTokens};
66
use syn::{
77
parse::{Parse, ParseStream, Parser},
88
punctuated::Punctuated,
@@ -553,7 +553,7 @@ fn get_struct_fields(input: &DeriveInput) -> Result<&Fields> {
553553

554554
/// Extract the `Fields` off a `DeriveInput`, or, in the `enum` case, off
555555
/// those of the `enum_variant`, when provided (e.g., for `Zeroable`).
556-
///
556+
///
557557
/// We purposely allow not providing an `enum_variant` for cases where
558558
/// the caller wants to reject supporting `enum`s (e.g., `NoPadding`).
559559
fn get_fields(
@@ -664,7 +664,7 @@ fn generate_checked_bit_pattern_enum_without_fields(
664664
)?;
665665

666666
let check = if count == 0 {
667-
quote_spanned!(span => false)
667+
quote!(false)
668668
} else if max - min == count - 1 {
669669
// contiguous range
670670
let min_lit = LitInt::new(&format!("{}", min), span);
@@ -962,22 +962,20 @@ fn generate_checked_bit_pattern_enum_with_fields(
962962
/// is equal to the sum of the size of it's fields
963963
fn generate_assert_no_padding(input: &DeriveInput) -> Result<TokenStream> {
964964
let struct_type = &input.ident;
965-
let span = input.ident.span();
966965
let enum_variant = None; // `no padding` check is not supported for `enum`s yet.
967966
let fields = get_fields(input, enum_variant)?;
968967

969968
let mut field_types = get_field_types(&fields);
970969
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>() )*);
974972

975-
quote_spanned!(span => #size_first #size_rest)
973+
quote!(#size_first #size_rest)
976974
} else {
977-
quote_spanned!(span => 0)
975+
quote!(0)
978976
};
979977

980-
Ok(quote_spanned! {span => const _: fn() = || {
978+
Ok(quote! {const _: fn() = || {
981979
#[doc(hidden)]
982980
struct TypeWithoutPadding([u8; #size_sum]);
983981
let _ = ::core::mem::transmute::<#struct_type, TypeWithoutPadding>;
@@ -991,9 +989,8 @@ fn generate_fields_are_trait(
991989
let (impl_generics, _ty_generics, where_clause) =
992990
input.generics.split_for_impl();
993991
let fields = get_fields(input, enum_variant)?;
994-
let span = input.span();
995992
let field_types = get_field_types(&fields);
996-
Ok(quote_spanned! {span => #(const _: fn() = || {
993+
Ok(quote! {#(const _: fn() = || {
997994
#[allow(clippy::missing_const_for_fn)]
998995
#[doc(hidden)]
999996
fn check #impl_generics () #where_clause {

derive/tests/basic.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![allow(dead_code)]
2+
#![deny(clippy::allow_attributes)]
23

34
use bytemuck::{
45
checked::CheckedCastError, AnyBitPattern, CheckedBitPattern, Contiguous,

0 commit comments

Comments
 (0)