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 #63214

Merged
merged 42 commits into from Aug 2, 2019
Merged

Rollup of 7 pull requests #63214

merged 42 commits into from Aug 2, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 2, 2019

Successful merges:

Failed merges:

r? @ghost

rbartlensky and others added 9 commits August 1, 2019 22:41
…illaumeGomez

More questionmarks in doctests

This removes the other `unwrap`s in the macro doctests, replacing them with `?`. For now, we need to specify the main function including the return type, we can get rid of that once the return type suggestion for `fn main() { .. }` works correctly.

r? @QuietMisdreavus
… r=RalfJung

Changing the structure of `mir::interpret::InterpError`

Implements [this](rust-lang/const-eval#4 (comment))
…cramertj

Remove redundant method with const variable resolution

I've also removed a `bug!()` in const value relation code and replaced it with a `FIXME`. Now `ConstValue::Slice` and `ConstValue::ByRef` will simply fail to unify rather than ICEing, which seems more user-friendly for testers.
…Centril

Doc improvements

Miscellaneous documentation fixes.
…a, r=petrochenkov

Allow trailing comma in macro 2.0 declarations.

This should hopefully close rust-lang#63102.
…, r=oli-obk

Make is_mutable use PlaceRef instead of it's fields

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented Aug 2, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Aug 2, 2019

📌 Commit 97098f4 has been approved by Centril

@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 Aug 2, 2019
@bors
Copy link
Contributor

bors commented Aug 2, 2019

⌛ Testing commit 97098f4 with merge 1df512f...

bors added a commit that referenced this pull request Aug 2, 2019
Rollup of 7 pull requests

Successful merges:

 - #62663 (More questionmarks in doctests)
 - #62969 (Changing the structure of `mir::interpret::InterpError`)
 - #63153 (Remove redundant method with const variable resolution)
 - #63189 (Doc improvements)
 - #63198 (Allow trailing comma in macro 2.0 declarations.)
 - #63202 (Fix ICE in #63135)
 - #63203 (Make is_mutable use PlaceRef instead of it's fields)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 2, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 1df512f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 2, 2019
@bors bors merged commit 97098f4 into rust-lang:master Aug 2, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63214!

Tested on commit 1df512f.
Direct link to PR: #63214

💔 miri on windows: test-pass → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

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.

None yet

10 participants