bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix review nits

Browse source
This commit is contained in:
bobtwinkles 2018-04-26 18:28:34 -04:00
parent 498dbe4453
commit 73e0c1e968
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libproc_macro/lib.rs
View file

@ -270,7 +270,7 @@ impl Span {
/// `self` was generated from, if any. /// `self` was generated from, if any.
#[unstable(feature = "proc_macro", issue = "38356")] #[unstable(feature = "proc_macro", issue = "38356")]
pub fn parent(&self) -> Option<Span> { pub fn parent(&self) -> Option<Span> {
self.0.parent().map(|x| { Span(x) }) self.0.parent().map(Span)
} }
/// The span for the origin source code that `self` was generated from. If /// The span for the origin source code that `self` was generated from. If

10
src/libsyntax_pos/hygiene.rs
View file

@ -123,11 +123,11 @@ impl Mark {
/// mark. That is, the following holds: /// mark. That is, the following holds:
/// ///
/// ```rust /// ```rust
/// let lub = lub(a, b); /// let la = least_ancestor(a, b);
/// assert!(a.is_descendant_of(lub)) /// assert!(a.is_descendant_of(la))
/// assert!(b.is_descendant_of(lub)) /// assert!(b.is_descendant_of(la))
/// ``` /// ```
pub fn lub(mut a: Mark, mut b: Mark) -> Mark { pub fn least_ancestor(mut a: Mark, mut b: Mark) -> Mark {
HygieneData::with(|data| { HygieneData::with(|data| {
// Compute the path from a to the root // Compute the path from a to the root
let mut a_path = FxHashSet::<Mark>(); let mut a_path = FxHashSet::<Mark>();
@ -138,7 +138,7 @@ impl Mark {
// While the path from b to the root hasn't intersected, move up the tree // While the path from b to the root hasn't intersected, move up the tree
while !a_path.contains(&b) { while !a_path.contains(&b) {
b = data.marks[b.0 as usize].parent; b = data.marks[b.0 as usize].parent;
} }
b b

2
src/libsyntax_pos/lib.rs
View file

@ -291,7 +291,7 @@ impl Span {
self.ctxt().outer().expn_info().map(|info| info.call_site.source_callsite()).unwrap_or(self) self.ctxt().outer().expn_info().map(|info| info.call_site.source_callsite()).unwrap_or(self)
} }
/// The `Span for the tokens in the previous macro expansion from which `self` was generated, /// The `Span` for the tokens in the previous macro expansion from which `self` was generated,
/// if any /// if any
pub fn parent(self) -> Option<Span> { pub fn parent(self) -> Option<Span> {
self.ctxt().outer().expn_info().map(|i| i.call_site) self.ctxt().outer().expn_info().map(|i| i.call_site)