Auto merge of #58994 - oli-obk:deprecated_derive, r=petrochenkov
Hide deprecation warnings inside derive expansions Fixes #58822
This commit is contained in:
commit
c82834e2b9
@ -833,7 +833,8 @@ pub fn provide(providers: &mut Providers<'_>) {
|
||||
|
||||
/// Returns whether `span` originates in a foreign crate's external macro.
|
||||
///
|
||||
/// This is used to test whether a lint should be entirely aborted above.
|
||||
/// This is used to test whether a lint should not even begin to figure out whether it should
|
||||
/// be reported on the current node.
|
||||
pub fn in_external_macro(sess: &Session, span: Span) -> bool {
|
||||
let info = match span.ctxt().outer().expn_info() {
|
||||
Some(info) => info,
|
||||
@ -859,3 +860,17 @@ pub fn in_external_macro(sess: &Session, span: Span) -> bool {
|
||||
Err(_) => true,
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns whether `span` originates in a derive macro's expansion
|
||||
pub fn in_derive_expansion(span: Span) -> bool {
|
||||
let info = match span.ctxt().outer().expn_info() {
|
||||
Some(info) => info,
|
||||
// no ExpnInfo means this span doesn't come from a macro
|
||||
None => return false,
|
||||
};
|
||||
|
||||
match info.format {
|
||||
ExpnFormat::MacroAttribute(symbol) => symbol.as_str().starts_with("derive("),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
pub use self::StabilityLevel::*;
|
||||
|
||||
use crate::lint::{self, Lint};
|
||||
use crate::lint::{self, Lint, in_derive_expansion};
|
||||
use crate::hir::{self, Item, Generics, StructField, Variant, HirId};
|
||||
use crate::hir::def::Def;
|
||||
use crate::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId, LOCAL_CRATE};
|
||||
@ -562,6 +562,9 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
|
||||
suggestion: Option<Symbol>,
|
||||
message: &str,
|
||||
lint: &'static Lint| {
|
||||
if in_derive_expansion(span) {
|
||||
return;
|
||||
}
|
||||
let msg = if let Some(note) = note {
|
||||
format!("{}: {}", message, note)
|
||||
} else {
|
||||
|
9
src/test/ui/deprecation/derive_on_deprecated.rs
Normal file
9
src/test/ui/deprecation/derive_on_deprecated.rs
Normal file
@ -0,0 +1,9 @@
|
||||
// compile-pass
|
||||
|
||||
#![deny(deprecated)]
|
||||
|
||||
#[deprecated = "oh no"]
|
||||
#[derive(Default)]
|
||||
struct X;
|
||||
|
||||
fn main() {}
|
@ -0,0 +1,9 @@
|
||||
// compile-pass
|
||||
|
||||
#![forbid(deprecated)]
|
||||
|
||||
#[deprecated = "oh no"]
|
||||
#[derive(Default)]
|
||||
struct X;
|
||||
|
||||
fn main() {}
|
Loading…
Reference in New Issue
Block a user