Rollup of 7 pull requests #69829

Centril · 2020-03-08T15:53:46Z

Successful merges:

remove non-sysroot sources from rust-src component #69631 (remove non-sysroot sources from rust-src component)
Miri visitor: detect primitive types based on type, not layout (also, more tests) #69646 (Miri visitor: detect primitive types based on type, not layout (also, more tests))
Try to ensure usize marker does not get merged #69651 (Try to ensure usize marker does not get merged)
More documentation and simplification of BTreeMap's internals #69668 (More documentation and simplification of BTreeMap's internals)
Cleanup E0390 explanation #69771 (Cleanup E0390 explanation)
Add missing ` in doc for File::with_options() #69777 (Add missing ` in doc for File::with_options())
Refactorings to method/probe.rs and CrateId #69812 (Refactorings to method/probe.rs and CrateId)

Failed merges:

…, really

@eddyb

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

@eddyb

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

…=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.

…, 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

@Dylan-DPC

…an-DPC Cleanup E0390 explanation r? @Dylan-DPC

Add missing ` in doc for File::with_options()

Refactorings to method/probe.rs and CrateId A couple of refactorings done while looking into performance improvements in method resolution.

Centril · 2020-03-08T15:54:02Z

@bors r+ p=1001 rollup=never

bors · 2020-03-08T15:54:03Z

📌 Commit 06689e2 has been approved by Centril

bors · 2020-03-08T15:54:04Z

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

bors · 2020-03-08T15:54:16Z

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

bors · 2020-03-08T19:48:42Z

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

RalfJung and others added 24 commits March 2, 2020 10:13

remove non-sysroot sources from rust-src component

cbf52b1

Try to ensure usize marker does not get merged

a9259fb

Documentation and slight simplification of BTreeMap's internals

9384cba

Cleanup E0390 explanation

13d5ee1

Fix missing ` in doc for File::with_options

31183bb

'fieldless enums' is not what I meant -- it's empty/uninhabited enums…

6548be2

…, really

miri value visitor: detect primitives by type, not layout

d47196b

const validation ub tests: use transmute instead of unions

aa1435b

test that we validate boxes

4807e93

test some more kinds of enums with uninhabited variants

f481547

better error messages for invalid boxes (and a few more tests)

4584e75

please tidy

f0586f9

rename visit_primitive -> try_visit_primitive, and comments

58f8cc2

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

fix type size mismatch on 32bit

a95f00f

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

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.

Rollup merge of rust-lang#69771 - GuillaumeGomez:cleanup-e0390, r=Dyl…

22d6cc7

…an-DPC Cleanup E0390 explanation r? @Dylan-DPC

Rollup merge of rust-lang#69777 - lukas-code:patch-1, r=jonas-schievink

b610371

Add missing ` in doc for File::with_options()

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 added the rollup A PR which is a rollup label Mar 8, 2020

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 added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2020

bors merged commit 564758c into rust-lang:master Mar 8, 2020

Centril deleted the rollup-lm5lzsq branch March 8, 2020 19:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #69829

Rollup of 7 pull requests #69829

Centril commented Mar 8, 2020

Centril commented Mar 8, 2020

bors commented Mar 8, 2020

bors commented Mar 8, 2020

bors commented Mar 8, 2020

bors commented Mar 8, 2020

Rollup of 7 pull requests #69829

Rollup of 7 pull requests #69829

Conversation

Centril commented Mar 8, 2020

Centril commented Mar 8, 2020

bors commented Mar 8, 2020

bors commented Mar 8, 2020

bors commented Mar 8, 2020

bors commented Mar 8, 2020