bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add method for checking if deprecation is a rustc version

Browse source
This commit is contained in:
David Tolnay 2023-10-30 16:50:40 -07:00
parent dccf10e989
commit 8b8906b264
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_attr/src/builtin.rs
View file

@ -759,6 +759,10 @@ impl Deprecation {
DeprecatedSince::Unspecified | DeprecatedSince::Err => true,
}
}
pub fn is_since_rustc_version(&self) -> bool {
matches!(self.since, DeprecatedSince::RustcVersion(_))
}
}
/// Finds the deprecation attribute. `None` if none exists.

2
compiler/rustc_middle/src/middle/stability.rs
View file

@ -349,7 +349,7 @@ impl<'tcx> TyCtxt<'tcx> {
// With #![staged_api], we want to emit down the whole
// hierarchy.
let depr_attr = &depr_entry.attr;
if !skip || matches!(depr_attr.since, DeprecatedSince::RustcVersion(_)) {
if !skip || depr_attr.is_since_rustc_version() {
// Calculating message for lint involves calling `self.def_path_str`.
// Which by default to calculate visible path will invoke expensive `visible_parent_map` query.
// So we skip message calculation altogether, if lint is allowed.

10
compiler/rustc_passes/src/stability.rs
View file

@ -196,14 +196,8 @@ impl<'a, 'tcx> Annotator<'a, 'tcx> {
}
}
if let Some((
rustc_attr::Deprecation { since: DeprecatedSince::RustcVersion(_), .. },
span,
)) = &depr
{
if stab.is_none() {
self.tcx.sess.emit_err(errors::DeprecatedAttribute { span: *span });
}
if let Some((depr, span)) = &depr && depr.is_since_rustc_version() && stab.is_none() {
self.tcx.sess.emit_err(errors::DeprecatedAttribute { span: *span });
}
if let Some((body_stab, _span)) = body_stab {