diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-12-05 16:08:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 16:08:35 +0100 |
| commit | fddda14ac0345c1d0ab602d6016b976c972aa643 (patch) | |
| tree | e2c884b727a785faa903ac2d6ddb63361b64ab4d | |
| parent | 30b4cefe64e1cb6496b2553e59a7ad5d4d86fc3f (diff) | |
| parent | 1b503042b850519aa9308dbf11ddb16e7dfdeeae (diff) | |
| download | rust-fddda14ac0345c1d0ab602d6016b976c972aa643.tar.gz rust-fddda14ac0345c1d0ab602d6016b976c972aa643.zip | |
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
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 2 | ||||
| -rw-r--r-- | tests/rustdoc/deprecated-future-staged-api.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index e076c1b92e6..58599de76ea 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -673,7 +673,7 @@ fn short_item_info( format!("Deprecating in {version}") } } - DeprecatedSince::Future => String::from("Deprecating in a future Rust version"), + DeprecatedSince::Future => String::from("Deprecating in a future version"), DeprecatedSince::NonStandard(since) => { format!("Deprecated since {}", Escape(since.as_str())) } diff --git a/tests/rustdoc/deprecated-future-staged-api.rs b/tests/rustdoc/deprecated-future-staged-api.rs index 09120b8d411..64dfd893050 100644 --- a/tests/rustdoc/deprecated-future-staged-api.rs +++ b/tests/rustdoc/deprecated-future-staged-api.rs @@ -12,7 +12,7 @@ pub struct S1; // @has deprecated_future_staged_api/index.html '//*[@class="stab deprecated"]' \ // 'Deprecation planned' // @has deprecated_future_staged_api/struct.S2.html '//*[@class="stab deprecated"]' \ -// 'Deprecating in a future Rust version: literally never' +// 'Deprecating in a future version: literally never' #[deprecated(since = "TBD", note = "literally never")] #[stable(feature = "deprecated_future_staged_api", since = "1.0.0")] pub struct S2; |
