bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Made Path::name only have item name rather than full name

Browse source
This commit is contained in:
Aditya Kumar 2024-12-29 07:01:54 +00:00
parent 480eec0692
commit 2c4aee92fa
No known key found for this signature in database
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/json/conversions.rs
View file

@ -620,7 +620,7 @@ impl FromClean<clean::Type> for Type {
impl FromClean<clean::Path> for Path { impl FromClean<clean::Path> for Path {
fn from_clean(path: clean::Path, renderer: &JsonRenderer<'_>) -> Path { fn from_clean(path: clean::Path, renderer: &JsonRenderer<'_>) -> Path {
Path { Path {
name: path.whole_name(), name: path.last_opt().map_or(String::from(""), |s| String::from(s.as_str())),
id: renderer.id_from_item_default(path.def_id().into()), id: renderer.id_from_item_default(path.def_id().into()),
args: path.segments.last().map(|args| Box::new(args.clone().args.into_json(renderer))), args: path.segments.last().map(|args| Box::new(args.clone().args.into_json(renderer))),
} }

2
src/rustdoc-json-types/lib.rs
View file

@ -30,7 +30,7 @@ pub type FxHashMap<K, V> = HashMap<K, V>; // re-export for use in src/librustdoc
/// This integer is incremented with every breaking change to the API, /// This integer is incremented with every breaking change to the API,
/// and is returned along with the JSON blob as [`Crate::format_version`]. /// and is returned along with the JSON blob as [`Crate::format_version`].
/// Consuming code should assert that this value matches the format version(s) that it supports. /// Consuming code should assert that this value matches the format version(s) that it supports.
pub const FORMAT_VERSION: u32 = 37; pub const FORMAT_VERSION: u32 = 38;
/// The root of the emitted JSON blob. /// The root of the emitted JSON blob.
/// ///

2
tests/rustdoc-json/return_private.rs
View file

@ -6,7 +6,7 @@ mod secret {
} }
//@ has "$.index[*][?(@.name=='get_secret')].inner.function" //@ has "$.index[*][?(@.name=='get_secret')].inner.function"
//@ is "$.index[*][?(@.name=='get_secret')].inner.function.sig.output.resolved_path.name" \"secret::Secret\" //@ is "$.index[*][?(@.name=='get_secret')].inner.function.sig.output.resolved_path.name" \"Secret\"
pub fn get_secret() -> secret::Secret { pub fn get_secret() -> secret::Secret {
secret::Secret secret::Secret
} }