Skip to content

Commit

Permalink
Rollup merge of rust-lang#71574 - jplatte:patch-2, r=petrochenkov
Browse files Browse the repository at this point in the history
proc_macro: Fix since attributes for new Span methods

Added in rust-lang#69041, took a while to merge so the since attributes went out of date.
  • Loading branch information
Dylan-DPC committed Apr 26, 2020
2 parents 4a9b976 + b681789 commit aa89e91
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libproc_macro/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,14 @@ impl Span {

/// Creates a new span with the same line/column information as `self` but
/// that resolves symbols as though it were at `other`.
#[stable(feature = "proc_macro_span_resolved_at", since = "1.43.0")]
#[stable(feature = "proc_macro_span_resolved_at", since = "1.45.0")]
pub fn resolved_at(&self, other: Span) -> Span {
Span(self.0.resolved_at(other.0))
}

/// Creates a new span with the same name resolution behavior as `self` but
/// with the line/column information of `other`.
#[stable(feature = "proc_macro_span_located_at", since = "1.43.0")]
#[stable(feature = "proc_macro_span_located_at", since = "1.45.0")]
pub fn located_at(&self, other: Span) -> Span {
other.resolved_at(*self)
}
Expand Down

0 comments on commit aa89e91

Please sign in to comment.