Skip to content

Commit

Permalink
Merge pull request #226 from dtolnay/tokenspan
Browse files Browse the repository at this point in the history
Eliminate unneeded use of Spanned trait on single tokens
  • Loading branch information
dtolnay committed Mar 13, 2023
2 parents f729af9 + 490dc01 commit 0e45dde
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions impl/src/expand.rs
Expand Up @@ -528,15 +528,15 @@ fn type_parameter_of_option(ty: &Type) -> Option<&Type> {

fn spanned_error_trait(input: &DeriveInput) -> TokenStream {
let vis_span = match &input.vis {
Visibility::Public(vis) => Some(vis.pub_token.span()),
Visibility::Crate(vis) => Some(vis.crate_token.span()),
Visibility::Restricted(vis) => Some(vis.pub_token.span()),
Visibility::Public(vis) => Some(vis.pub_token.span),
Visibility::Crate(vis) => Some(vis.crate_token.span),
Visibility::Restricted(vis) => Some(vis.pub_token.span),
Visibility::Inherited => None,
};
let data_span = match &input.data {
Data::Struct(data) => data.struct_token.span(),
Data::Enum(data) => data.enum_token.span(),
Data::Union(data) => data.union_token.span(),
Data::Struct(data) => data.struct_token.span,
Data::Enum(data) => data.enum_token.span,
Data::Union(data) => data.union_token.span,
};
let first_span = vis_span.unwrap_or(data_span);
let last_span = input.ident.span();
Expand Down

0 comments on commit 0e45dde

Please sign in to comment.