Skip to content

Rollup of 7 pull requests - #61649

Merged
bors merged 16 commits into
rust-lang:masterfrom
Centril:rollup-b4nx9k9
Jun 8, 2019
Merged

Rollup of 7 pull requests#61649
bors merged 16 commits into
rust-lang:masterfrom
Centril:rollup-b4nx9k9

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

czipperzand others added 16 commits May 26, 2019 21:04
…g, r=oli-obk
Document tuple's Ord behavior as sequential
Partially closing rust-lang#50727
syntax: Treat error literals in more principled way
Free them from their character literal origins.
I actually tried to remove `LitKind::Err` entirely (by converting it into `ExprKind::Err` immediately), and it caused no diagnostic regressions in the test suite.
However, I'd still want to use error literals as general purpose error tokens some day, so I kept them.
The downside of having `LitKind::Err` in addition to `ExprKind::Err` is that every time you want to do something with `ExprKind::Err` you need to make sure that `ExprKind::Lit(LitKind::Err)` is treated in the same way.
Fortunately, this usually happens automatically because both literals and errors are "leaf" expressions, however this PR does fix a couple of inconsistencies between them.
Addresses rust-lang#60679 (comment) in a way
parser: Remove `Deref` impl from `Parser`
Follow up to rust-lang#61541
You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess.
Not sure.
Probably still better than people using both and being confused about the definition point of `span`.
r? @oli-obk@estebank
…hosts, r=alexcrichton
Clarify when we run steps with ONLY_HOSTS
Just some simple cleanup, no behavior changes.
r? @alexcrichton
…crichton
Add regression test for rust-lang#61452.
Fixesrust-lang#61452.
Turns out this ICE had already been fixed, so this PR only adds a regression test.
…ocal-analyzer, r=oli-obk
Revert "Make LocalAnalizer visitor iterate instead of recurse"
This reverts commit 0cfaa28.
r? @oli-obk
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=7

@bors

bors commented Jun 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit b3bdc24 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 8, 2019
@bors

bors commented Jun 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b3bdc24 with merge 6312b89...

bors added a commit that referenced this pull request Jun 8, 2019
Rollup of 7 pull requests
Successful merges:
- #61223 (Document tuple's Ord behavior as sequential)
- #61615 (syntax: Treat error literals in more principled way)
- #61616 (parser: Remove `Deref` impl from `Parser`)
- #61621 (Clarify when we run steps with ONLY_HOSTS)
- #61627 (Add regression test for #61452.)
- #61641 (Revert "Make LocalAnalizer visitor iterate instead of recurse")
- #61647 (Use stable wrappers in f32/f64::signum)
Failed merges:
r? @ghost
@bors

bors commented Jun 8, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 6312b89 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2019
@bors
bors merged commit b3bdc24 into rust-lang:masterJun 8, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #61649!

Tested on commit 6312b89.
Direct link to PR: #61649

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 8, 2019
Tested on commit rust-lang/rust@6312b89.
Direct link to PR: <rust-lang/rust#61649>
💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
@Centril
Centril deleted the rollup-b4nx9k9 branch June 8, 2019 13:32
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@Centril@bors@rust-highfive@czipperz@petrochenkov@Mark-Simulacrum@davidtwco@spastorino@JohnTitor