macros: fix regression with include!() by jseyfried · Pull Request #40583 · rust-lang/rust (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation8 Commits1 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

jseyfried

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

@jseyfried jseyfried added the T-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.

label

Mar 16, 2017

@nikomatsakis

@nikomatsakis

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

@nrc

@bors

📌 Commit 284ece3 has been approved by nrc

@nrc nrc added the beta-nominated

Nominated for backporting to the compiler in the beta channel.

label

Mar 17, 2017

@nrc

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

frewsxcv added a commit to frewsxcv/rust that referenced this pull request

Mar 17, 2017

@frewsxcv

…ion, r=nrc

macros: fix regression with include!()

Fixes rust-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 17, 2017

@frewsxcv

…ion, r=nrc

macros: fix regression with include!()

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

@alexcrichton

@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

@jseyfried

@bors

📌 Commit cb96ade has been approved by nrc

frewsxcv added a commit to frewsxcv/rust that referenced this pull request

Mar 18, 2017

@frewsxcv

…ion, r=nrc

macros: fix regression with include!()

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

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Mar 18, 2017

…ion, r=nrc

macros: fix regression with include!()

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

bors added a commit that referenced this pull request

Mar 18, 2017

@bors

Rollup of 22 pull requests

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Mar 19, 2017

…ion, r=nrc

macros: fix regression with include!()

Fixes rust-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

…ion, r=nrc

macros: fix regression with include!()

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

bors added a commit that referenced this pull request

Mar 19, 2017

@bors

Rollup of 13 pull requests

@jseyfried jseyfried deleted the fix_include_macro_regression branch

March 19, 2017 21:13

@brson brson 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

[beta] Backports and version bump

This PR backports these PRs to beta:

and it also includes a version bump to push out a beta with all recent backports.

Labels

beta-accepted

Accepted for backporting to the compiler in the beta channel.

T-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.