Skip to content

Rustup macro expansion and resolution#4269

Merged
bors merged 1 commit intorust-lang:masterfrom
tesuji:rustup
Jul 12, 2019
Merged

Rustup macro expansion and resolution#4269
bors merged 1 commit intorust-lang:masterfrom
tesuji:rustup

Conversation

@tesuji
Copy link
Contributor

@tesuji tesuji commented Jul 11, 2019 •
edited
Loading

Rustup rust-lang/rust#62476

changelog: none

flip1995
flip1995 approved these changes Jul 11, 2019
View reviewed changes
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Currently we're waiting for the new nightly, so that we can install RTIM in the CI again, to install the master toolchain.

@flip1995
Copy link
Member

flip1995 commented Jul 11, 2019 •
edited
Loading

@bors r+ p=11

(r+ anyway to be able to create a rollup tomorrow)

@bors
Copy link
Contributor

bors commented Jul 11, 2019

📌 Commit b53119b has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 11, 2019

⌛ Testing commit b53119b with merge c1f9254...

bors added a commit that referenced this pull request Jul 11, 2019
@bors
Auto merge of #4269 - lzutao:rustup, r=flip1995
c1f9254 
Rustup `macro expansion and resolution`

Rustup rust-lang/rust#62476

changelog: none
@bors
Copy link
Contributor

bors commented Jul 11, 2019

💔 Test failed - checks-travis

@mati865
Copy link
Member

mati865 commented Jul 11, 2019

Does anything other than RTIM use nightly toolchain?
It could have been built with stable/beta toolchain.

@flip1995
Copy link
Member

flip1995 commented Jul 11, 2019 •
edited
Loading

Does anything other than RTIM use nightly toolchain?

Yes, we use nightly rustfmt, since it can't be installed reliably on the master toolchain.

@flip1995
Copy link
Member

flip1995 commented Jul 11, 2019

That won't work either, because of

rust-clippy/ci/base-tests.sh

Line 27 in 032ae96

cargo +nightly fmt --all -- --check

I think waiting a day is easier, than changing CI for one day.

@flip1995
Copy link
Member

flip1995 commented Jul 12, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 12, 2019

📌 Commit 27c5348 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 12, 2019

⌛ Testing commit 27c5348 with merge b029042...

bors added a commit that referenced this pull request Jul 12, 2019
@bors
Auto merge of #4269 - lzutao:rustup, r=flip1995
b029042 
Rustup `macro expansion and resolution`

Rustup rust-lang/rust#62476

changelog: none
@bors
Copy link
Contributor

bors commented Jul 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing b029042 to master...

@bors bors merged commit 27c5348 into rust-lang:master Jul 12, 2019
@tesuji tesuji deleted the rustup branch July 12, 2019 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@flip1995 flip1995 flip1995 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tesuji @flip1995 @bors @mati865