Skip to content

/rust

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

Conversation

Reviewers
No reviews
Assignees

@nrc nrc

Labels
beta-accepted
Projects
None yet
Milestone
No milestone
6 participants
@nagisa @nrc @bors @alexcrichton @brson @rust-highfive
@nagisa
Copy link
Contributor

nagisa commented Jun 16, 2015

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

nagisa added some commits Jun 16, 2015

@nagisa
Fix file!(), line!() and column!() macros 
These used to return wrong results in case they were expanded inside compiler’s
iternal syntax sugar (closures, if-let) expansions

Fixes #26322
7ff55ea
@nagisa
Add a test for issue 26322
Loading status checks…
ca72d7f

@rust-highfive rust-highfive assigned nrc Jun 16, 2015

@nagisa
Remove superfluous variable
Loading status checks…
09ed27c
@nrc

This comment has been minimized.

Sign in to view
Copy link
Member

nrc commented Jun 16, 2015

@bors: r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 16, 2015

📌 Commit 09ed27c has been approved by nrc
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jun 17, 2015

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

@rust-highfive rust-highfive added the beta-nominated label Jun 17, 2015

@alexcrichton alexcrichton added the T-tools label Jun 17, 2015

@brson

This comment has been minimized.

Sign in to view
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

This comment has been minimized.

Sign in to view
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

@bors
Auto merge of #26347 - nagisa:macro-exp, r=nrc 
r? @nrc, because breakage was caused by #25318
Loading status checks…
20d23d8
@bors

@bors bors merged commit 09ed27c into rust-lang:master Jun 18, 2015
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jun 18, 2015

Accepting for backprot

@alexcrichton alexcrichton added the beta-accepted label Jun 18, 2015

@brson brson referenced this pull request Jun 18, 2015

Merged

Plucked cherries for 1.1 #26409

@alexcrichton alexcrichton removed the beta-nominated label Jun 18, 2015

zmbush added a commit to zmbush/rust-clippy that referenced this pull request Jun 18, 2015

@zmbush
Fix build with rustc 1.2.0-nightly (20d23d8e5 2015-06-18) 
In rust-lang/rust#26347, MacroFormat was
renamed to ExpnFormat.
2564c74

zmbush added a commit to zmbush/rust-clippy that referenced this pull request Jun 18, 2015

@zmbush
Fix build with rustc 1.2.0-nightly (20d23d8e5 2015-06-18) 
In rust-lang/rust#26347, MacroFormat was
renamed to ExpnFormat. MacroFormat wasn't being used in
src/mut_mut.rs, so I removed it.
0ffbdf2

@zmbush zmbush referenced this pull request Jun 18, 2015

Merged

Fix build with rustc 1.2.0-nightly (20d23d8e5 2015-06-18) #102

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.