diff options
| author | bors <bors@rust-lang.org> | 2025-05-19 05:40:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-19 05:40:16 +0000 |
| commit | 5f292eea6d63abbd26f1e6e00a0b8cf21d828d7d (patch) | |
| tree | 9ad151f0444fe3885af08319262b235b40292f6a /src/librustdoc/json/conversions.rs | |
| parent | e42bbfe1f7c26f8760a99c4b1f27d33aba1040bb (diff) | |
| parent | 93bc64dd49eb261306d54b7507e652ff94bd76fc (diff) | |
| download | rust-5f292eea6d63abbd26f1e6e00a0b8cf21d828d7d.tar.gz rust-5f292eea6d63abbd26f1e6e00a0b8cf21d828d7d.zip | |
Auto merge of #141238 - Zalathar:rollup-zdqpazo, r=Zalathar
Rollup of 4 pull requests Successful merges: - #140049 (fix autodiff macro on generic functions) - #140874 (make `rustc_attr_parsing` less dominant in the rustc crate graph) - #141094 (add regression test for rust-lang#101650) - #141110 ([std] fix the presentation of `split_off_mut` and `split_off` documentation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/json/conversions.rs')
| -rw-r--r-- | src/librustdoc/json/conversions.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index f446c9fbbd8..705f9b2202c 100644 --- a/src/librustdoc/json/conversions.rs +++ b/src/librustdoc/json/conversions.rs @@ -6,7 +6,7 @@ use rustc_abi::ExternAbi; use rustc_ast::ast; -use rustc_attr_parsing::DeprecatedSince; +use rustc_attr_data_structures::{self as attrs, DeprecatedSince}; use rustc_hir::def::CtorKind; use rustc_hir::def_id::DefId; use rustc_metadata::rendered_const; @@ -153,8 +153,8 @@ where } } -pub(crate) fn from_deprecation(deprecation: rustc_attr_parsing::Deprecation) -> Deprecation { - let rustc_attr_parsing::Deprecation { since, note, suggestion: _ } = deprecation; +pub(crate) fn from_deprecation(deprecation: attrs::Deprecation) -> Deprecation { + let attrs::Deprecation { since, note, suggestion: _ } = deprecation; let since = match since { DeprecatedSince::RustcVersion(version) => Some(version.to_string()), DeprecatedSince::Future => Some("TBD".to_owned()), |