Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c049e10

Browse files
committedOct 3, 2019
Auto merge of #65053 - Centril:rollup-nwp0wgf, r=Centril
Rollup of 5 pull requests Successful merges: - #64690 (proc_macro API: Expose `macro_rules` hygiene) - #64749 (Fix most remaining Polonius test differences) - #64938 (Avoid ICE on ReFree region on where clause) - #64999 (extract expected return type for async fn generators) - #65037 (`#[track_caller]` feature gate (RFC 2091)) Failed merges: r? @ghost
2 parents 0221e26 + 18ce550 commit c049e10

File tree

94 files changed

+1364
-1064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1364
-1064
lines changed
 
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# `track_caller`
2+
3+
The tracking issue for this feature is: [#47809](https://github.com/rust-lang/rust/issues/47809).
4+
5+
------------------------

‎src/libproc_macro/bridge/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ macro_rules! with_api {
148148
fn debug($self: $S::Span) -> String;
149149
fn def_site() -> $S::Span;
150150
fn call_site() -> $S::Span;
151+
fn mixed_site() -> $S::Span;
151152
fn source_file($self: $S::Span) -> $S::SourceFile;
152153
fn parent($self: $S::Span) -> Option<$S::Span>;
153154
fn source($self: $S::Span) -> $S::Span;

0 commit comments

Comments
 (0)
Please sign in to comment.