Skip to content

Commit

Permalink
Rollup merge of rust-lang#77207 - camelid:whence-to-span, r=jyn514
Browse files Browse the repository at this point in the history 
Rename `whence` to `span`

It's called `span` elsewhere in the compiler and `span` is also less
surprising. `whence` is whimsical, but not super clear :)

See [this Discord conversation](https://discord.com/channels/442252698964721669/459149231702278154/758731658689511444) for more.

r? @jyn514
  • Loading branch information
@RalfJung
RalfJung authored Sep 26, 2020
2 parents 41a3106 + aa6a2f4 commit 6b62525
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 53 deletions.
38 changes: 19 additions & 19 deletions src/librustdoc/clean/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ impl Clean<Item> for doctree::Module<'_> {

// determine if we should display the inner contents or
// the outer `mod` item for the source code.
let whence = {
let span = {
let sm = cx.sess().source_map();
let outer = sm.lookup_char_pos(self.where_outer.lo());
let inner = sm.lookup_char_pos(self.where_inner.lo());
Expand All @@ -272,7 +272,7 @@ impl Clean<Item> for doctree::Module<'_> {
Item {
name: Some(name),
attrs,
source: whence.clean(cx),
source: span.clean(cx),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
deprecation: cx.deprecation(self.id).clean(cx),
Expand Down Expand Up @@ -912,7 +912,7 @@ impl Clean<Item> for doctree::Function<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
deprecation: cx.deprecation(self.id).clean(cx),
Expand Down Expand Up @@ -1020,7 +1020,7 @@ impl Clean<Item> for doctree::Trait<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs,
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand All @@ -1044,7 +1044,7 @@ impl Clean<Item> for doctree::TraitAlias<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs,
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand Down Expand Up @@ -1830,7 +1830,7 @@ impl Clean<Item> for doctree::Struct<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand All @@ -1850,7 +1850,7 @@ impl Clean<Item> for doctree::Union<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand Down Expand Up @@ -1880,7 +1880,7 @@ impl Clean<Item> for doctree::Enum<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand All @@ -1899,7 +1899,7 @@ impl Clean<Item> for doctree::Variant<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
visibility: Inherited,
stability: cx.stability(self.id).clean(cx),
deprecation: cx.deprecation(self.id).clean(cx),
Expand Down Expand Up @@ -2047,7 +2047,7 @@ impl Clean<Item> for doctree::Typedef<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand All @@ -2062,7 +2062,7 @@ impl Clean<Item> for doctree::OpaqueTy<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand Down Expand Up @@ -2093,7 +2093,7 @@ impl Clean<Item> for doctree::Static<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand All @@ -2114,7 +2114,7 @@ impl Clean<Item> for doctree::Constant<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: def_id.to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand Down Expand Up @@ -2168,7 +2168,7 @@ impl Clean<Vec<Item>> for doctree::Impl<'_> {
let make_item = |trait_: Option<Type>, for_: Type, items: Vec<Item>| Item {
name: None,
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: def_id.to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand Down Expand Up @@ -2219,7 +2219,7 @@ impl Clean<Vec<Item>> for doctree::ExternCrate<'_> {
vec![Item {
name: None,
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: DefId { krate: self.cnum, index: CRATE_DEF_INDEX },
visibility: self.vis.clean(cx),
stability: None,
Expand Down Expand Up @@ -2284,7 +2284,7 @@ impl Clean<Vec<Item>> for doctree::Import<'_> {
vec![Item {
name: None,
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: DefId::local(CRATE_DEF_INDEX),
visibility: self.vis.clean(cx),
stability: None,
Expand Down Expand Up @@ -2326,7 +2326,7 @@ impl Clean<Item> for doctree::ForeignItem<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: cx.stability(self.id).clean(cx),
Expand All @@ -2342,7 +2342,7 @@ impl Clean<Item> for doctree::Macro<'_> {
Item {
name: Some(name.clone()),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
visibility: Public,
stability: cx.stability(self.hid).clean(cx),
deprecation: cx.deprecation(self.hid).clean(cx),
Expand All @@ -2367,7 +2367,7 @@ impl Clean<Item> for doctree::ProcMacro<'_> {
Item {
name: Some(self.name.clean(cx)),
attrs: self.attrs.clean(cx),
source: self.whence.clean(cx),
source: self.span.clean(cx),
visibility: Public,
stability: cx.stability(self.id).clean(cx),
deprecation: cx.deprecation(self.id).clean(cx),
Expand Down
34 changes: 17 additions & 17 deletions src/librustdoc/doctree.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pub struct Struct<'hir> {
pub generics: &'hir hir::Generics<'hir>,
pub attrs: &'hir [ast::Attribute],
pub fields: &'hir [hir::StructField<'hir>],
pub whence: Span,
pub span: Span,
}

pub struct Union<'hir> {
Expand All @@ -100,7 +100,7 @@ pub struct Union<'hir> {
pub generics: &'hir hir::Generics<'hir>,
pub attrs: &'hir [ast::Attribute],
pub fields: &'hir [hir::StructField<'hir>],
pub whence: Span,
pub span: Span,
}

pub struct Enum<'hir> {
Expand All @@ -109,7 +109,7 @@ pub struct Enum<'hir> {
pub generics: &'hir hir::Generics<'hir>,
pub attrs: &'hir [ast::Attribute],
pub id: hir::HirId,
pub whence: Span,
pub span: Span,
pub name: Symbol,
}

Expand All @@ -118,7 +118,7 @@ pub struct Variant<'hir> {
pub id: hir::HirId,
pub attrs: &'hir [ast::Attribute],
pub def: &'hir hir::VariantData<'hir>,
pub whence: Span,
pub span: Span,
}

pub struct Function<'hir> {
Expand All @@ -128,7 +128,7 @@ pub struct Function<'hir> {
pub name: Symbol,
pub vis: &'hir hir::Visibility<'hir>,
pub header: hir::FnHeader,
pub whence: Span,
pub span: Span,
pub generics: &'hir hir::Generics<'hir>,
pub body: hir::BodyId,
}
Expand All @@ -139,7 +139,7 @@ pub struct Typedef<'hir> {
pub name: Symbol,
pub id: hir::HirId,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
pub vis: &'hir hir::Visibility<'hir>,
}

Expand All @@ -148,7 +148,7 @@ pub struct OpaqueTy<'hir> {
pub name: Symbol,
pub id: hir::HirId,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
pub vis: &'hir hir::Visibility<'hir>,
}

Expand All @@ -161,7 +161,7 @@ pub struct Static<'hir> {
pub attrs: &'hir [ast::Attribute],
pub vis: &'hir hir::Visibility<'hir>,
pub id: hir::HirId,
pub whence: Span,
pub span: Span,
}

pub struct Constant<'hir> {
Expand All @@ -171,7 +171,7 @@ pub struct Constant<'hir> {
pub attrs: &'hir [ast::Attribute],
pub vis: &'hir hir::Visibility<'hir>,
pub id: hir::HirId,
pub whence: Span,
pub span: Span,
}

pub struct Trait<'hir> {
Expand All @@ -183,7 +183,7 @@ pub struct Trait<'hir> {
pub bounds: &'hir [hir::GenericBound<'hir>],
pub attrs: &'hir [ast::Attribute],
pub id: hir::HirId,
pub whence: Span,
pub span: Span,
pub vis: &'hir hir::Visibility<'hir>,
}

Expand All @@ -193,7 +193,7 @@ pub struct TraitAlias<'hir> {
pub bounds: &'hir [hir::GenericBound<'hir>],
pub attrs: &'hir [ast::Attribute],
pub id: hir::HirId,
pub whence: Span,
pub span: Span,
pub vis: &'hir hir::Visibility<'hir>,
}

Expand All @@ -208,7 +208,7 @@ pub struct Impl<'hir> {
pub for_: &'hir hir::Ty<'hir>,
pub items: Vec<&'hir hir::ImplItem<'hir>>,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
pub vis: &'hir hir::Visibility<'hir>,
pub id: hir::HirId,
}
Expand All @@ -219,7 +219,7 @@ pub struct ForeignItem<'hir> {
pub name: Symbol,
pub kind: &'hir hir::ForeignItemKind<'hir>,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
}

// For Macro we store the DefId instead of the NodeId, since we also create
Expand All @@ -229,7 +229,7 @@ pub struct Macro<'hir> {
pub hid: hir::HirId,
pub def_id: hir::def_id::DefId,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
pub matchers: Vec<Span>,
pub imported_from: Option<Symbol>,
}
Expand All @@ -240,7 +240,7 @@ pub struct ExternCrate<'hir> {
pub path: Option<String>,
pub vis: &'hir hir::Visibility<'hir>,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
}

pub struct Import<'hir> {
Expand All @@ -250,7 +250,7 @@ pub struct Import<'hir> {
pub attrs: &'hir [ast::Attribute],
pub path: &'hir hir::Path<'hir>,
pub glob: bool,
pub whence: Span,
pub span: Span,
}

pub struct ProcMacro<'hir> {
Expand All @@ -259,7 +259,7 @@ pub struct ProcMacro<'hir> {
pub kind: MacroKind,
pub helpers: Vec<Symbol>,
pub attrs: &'hir [ast::Attribute],
pub whence: Span,
pub span: Span,
}

pub fn struct_type_from_def(vdata: &hir::VariantData<'_>) -> StructType {
Expand Down
Loading

0 comments on commit 6b62525

Please sign in to comment.