Skip to content

Commit fddda14

Browse files
authored
Rollup merge of #118594 - hdost:patch-1, r=fmease
Remove mention of rust to make the error message generic. The deprecation notice is used when in crates as well. This applies to versions Rust or Crates. Relates #118148
2 parents 30b4cef + 1b50304 commit fddda14

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/librustdoc/html/render/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ fn short_item_info(
673673
format!("Deprecating in {version}")
674674
}
675675
}
676-
DeprecatedSince::Future => String::from("Deprecating in a future Rust version"),
676+
DeprecatedSince::Future => String::from("Deprecating in a future version"),
677677
DeprecatedSince::NonStandard(since) => {
678678
format!("Deprecated since {}", Escape(since.as_str()))
679679
}

tests/rustdoc/deprecated-future-staged-api.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub struct S1;
1212
// @has deprecated_future_staged_api/index.html '//*[@class="stab deprecated"]' \
1313
// 'Deprecation planned'
1414
// @has deprecated_future_staged_api/struct.S2.html '//*[@class="stab deprecated"]' \
15-
// 'Deprecating in a future Rust version: literally never'
15+
// 'Deprecating in a future version: literally never'
1616
#[deprecated(since = "TBD", note = "literally never")]
1717
#[stable(feature = "deprecated_future_staged_api", since = "1.0.0")]
1818
pub struct S2;

0 commit comments

Comments
 (0)