Skip to content

Commit 714229d

Browse files
committed
Work around deprecation warning on generated impl for deprecated type
1 parent 0ba7d01 commit 714229d

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

impl/src/expand.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::ast::{Enum, Field, Input, Struct};
22
use crate::attr::Trait;
33
use crate::generics::InferredBounds;
44
use crate::unraw::MemberUnraw;
5-
use proc_macro2::{Ident, TokenStream};
5+
use proc_macro2::{Ident, Span, TokenStream};
66
use quote::{format_ident, quote, quote_spanned, ToTokens};
77
use std::collections::BTreeSet as Set;
88
use syn::{DeriveInput, GenericArgument, PathArguments, Result, Token, Type};
@@ -27,7 +27,7 @@ fn try_expand(input: &DeriveInput) -> Result<TokenStream> {
2727
}
2828

2929
fn fallback(input: &DeriveInput, error: syn::Error) -> TokenStream {
30-
let ty = &input.ident;
30+
let ty = call_site_ident(&input.ident);
3131
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
3232

3333
let error = error.to_compile_error();
@@ -55,7 +55,7 @@ fn fallback(input: &DeriveInput, error: syn::Error) -> TokenStream {
5555
}
5656

5757
fn impl_struct(input: Struct) -> TokenStream {
58-
let ty = &input.ident;
58+
let ty = call_site_ident(&input.ident);
5959
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
6060
let mut error_inferred_bounds = InferredBounds::new();
6161

@@ -228,7 +228,7 @@ fn impl_struct(input: Struct) -> TokenStream {
228228
}
229229

230230
fn impl_enum(input: Enum) -> TokenStream {
231-
let ty = &input.ident;
231+
let ty = call_site_ident(&input.ident);
232232
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
233233
let mut error_inferred_bounds = InferredBounds::new();
234234

@@ -492,6 +492,14 @@ fn impl_enum(input: Enum) -> TokenStream {
492492
}
493493
}
494494

495+
// Create an ident with which we can expand `impl Trait for #ident {}` on a
496+
// deprecated type without triggering deprecation warning on the generated impl.
497+
fn call_site_ident(ident: &Ident) -> Ident {
498+
let mut ident = ident.clone();
499+
ident.set_span(Span::call_site());
500+
ident
501+
}
502+
495503
fn fields_pat(fields: &[Field]) -> TokenStream {
496504
let mut members = fields.iter().map(|field| &field.member).peekable();
497505
match members.peek() {

tests/ui/missing-display.stderr

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0277]: `MyError` doesn't implement `std::fmt::Display`
2-
--> tests/ui/missing-display.rs:4:10
2+
--> tests/ui/missing-display.rs:3:10
33
|
4-
4 | pub enum MyError {
5-
| ^^^^^^^ `MyError` cannot be formatted with the default formatter
4+
3 | #[derive(Error, Debug)]
5+
| ^^^^^ `MyError` cannot be formatted with the default formatter
66
|
77
= help: the trait `std::fmt::Display` is not implemented for `MyError`
88
= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
@@ -11,3 +11,4 @@ note: required by a bound in `std::error::Error`
1111
|
1212
| pub trait Error: Debug + Display {
1313
| ^^^^^^^ required by this bound in `Error`
14+
= note: this error originates in the derive macro `Error` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)