diff options
| author | bors <bors@rust-lang.org> | 2025-01-24 08:28:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-24 08:28:35 +0000 |
| commit | 061ee95ce197dc9b276fc5363eddbfc0ecc08584 (patch) | |
| tree | 5c9d741564f0447833d21666ee2c3c685d4cc5f6 /src/librustdoc | |
| parent | 48ef38d3503a04e5e18157e664e3e65dc7eca1a5 (diff) | |
| parent | 109def514987ab6a1885f6f3d2165e7bf03dbee8 (diff) | |
| download | rust-061ee95ce197dc9b276fc5363eddbfc0ecc08584.tar.gz rust-061ee95ce197dc9b276fc5363eddbfc0ecc08584.zip | |
Auto merge of #135978 - matthiaskrgr:rollup-ni16gqr, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #133605 (Add extensive set of drop order tests) - #135489 (remove pointless allowed_through_unstable_modules on TryFromSliceError) - #135757 (Add NuttX support for AArch64 and ARMv7-A targets) - #135799 (rustdoc-json: Rename `Path::name` to `path`, and give it the path again.) - #135865 (For E0223, suggest associated functions that are similar to the path, even if the base type has multiple inherent impl blocks.) - #135890 (Implement `VecDeque::pop_front_if` & `VecDeque::pop_back_if`) - #135914 (Remove usages of `QueryNormalizer` in the compiler) - #135936 (fix reify-intrinsic test) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/json/conversions.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index 33166a39574..afe81937495 100644 --- a/src/librustdoc/json/conversions.rs +++ b/src/librustdoc/json/conversions.rs @@ -622,7 +622,7 @@ impl FromClean<clean::Type> for Type { impl FromClean<clean::Path> for Path { fn from_clean(path: clean::Path, renderer: &JsonRenderer<'_>) -> Path { Path { - name: path.last_opt().map_or(String::from(""), |s| String::from(s.as_str())), + path: path.whole_name(), id: renderer.id_from_item_default(path.def_id().into()), args: path.segments.last().map(|args| Box::new(args.clone().args.into_json(renderer))), } |
