Skip to content
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

Rollup of 7 pull requests #61649

Merged
merged 16 commits into from Jun 8, 2019

Conversation

Projects
None yet
9 participants
@Centril
Copy link
Member

commented Jun 8, 2019

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

czipperz and others added some commits May 27, 2019

Rollup merge of #61223 - czipperz:tuple-ord-document-ordering, r=oli-obk
Document tuple's Ord behavior as sequential

Partially closing #50727
Rollup merge of #61615 - petrochenkov:errlit, r=matklad
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 #60679 (comment) in a way
Rollup merge of #61616 - petrochenkov:parsderef, r=oli-obk
parser: Remove `Deref` impl from `Parser`

Follow up to #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
Rollup merge of #61621 - Mark-Simulacrum:bootstrap-run-only-hosts, r=…
…alexcrichton

Clarify when we run steps with ONLY_HOSTS

Just some simple cleanup, no behavior changes.

r? @alexcrichton
Rollup merge of #61627 - davidtwco:ice-async-fn-lint, r=alexcrichton
Add regression test for #61452.

Fixes #61452.

Turns out this ICE had already been fixed, so this PR only adds a regression test.
Rollup merge of #61641 - spastorino:revert-to-recursion-on-local-anal…
…yzer, r=oli-obk

Revert "Make LocalAnalizer visitor iterate instead of recurse"

This reverts commit 0cfaa28.

r? @oli-obk
Rollup merge of #61647 - JohnTitor:use-stable-func, r=Centril
Use stable wrappers in f32/f64::signum

Fixes #61638

r? @Centril
@Centril

This comment has been minimized.

Copy link
Member Author

commented Jun 8, 2019

@bors r+ rollup=never p=7

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2019

📌 Commit b3bdc24 has been approved by Centril

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2019

⌛️ Testing commit b3bdc24 with merge 6312b89...

bors added a commit that referenced this pull request Jun 8, 2019

Auto merge of #61649 - Centril:rollup-b4nx9k9, r=Centril
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

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2019

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

@bors bors added the merged-by-bors label Jun 8, 2019

@bors bors merged commit b3bdc24 into rust-lang:master Jun 8, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jun 8, 2019

📣 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

📣 Toolstate changed by rust-lang/rust#61649!
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).

@bors bors referenced this pull request Jun 8, 2019

Merged

Allow attributes in formal function parameters #60669

2 of 2 tasks complete

@Centril Centril deleted the Centril:rollup-b4nx9k9 branch Jun 8, 2019

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.