diff options
| author | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
| commit | 7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f (patch) | |
| tree | 473644e3095ec29d92b0c68880f49599c402cbfa /src/libproc_macro | |
| parent | ec1f28f9614292c36b371d3758afffdd52cb9786 (diff) | |
| parent | aa9dc6952235a58d4c37b63bed15992f5225fbf0 (diff) | |
| download | rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.tar.gz rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.zip | |
Auto merge of #71579 - Dylan-DPC:rollup-h9om2g3, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71490 (Cleanup and document `-C relocation-model`) - #71562 (fix more clippy warnings) - #71571 (Fix since attribute for nonzero_bitor impl's) - #71574 (proc_macro: Fix since attributes for new Span methods) - #71575 (Fix stable(since) attribute for BTreeMap::remove_entry) Failed merges: r? @ghost
Diffstat (limited to 'src/libproc_macro')
| -rw-r--r-- | src/libproc_macro/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs index 5995f64dc78..86e39094935 100644 --- a/src/libproc_macro/lib.rs +++ b/src/libproc_macro/lib.rs @@ -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) } |
