Skip to content

Rollup of 10 pull requests - #68067

Merged
bors merged 30 commits into
rust-lang:masterfrom
JohnTitor:rollup-vsj5won
Jan 9, 2020
Merged

Rollup of 10 pull requests#68067
bors merged 30 commits into
rust-lang:masterfrom
JohnTitor:rollup-vsj5won

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Thomasdezeeuwand others added 30 commits January 6, 2020 15:41
Co-Authored-By: Ralf Jung <post@ralfj.de>
The as_ref method already has a Null-unchecked version section, its
example is a modification of the example in the main as_ref section.
Similarly the example in this commit is a modification of the example
in main as_mut section.
Make Layout::new const
This seems like a reasonable change to make. If we don't provide `Layout::new::<T>` as `const`, then users can just instead do the more error prone `Layout::from_size_align_unchecked(mem::size_of::<T>(), mem::align_of::<T>())` for the same effect and an extra `unsafe { }` incantation.
Do not deduplicate diagnostics in UI tests
Error reporting infrastructure deduplicates identical diagnostics with identical spans.
While it's preferable to do this in "release"/"user-facing" mode, it sometimes brings [confusion](rust-lang#50682 (comment)) and hides details that may be important during development.
Do we run some passes multiple times when we could do it once?
How many times we run them exactly? Can this number be large? Can the multiplied error construction be expensive? Can speculative checks be made cheaper if they don't report errors?
*Relying* on this mechanism to deduplicate some specific error never looks like a proper solution to me personally.
In this PR I attempt to disable this deduplication by applying `-Z deduplicate-diagnostics=no` to UI tests.
…sKalbertodt
Add HashSet::get_or_insert_owned
This is an extension for tracking issue rust-lang#60896. The more-general `get_or_insert_with` has potential for misuse, so we might remove it, but I think `get_or_insert_owned` covers most use cases.
Simplify into_key_slice_mut
Remove a rare and tiny but superfluous run-time check from into_key_slice_mut.
In rust-lang#67459, I wrote that "`get_mut` [...] does visit `into_key_slice_mut`" and that was wrong. No function that operates on a map that (still) has a shared root ever dives into `into_key_slice_mut`. So it's more clear to remove the (previously existing, and always incomplete) code it has for dealing with shared roots, as well as a petty performance improvement for those using exotically aligned key types.
~~Also, some testing of the `range` function initially added to rust-lang#67686 but hardly related.~~
r? @RalfJung
…tboats
Relax the Sized bounds on Pin::map_unchecked(_mut)
Fixesrust-lang#67669.
…r=alexcrichton
Export public scalar statics in wasm
Fixesrust-lang#67453
I am not sure which export level statics should get when exporting them in wasm. This small change fixes the issue that I had, but this might not be the correct way to implement this.
Recognise riscv64 in compiletest
Otherwise tests can't run, fails with "Cannot determine Architecture from triple"
…ramertj
doc: add Null-unchecked version section to mut pointer as_mut method
The [`as_ref`](https://doc.rust-lang.org/std/primitive.pointer.html#method.as_ref-1) method already has a *Null-unchecked version* section, its example is a modification of the example in the main `as_ref` section. Similarly the example in this PR is a modification of the example in main [`as_mut`](https://doc.rust-lang.org/std/primitive.pointer.html#method.as_mut) section.
Fixesrust-lang#68032.
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=10 rollup=never

@bors

bors commented Jan 9, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9e83df0 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 9, 2020
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Jan 9, 2020
@bors

bors commented Jan 9, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9e83df0 with merge 72b2bd5...

bors added a commit that referenced this pull request Jan 9, 2020
Rollup of 10 pull requests
Successful merges:
- #66254 (Make Layout::new const)
- #67122 (Do not deduplicate diagnostics in UI tests)
- #67358 (Add HashSet::get_or_insert_owned)
- #67725 (Simplify into_key_slice_mut)
- #67935 (Relax the Sized bounds on Pin::map_unchecked(_mut))
- #67967 (Delay bug to prevent ICE in MIR borrowck)
- #67975 (Export public scalar statics in wasm)
- #68006 (Recognise riscv64 in compiletest)
- #68040 (Cleanup)
- #68054 (doc: add Null-unchecked version section to mut pointer as_mut method)
Failed merges:
- #67258 (Introduce `X..`, `..X`, and `..=X` range patterns)
r? @ghost
@bors

bors commented Jan 9, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing 72b2bd5 to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

11 participants

@JohnTitor@bors@Thomasdezeeuw@MaikKlein@infinity0@cuviper@sinkuu@ssomers@tspiteri@petrochenkov@CAD97