Skip to content

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

skinnyBat and others added 21 commits February 15, 2020 11:56
…e` instead of `Const` as the type

in the returned const isn't needed.
Change const eval to just return the value

As discussed in rust-lang#68505 (comment), the type of consts shouldn't be returned from const eval queries.

r? @eddyb
cc @nikomatsakis
…b,Zoxc

Fix printing of `Yield` terminator

Addresses the bug found in rust-lang#69039 (comment)
…-Simulacrum

Allow whitespaces in revision flags

Allow whitespaces in revision flags, like `// [foo]`.

Fixes rust-lang#69183
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Feb 18, 2020

📌 Commit 210b181 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 18, 2020
@bors
Copy link
Collaborator

bors commented Feb 18, 2020

⌛ Testing commit 210b181 with merge e620d0f...

bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 5 pull requests

Successful merges:

 - #69181 (Change const eval to just return the value )
 - #69192 (Add more regression tests)
 - #69200 (Fix printing of `Yield` terminator)
 - #69205 (Allow whitespaces in revision flags)
 - #69233 (Clean up E0310 explanation)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Feb 18, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing e620d0f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2020
@bors bors merged commit 210b181 into rust-lang:master Feb 18, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #69262!

Tested on commit e620d0f.
Direct link to PR: #69262

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 18, 2020
Tested on commit rust-lang/rust@e620d0f.
Direct link to PR: <rust-lang/rust#69262>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Feb 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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.

8 participants