bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc-json: Rename Import.span to Import.source

Browse source 
* It is called `source` in rustc and the rest of rustdoc
* It is not a span, rather it is the source of the import
This commit is contained in:
Camelid 2021-03-09 21:51:32 -08:00
parent e190983bd3
commit b0659f9b1b
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -503,13 +503,13 @@ impl From<clean::Import> for Import {
use clean::ImportKind::*; use clean::ImportKind::*;
match import.kind { match import.kind {
Simple(s) => Import { Simple(s) => Import {
span: import.source.path.whole_name(), source: import.source.path.whole_name(),
name: s.to_string(), name: s.to_string(),
id: import.source.did.map(from_def_id), id: import.source.did.map(from_def_id),
glob: false, glob: false,
}, },
Glob => Import { Glob => Import {
span: import.source.path.whole_name(), source: import.source.path.whole_name(),
name: import.source.path.last_name().to_string(), name: import.source.path.last_name().to_string(),
id: import.source.did.map(from_def_id), id: import.source.did.map(from_def_id),
glob: true, glob: true,

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

@ -461,7 +461,7 @@ pub struct Impl {
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub struct Import { pub struct Import {
/// The full path being imported. /// The full path being imported.
pub span: String, pub source: String,
/// May be different from the last segment of `source` when renaming imports: /// May be different from the last segment of `source` when renaming imports:
/// `use source as name;` /// `use source as name;`
pub name: String, pub name: String,

4
src/test/rustdoc-json/nested.rs
View file

@ -24,7 +24,7 @@ pub mod l1 {
// @has - "$.index[*][?(@.name=='l3')].inner.items[*]" $l4_id // @has - "$.index[*][?(@.name=='l3')].inner.items[*]" $l4_id
pub struct L4; pub struct L4;
} }
// @is nested.json "$.index[*][?(@.inner.span=='l3::L4')].kind" \"import\" // @is nested.json "$.index[*][?(@.inner.source=='l3::L4')].kind" \"import\"
// @is - "$.index[*][?(@.inner.span=='l3::L4')].inner.glob" false // @is - "$.index[*][?(@.inner.source=='l3::L4')].inner.glob" false
pub use l3::L4; pub use l3::L4;
} }