Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix file!(), line!() and column!() macros #26347

Merged
merged 3 commits into from
Jun 18, 2015
Merged

Conversation

nagisa
Copy link
Member

@nagisa nagisa commented Jun 16, 2015

r? @nrc, because breakage was caused by #25318

nagisa added 2 commits June 16, 2015 21:47
These used to return wrong results in case they were expanded inside compiler’s
iternal syntax sugar (closures, if-let) expansions

Fixes rust-lang#26322
@nrc
Copy link
Member

nrc commented Jun 16, 2015

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 16, 2015

📌 Commit 09ed27c has been approved by nrc

@alexcrichton
Copy link
Member

triage: beta-nominated (this was a regression on nightly from stable I believe)

@rust-highfive rust-highfive added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 17, 2015
@brson
Copy link
Contributor

brson commented Jun 18, 2015

@bors p=1 to get this tested so we can backport it and release the final 1.1 beta

@bors
Copy link
Contributor

bors commented Jun 18, 2015

⌛ Testing commit 09ed27c with merge 20d23d8...

bors added a commit that referenced this pull request Jun 18, 2015
r? @nrc, because breakage was caused by #25318
@bors bors merged commit 09ed27c into rust-lang:master Jun 18, 2015
@alexcrichton
Copy link
Member

Accepting for backprot

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 18, 2015
@brson brson mentioned this pull request Jun 18, 2015
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 18, 2015
zmbush added a commit to zmbush/rust-clippy that referenced this pull request Jun 18, 2015
zmbush added a commit to zmbush/rust-clippy that referenced this pull request Jun 18, 2015
In rust-lang/rust#26347, MacroFormat was
renamed to ExpnFormat. MacroFormat wasn't being used in
src/mut_mut.rs, so I removed it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants