Skip to content

macros: fix regression with include!() - #40583

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_include_macro_regression
Mar 19, 2017
Merged

macros: fix regression with include!()#40583
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_include_macro_regression

Conversation

@jseyfried

@jseyfriedjseyfried commented Mar 16, 2017

Copy link
Copy Markdown
Contributor

Fixes#40469, a regression when include!()ing a macro_rules! containing $crate.
r? @nrc

@nikomatsakisnikomatsakis added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 16, 2017
@jseyfriedjseyfried added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 16, 2017
@nikomatsakis

nikomatsakis commented Mar 16, 2017

Copy link
Copy Markdown
Contributor

Nominated for beta.

@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 16, 2017
@nikomatsakis

nikomatsakis commented Mar 16, 2017

Copy link
Copy Markdown
Contributor

Marking as beta-accepted, presuming the patch is r+'d.

@jseyfriedjseyfried mentioned this pull request Mar 16, 2017
Closed
@jseyfriedjseyfried removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 16, 2017
@nrc

nrc commented Mar 17, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Mar 17, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 284ece3 has been approved by nrc

@nrcnrc added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 17, 2017
@nrc

nrc commented Mar 17, 2017

Copy link
Copy Markdown
Member

iirc, we leave the beta-nominated label on until merged to beta.

@alexcrichtonalexcrichton mentioned this pull request Mar 17, 2017
Merged
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 17, 2017
@frewsxcv
Rollup merge ofrust-lang#40583- jseyfried:fix_include_macro_regress…
55eacfe
…ion, r=nrc
macros: fix regression with `include!()`
Fixesrust-lang#40469, a regression when `include!()`ing a `macro_rules!` containing `$crate`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 17, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 17, 2017
@frewsxcv
Rollup merge ofrust-lang#40583- jseyfried:fix_include_macro_regress…
4955503
…ion, r=nrc
macros: fix regression with `include!()`
Fixesrust-lang#40469, a regression when `include!()`ing a `macro_rules!` containing `$crate`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 17, 2017
Closed
@alexcrichton

alexcrichton commented Mar 17, 2017

Copy link
Copy Markdown
Member

@bors: r-

I think this has a failure

---- [pretty] pretty/issue-40469.rs stdout ----
error: pretty-printed source does not typecheck
status: exit code: 101
command: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc - -Zno-trans --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issue-40469.pretty-out --target=x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issue-40469.stage2-x86_64-unknown-linux-gnu.pretty.libaux -Crpath -O -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers
stdout:
------------------------------------------
------------------------------------------
stderr:
------------------------------------------
error: couldn't read "auxiliary/issue_40469.rs": No such file or directory (os error 2)
--> <anon>:13:1
|
13 | include! ("auxiliary/issue_40469.rs");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
------------------------------------------
thread '[pretty] pretty/issue-40469.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2637
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
[pretty] pretty/issue-40469.rs
test result: FAILED. 2610 passed; 1 failed; 27 ignored; 0 measured

@jseyfried
jseyfriedforce-pushed the fix_include_macro_regression branch from 284ece3 to cb96adeCompareMarch 17, 2017 22:21
@jseyfried

jseyfried commented Mar 17, 2017

Copy link
Copy Markdown
ContributorAuthor

@alexcrichton Indeed, problem was #37195 -- fixed.
@bors r=nrc

@bors

bors commented Mar 17, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit cb96ade has been approved by nrc

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 18, 2017
@frewsxcv
Rollup merge ofrust-lang#40583- jseyfried:fix_include_macro_regress…
f014ce8
…ion, r=nrc
macros: fix regression with `include!()`
Fixesrust-lang#40469, a regression when `include!()`ing a `macro_rules!` containing `$crate`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 18, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 18, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40583- jseyfried:fix_include_macro_regress…
76c9d17
…ion, r=nrc
macros: fix regression with `include!()`
Fixesrust-lang#40469, a regression when `include!()`ing a `macro_rules!` containing `$crate`.
r? @nrc
@arielb1arielb1 mentioned this pull request Mar 18, 2017
Closed
bors added a commit that referenced this pull request Mar 18, 2017
@bors
Auto merge of#40644- arielb1:rollup, r=arielb1
1d565ef
Rollup of 22 pull requests
- Successful merges: #40241, #40346, #40348, #40377, #40398, #40409, #40441, #40445, #40509, #40521, #40523, #40532, #40538, #40564, #40581, #40583, #40588, #40589, #40590, #40603, #40611, #40621
- Failed merges: #40501, #40541
@arielb1arielb1 mentioned this pull request Mar 19, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 19, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40583- jseyfried:fix_include_macro_regress…
9e36496
…ion, r=nrc
macros: fix regression with `include!()`
Fixesrust-lang#40469, a regression when `include!()`ing a `macro_rules!` containing `$crate`.
r? @nrc
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 19, 2017
@frewsxcv
Rollup merge ofrust-lang#40583- jseyfried:fix_include_macro_regress…
c949f49
…ion, r=nrc
macros: fix regression with `include!()`
Fixesrust-lang#40469, a regression when `include!()`ing a `macro_rules!` containing `$crate`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 19, 2017
Merged
bors added a commit that referenced this pull request Mar 19, 2017
@bors
Auto merge of#40651- frewsxcv:rollup, r=frewsxcv
38c53f3
Rollup of 13 pull requests
- Successful merges: #40441, #40445, #40562, #40564, #40583, #40588, #40589, #40590, #40603, #40611, #40621, #40646, #40648
- Failed merges:
@bors
bors merged commit cb96ade into rust-lang:masterMar 19, 2017
@jseyfried
jseyfried deleted the fix_include_macro_regression branch March 19, 2017 21:13
@alexcrichtonalexcrichton mentioned this pull request Mar 20, 2017
Merged
@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 20, 2017
bors added a commit that referenced this pull request Mar 20, 2017
@bors
Auto merge of#40675- alexcrichton:beta-next, r=brson
b7c2766
[beta] Backports and version bump
This PR backports these PRs to beta:
* #40583
* #40398
* #40542
and it also includes a version bump to push out a beta with all recent backports.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nrcnrc

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jseyfried@nikomatsakis@nrc@bors@alexcrichton@brson