Skip to content

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

LeSeulArtichaut and others added 22 commits April 11, 2020 20:11
Co-authored-by: Mark-Simulacrum <[email protected]>
Co-Authored-By: Mark-Simulacrum <[email protected]>
…gnostic, r=estebank

Make the `structural_match` error diagnostic for const generics clearer

The previous diagnostic caused confusion (rust-lang#70790), so this changes the message to be closer to the message for using non-`structural_match` constants in patterns, explicitly mentioning `#[derive(PartialEq, Eq)]`.

Fixes rust-lang#70790.

r? @estebank
…Mark-Simulacrum

Document unsafety in core::{option, hash}

Helps with rust-lang#66219.
I think that the part that will need reviewing the most is the `hash/sip.rs` file.
r? @LukasKalbertodt (or someone else from the libs team)
…=Mark-Simulacrum

Set `--cfg bootstrap` for stage0 rustdoc

Resolves rust-lang#71455.

With this patch, running `./x.py doc --stage 0 src/libstd` with a clean `build` dir successfully outputs docs for `core`, `alloc` and `std` in under a minute. This kind of turnaround for viewing small changes to the standard library documentation is quite nice, and I think we should endeavour to keep it working. I'm not sure how involved that would be though.

r? @Mark-Simulacrum
…RalfJung

Add leading 0x to offset in Debug fmt of Pointer

Currently the `Debug` format for `Pointer` prints its offset in hexadecimal, for example, `alloc38657819+e2` or `alloc35122748+64`. This PR adds a leading `0x` to the offset, in order to make it apparent that it is indeed a hexadecimal number. This came up during discussion of rust-lang/miri#1354. r? @RalfJung
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=6 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 23, 2020

📌 Commit a9da98f 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 Apr 23, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 23, 2020
@bors
Copy link
Collaborator

bors commented Apr 23, 2020

⌛ Testing commit a9da98f with merge f6f3fd5e2b71803a322096caea2228e95cc7bb45...

@bors
Copy link
Collaborator

bors commented Apr 23, 2020

💔 Test failed - checks-azure

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 23, 2020
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2020
@Dylan-DPC-zz
Copy link
Author

looks like it spuriously failed on wasm... :/

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 23, 2020
@bors
Copy link
Collaborator

bors commented Apr 23, 2020

⌛ Testing commit a9da98f with merge 0e3e6e59d5c336c0c8037a734186b811b58aa4a0...

@bors
Copy link
Collaborator

bors commented Apr 24, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 24, 2020
@bors
Copy link
Collaborator

bors commented Apr 24, 2020

☔ The latest upstream changes (presumably #71496) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants