Note the version and PR of removed features when using it

Signed-off-by: xizheyin <[email protected]>

Author: xizheyin

compiler/rustc_expand/messages.ftl

@@ -62,6 +62,7 @@ expand_feature_not_allowed =
 expand_feature_removed =
     feature has been removed
     .label = feature has been removed
+    .note = removed in {$removed_rustc_version} (you are using {$current_rustc_version}){$pull_note}
     .reason = {$reason}
 
 expand_glob_delegation_outside_impls =

compiler/rustc_expand/src/config.rs

@@ -81,9 +81,24 @@ pub fn features(sess: &Session, krate_attrs: &[Attribute], crate_name: Symbol) -
 
             // If the enabled feature has been removed, issue an error.
             if let Some(f) = REMOVED_LANG_FEATURES.iter().find(|f| name == f.feature.name) {
+                let span = mi.span();
+                let reason = f.reason.map(|reason| FeatureRemovedReason { reason });
+                let removed_rustc_version = f.feature.since;
+                let current_rustc_version = sess.cfg_version;
+                let pull_note = if let Some(pull) = f.pull {
+                    format!(
+                        "; see <https://github.com/rust-lang/rust/pull/{}> for more information",
+                        pull
+                    )
+                } else {
+                    "".to_owned()
+                };
                 sess.dcx().emit_err(FeatureRemoved {
-                    span: mi.span(),
-                    reason: f.reason.map(|reason| FeatureRemovedReason { reason }),
+                    span,
+                    reason,
+                    removed_rustc_version,
+                    current_rustc_version,
+                    pull_note,
                 });
                 continue;
             }

compiler/rustc_expand/src/errors.rs

@@ -154,12 +154,16 @@ pub(crate) struct HelperAttributeNameInvalid {
 
 #[derive(Diagnostic)]
 #[diag(expand_feature_removed, code = E0557)]
+#[note]
 pub(crate) struct FeatureRemoved<'a> {
     #[primary_span]
     #[label]
     pub span: Span,
     #[subdiagnostic]
     pub reason: Option<FeatureRemovedReason<'a>>,
+    pub removed_rustc_version: &'a str,
+    pub current_rustc_version: &'a str,
+    pub pull_note: String,
 }
 
 #[derive(Subdiagnostic)]

compiler/rustc_feature/src/removed.rs

@@ -3,6 +3,8 @@ error[E0557]: feature has been removed
    |
 LL | #![feature(no_stack_check)]
    |            ^^^^^^^^^^^^^^ feature has been removed
+   |
+   = note: removed in 1.0.0 (you are using 1.89.0-dev)
 
 error: aborting due to 1 previous error
 

tests/ui/deprecation/deprecated_no_stack_check.stderr

@@ -4,6 +4,7 @@ error[E0557]: feature has been removed
 LL | #![feature(no_coverage)]
    |            ^^^^^^^^^^^ feature has been removed
    |
+   = note: removed in 1.74.0 (you are using 1.89.0-dev)
    = note: renamed to `coverage_attribute`
 
 error[E0658]: the `#[coverage]` attribute is an experimental feature

tests/ui/feature-gates/feature-gate-coverage-attribute.stderr

@@ -15,6 +15,8 @@ error[E0557]: feature has been removed
    |
 LL | #![feature(test_removed_feature)]
    |            ^^^^^^^^^^^^^^^^^^^^ feature has been removed
+   |
+   = note: removed in 1.0.0 (you are using 1.89.0-dev)
 
 error: malformed `feature` attribute input
   --> $DIR/gated-bad-feature.rs:6:1

tests/ui/feature-gates/gated-bad-feature.stderr

@@ -4,6 +4,7 @@ error[E0557]: feature has been removed
 LL | #![feature(external_doc)]
    |            ^^^^^^^^^^^^ feature has been removed
    |
+   = note: removed in 1.54.0 (you are using 1.89.0-dev); see <https://github.com/rust-lang/rust/pull/85457> for more information
    = note: use #[doc = include_str!("filename")] instead, which handles macro invocations
 
 error: unknown `doc` attribute `include`

tests/ui/feature-gates/removed-features-note-version-and-pr-issue-141619.stderr

@@ -4,6 +4,7 @@ error[E0557]: feature has been removed
 LL | #![feature(macro_reexport)]
    |            ^^^^^^^^^^^^^^ feature has been removed
    |
+   = note: removed in 1.0.0 (you are using 1.89.0-dev)
    = note: subsumed by `pub use`
 
 error: cannot find attribute `macro_reexport` in this scope

tests/ui/macros/macro-reexport-removed.stderr

@@ -4,6 +4,7 @@ error[E0557]: feature has been removed
 LL | #![feature(doc_keyword)]
    |            ^^^^^^^^^^^ feature has been removed
    |
+   = note: removed in 1.28.0 (you are using 1.89.0-dev)
    = note: merged into `#![feature(rustdoc_internals)]`
 
 error[E0557]: feature has been removed
@@ -12,6 +13,7 @@ error[E0557]: feature has been removed
 LL | #![feature(doc_primitive)]
    |            ^^^^^^^^^^^^^ feature has been removed
    |
+   = note: removed in 1.56.0 (you are using 1.89.0-dev)
    = note: merged into `#![feature(rustdoc_internals)]`
 
 error: aborting due to 2 previous errors

tests/ui/rustdoc/renamed-features-rustdoc_internals.stderr

@@ -4,6 +4,7 @@ error[E0557]: feature has been removed
 LL | #![feature(const_trait_impl, effects)]
    |                              ^^^^^^^ feature has been removed
    |
+   = note: removed in 1.84.0 (you are using 1.89.0-dev)
    = note: removed, redundant with `#![feature(const_trait_impl)]`
 
 error[E0049]: associated function `compute` has 0 type parameters but its trait declaration has 1 type parameter