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 5 pull requests #70884

Merged
merged 25 commits into from
Apr 7, 2020
Merged

Rollup of 5 pull requests #70884

merged 25 commits into from
Apr 7, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 25 commits April 4, 2020 12:15
It appears to codegen slightly more efficiently with `split_at` taking
two slices at once, rather than slicing across different calls.
It can try to keep its allocation by converting the inner `Box` to
`Vec`, using `clone_into` on the bytes, then convert back to `Box`.
Despite OS differences, they're all just `Vec<u8>` inside, so we can
just forward `clone_into` calls to that optimized implementation.
Small tweaks in ToOwned::clone_into

- `<[T]>::clone_into` is slightly more optimized.
- `CStr::clone_into` is new, letting it reuse its allocation.
- `OsStr::clone_into` now forwards to the underlying slice/`Vec`.
Miri leak check: memory reachable through globals is not leaked

Also make Miri memory dump prettier by sharing more code with MIR dumping, and fix a bug where the Miri memory dump would print some allocations twice.

r? @oli-obk

Miri PR: rust-lang/miri#1301
…nits, r=alexcrichton

Keep codegen units unmerged when building compiler builtins

Make it possible to control how mono items are partitioned into code generation
units, when compiling the compiler builtins, by retaining the original partitioning.

Helps with rust-lang#48625, rust-lang#61063, rust-lang#67960, rust-lang#70489.

r? @alexcrichton
…tolnay

Use assoc int submodules

Bumping some submodules to the commits their masters currently point at. The main point of this is to get the associated integer/float constant documentation updates that were recently merged to them:

* rust-lang/nomicon#207
* rust-lang/rust-by-example#1327
* rust-lang/stdarch#848

But for some, a few more changes slipped by that happened to be in the master branch of these submodules.

r? @dtolnay
…=dtolnay

Don't import integer and float modules, use assoc consts 2

Follow up to rust-lang#70777. I missed quite a lot of places. Partially because I wanted to keep the size of the last PR down, and partially because my regexes were not good enough :)

r? @dtolnay
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 7, 2020

@Dylan-DPC: 🔑 Insufficient privileges: Not in reviewers

@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 7, 2020

@Dylan-DPC: 🔑 Insufficient privileges: Not in reviewers

@bors
Copy link
Contributor

bors commented Apr 7, 2020

@Dylan-DPC: 🔑 Insufficient privileges: not in try users

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never p=5

In the meantime...

@bors
Copy link
Contributor

bors commented Apr 7, 2020

@Mark-Simulacrum: 🔑 Insufficient privileges: Not in reviewers

@bors
Copy link
Contributor

bors commented Apr 7, 2020

@Mark-Simulacrum: 🔑 Insufficient privileges: not in try users

@jonas-schievink
Copy link
Contributor

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 7, 2020

📌 Commit 89d661f has been approved by jonas-schievink

@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 Apr 7, 2020
@Dylan-DPC-zz
Copy link
Author

ah the lucky one :D

@bors
Copy link
Contributor

bors commented Apr 7, 2020

⌛ Testing commit 89d661f with merge 42abbd8...

@bors
Copy link
Contributor

bors commented Apr 7, 2020

☀️ Test successful - checks-azure
Approved by: jonas-schievink
Pushing 42abbd8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 7, 2020
@bors bors merged commit 42abbd8 into rust-lang:master Apr 7, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #70884!

Tested on commit 42abbd8.
Direct link to PR: #70884

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
🎉 nomicon on windows: test-fail → test-pass (cc @Gankra @frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @Gankra @frewsxcv).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 7, 2020
Tested on commit rust-lang/rust@42abbd8.
Direct link to PR: <rust-lang/rust#70884>

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
🎉 nomicon on windows: test-fail → test-pass (cc @Gankra @frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @Gankra @frewsxcv).
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. 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.

10 participants