Auto merge of #82994 - camelid:rename-source-to-span, r=jyn514
Rename `source` to `span` and `span` to `source` - Rename `clean::Item.source` to `span` - Rename `clean::Span::span()` to `clean::Span::inner()` - Rename `rustdoc_json_types::Item.source` to `span` - rustdoc-json: Rename `Import.span` to `Import.source` *See also the [discussion on Zulip][z] (this is a bit more than discussed in that conversation, but all the changes are related).* r? `@jyn514` [z]: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/get.20span.20of.20file.20from.20name/near/229603729
This commit is contained in:
commit
673d0db5e3
20 changed files with 57 additions and 49 deletions
|
|
@ -228,15 +228,15 @@ impl<'tcx> Context<'tcx> {
|
|||
/// may happen, for example, with externally inlined items where the source
|
||||
/// of their crate documentation isn't known.
|
||||
pub(super) fn src_href(&self, item: &clean::Item) -> Option<String> {
|
||||
if item.source.is_dummy() {
|
||||
if item.span.is_dummy() {
|
||||
return None;
|
||||
}
|
||||
let mut root = self.root_path();
|
||||
let mut path = String::new();
|
||||
let cnum = item.source.cnum(self.sess());
|
||||
let cnum = item.span.cnum(self.sess());
|
||||
|
||||
// We can safely ignore synthetic `SourceFile`s.
|
||||
let file = match item.source.filename(self.sess()) {
|
||||
let file = match item.span.filename(self.sess()) {
|
||||
FileName::Real(ref path) => path.local_path().to_path_buf(),
|
||||
_ => return None,
|
||||
};
|
||||
|
|
@ -270,8 +270,8 @@ impl<'tcx> Context<'tcx> {
|
|||
(&*symbol, &path)
|
||||
};
|
||||
|
||||
let loline = item.source.lo(self.sess()).line;
|
||||
let hiline = item.source.hi(self.sess()).line;
|
||||
let loline = item.span.lo(self.sess()).line;
|
||||
let hiline = item.span.hi(self.sess()).line;
|
||||
let lines =
|
||||
if loline == hiline { loline.to_string() } else { format!("{}-{}", loline, hiline) };
|
||||
Some(format!(
|
||||
|
|
|
|||
|
|
@ -937,7 +937,7 @@ fn item_macro(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Mac
|
|||
Some("macro"),
|
||||
None,
|
||||
None,
|
||||
it.source.span().edition(),
|
||||
it.span.inner().edition(),
|
||||
);
|
||||
});
|
||||
document(w, cx, it, None)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue