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 10 pull requests #64562

Merged
merged 21 commits into from
Sep 18, 2019
Merged

Rollup of 10 pull requests #64562

merged 21 commits into from
Sep 18, 2019

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Sep 17, 2019

Successful merges:

Failed merges:

r? @ghost

XAMPPRocky and others added 21 commits September 9, 2019 12:26
It's currently 120 bytes on x86-64, due to one oversized variant
(`Subtype`). This commit boxes `Subtype`'s contents, reducing the size
of `SubregionOrigin` to 32 bytes.

The change speeds things up by avoiding lots of `memcpy` calls, mostly
relating to `RegionConstraintData::constraints`, which is a `BTreeMap`
with `SubregionOrigin` values.
* Serialize the level to something a little more useful for a failure note
  struct
* Update tests accordingly
Co-Authored-By: Ralf Jung <post@ralfj.de>
Get rid of special const intrinsic query in favour of `const_eval`

r? @eddyb
… r=Mark-Simulacrum

Shrink `SubregionOrigin`.

It's currently 120 bytes on x86-64, due to one oversized variant
(`Subtype`). This commit boxes `Subtype`'s contents, reducing the size
of `SubregionOrigin` to 32 bytes.

The change speeds things up by avoiding lots of `memcpy` calls, mostly
relating to `RegionConstraintData::constraints`, which is a `BTreeMap`
with `SubregionOrigin` values.
…json-level, r=Mark-Simulacrum

Fix failure note `to_str` implementation

Serialize the level to something a little more useful for a failure note struct. This fixes rust-lang#60425.
improve Vec example soundness in mem::transmute docs

The previous version of the `Vec` example had a case of questionable soundness, because at one point `v_orig` was aliased.

r? @RalfJung
…bini

avoid duplicate issues for Miri build failures

Currently, when Miri regressed from test-pass to test-fail, we pen an issue -- and then when it regresses further from test-fail to build-fail, we open a *second* issue.

This changes the logic to avoid the redundant second issue for Miri.

r? @pietroalbini @kennytm
…bini

build-manifest: re-add some comments

rust-lang#64543 also reverted the comments I added. This adds them back.
Includes rust-lang#64543.

r? @pietroalbini
@tmandry
Copy link
Member Author

tmandry commented Sep 17, 2019

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Sep 17, 2019

📌 Commit 93d6108 has been approved by tmandry

@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 Sep 17, 2019
@bors
Copy link
Contributor

bors commented Sep 17, 2019

⌛ Testing commit 93d6108 with merge 5283791...

bors added a commit that referenced this pull request Sep 17, 2019
Rollup of 10 pull requests

Successful merges:

 - #61626 (Get rid of special const intrinsic query in favour of `const_eval`)
 - #64283 (Updated RELEASES.md for 1.38.0)
 - #64394 (Shrink `SubregionOrigin`.)
 - #64429 (Fix failure note `to_str` implementation)
 - #64436 (improve Vec example soundness in mem::transmute docs)
 - #64502 (avoid duplicate issues for Miri build failures)
 - #64505 (Fix inconsistent link formatting)
 - #64529 (Add an example to Pin::as_mut)
 - #64541 (document Miri error categories)
 - #64544 (build-manifest: re-add some comments)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 18, 2019

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing 5283791 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 18, 2019
@bors bors merged commit 93d6108 into rust-lang:master Sep 18, 2019
@tmandry tmandry deleted the rollup-kfk0nuo branch September 18, 2019 02:18
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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.