Skip to content

Rollup of 7 pull requests #69829

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 24 commits into from
Mar 8, 2020
Merged

Rollup of 7 pull requests #69829

merged 24 commits into from
Mar 8, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 8, 2020

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 24 commits March 2, 2020 10:13
@RalfJung
remove non-sysroot sources from rust-src component
cbf52b1
@Mark-Simulacrum
Try to ensure usize marker does not get merged
a9259fb
@ssomers
Documentation and slight simplification of BTreeMap's internals
9384cba
@GuillaumeGomez
Cleanup E0390 explanation
13d5ee1
@lukas-code
Fix missing ` in doc for File::with_options
31183bb
@RalfJung
'fieldless enums' is not what I meant -- it's empty/uninhabited enums…
6548be2 
…, really
@RalfJung
miri value visitor: detect primitives by type, not layout
d47196b
@RalfJung
const validation ub tests: use transmute instead of unions
aa1435b
@RalfJung
test that we validate boxes
4807e93
@RalfJung
test some more kinds of enums with uninhabited variants
f481547
@RalfJung
better error messages for invalid boxes (and a few more tests)
4584e75
@RalfJung
please tidy
f0586f9
@RalfJung
rename visit_primitive -> try_visit_primitive, and comments
58f8cc2
@RalfJung
bug on ty::GeneratorWitness
295c2d6
refactor: Exhaustive matching in method/probe.rs
b1b558f
refactor: Move a borrow_mut and unwrap out of a loop
6095fa1
@RalfJung
fix type size mismatch on 32bit
a95f00f
@Centril
Rollup merge of rust-lang#69631 - RalfJung:rust-src, r=Mark-Simulacrum
b3c405c 
remove non-sysroot sources from rust-src component

See rust-lang#69592 (comment): these were likely added in rust-lang#58269 for the sake of compiler plugins, but those are being entirely phased out, so there is no good reason to ship these sources.

OTOH, @eddyb [wrote](rust-lang#58269 (comment))

> Yeah, my question is why librustc_plugin specifically? Everything else makes sense.

So maybe there is some good reason to keep these? Then we should have a comment explaining that reason.

Cc @eddyb @taeguk @Mark-Simulacrum
@Centril
Rollup merge of rust-lang#69646 - RalfJung:layout-visitor, r=eddyb
c31b704 
Miri visitor: detect primitive types based on type, not layout (also, more tests)

I also converted the union-based transmutes to use `mem::transmute` for increased readability.

r? @eddyb @oli-obk
@Centril
Rollup merge of rust-lang#69651 - Mark-Simulacrum:black-box-marker, r…
8ce45d8 
…=eddyb

Try to ensure usize marker does not get merged

This follows up on [this conversation](rust-lang#69209 (comment)). However, I'm not confident this is quite correct, so feedback is appreciated, as always.
@Centril
Rollup merge of rust-lang#69668 - ssomers:btreemap_even_more_comments…
c13d296 
…, r=Mark-Simulacrum

More documentation and simplification of BTreeMap's internals

Salvage the documentation and simplification from rust-lang#67980, without changing the type locked down by debuginfo.

r? @rkruppe
@Centril
Rollup merge of rust-lang#69771 - GuillaumeGomez:cleanup-e0390, r=Dyl…
22d6cc7 
…an-DPC

Cleanup E0390 explanation

r? @Dylan-DPC
@Centril
Rollup merge of rust-lang#69777 - lukas-code:patch-1, r=jonas-schievink
b610371 
Add missing ` in doc for File::with_options()
@Centril
Rollup merge of rust-lang#69812 - Marwes:refactor, r=petrochenkov
06689e2 
Refactorings to method/probe.rs and CrateId

A couple of refactorings done while looking into performance improvements in method resolution.
@Centril Centril added the rollup A PR which is a rollup label Mar 8, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 8, 2020

@bors r+ p=1001 rollup=never

@bors
Copy link
Collaborator

bors commented Mar 8, 2020

📌 Commit 06689e2 has been approved by Centril

@bors
Copy link
Collaborator

bors commented Mar 8, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Mar 8, 2020
@bors
Copy link
Collaborator

bors commented Mar 8, 2020

⌛ Testing commit 06689e2 with merge 564758c...

@bors
Copy link
Collaborator

bors commented Mar 8, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 564758c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2020
@bors bors merged commit 564758c into rust-lang:master Mar 8, 2020
@Centril Centril deleted the rollup-lm5lzsq branch March 8, 2020 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Centril @bors @RalfJung @Mark-Simulacrum @ssomers @GuillaumeGomez @lukas-code