Rollup of 9 pull requests by Mark-Simulacrum · Pull Request #56408 · rust-lang/rust

Mark-Simulacrum · 2018-12-01T14:08:14Z

Successful merges:

Add template parameter debuginfo to generic types #55010 (Add template parameter debuginfo to generic types)
Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
update miri #56305 (update miri)
Refer to the second borrow as the "second borrow" in E0501.rs #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
Deal with EINTR in net timeout tests #56394 (Deal with EINTR in net timeout tests)
Stabilize dbg!(...) #56395 (Stabilize dbg!(...))
Improve the unstable book example for #[marker] trait #56402 (Improve the unstable book example for Rollup of 9 pull requests #56408 [marker] trait)
Update RLS and Rustfmt #56406 (Update RLS and Rustfmt)
Stabilize self_in_typedefs feature #56366 (Stabilize self_in_typedefs feature)

Failed merges:

This changes debuginfo generation to add template parameters to generic types. With this change the DWARF now has DW_TAG_template_type_param for types, not just for functions, like: <2><40d>: Abbrev Number: 6 (DW_TAG_structure_type) <40e> DW_AT_name : (indirect string, offset: 0x375): Generic<i32> <412> DW_AT_byte_size : 4 <413> DW_AT_alignment : 4 ... <3><41f>: Abbrev Number: 8 (DW_TAG_template_type_param) <420> DW_AT_type : <0x42a> <424> DW_AT_name : (indirect string, offset: 0xa65e): T Closesrust-lang#9224

…especting inhabitedness checks

We've seen sporadic QE failures in the timeout tests on this assertion: assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut); So there's an error, but not either of the expected kinds. Adding a format to show the kind revealed `ErrorKind::Interrupted` (`EINTR`). For the cases that were using `read`, we can just use `read_exact` to keep trying after interruption. For those using `recv_from`, we have to manually loop until we get a non-interrupted result.

The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.

Closesrust-lang#56261

… r=michaelwoerister Add template parameter debuginfo to generic types This changes debuginfo generation to add template parameters to generic types. With this change the DWARF now has DW_TAG_template_type_param for types, not just for functions, like: <2><40d>: Abbrev Number: 6 (DW_TAG_structure_type) <40e> DW_AT_name : (indirect string, offset: 0x375): Generic<i32> <412> DW_AT_byte_size : 4 <413> DW_AT_alignment : 4 ... <3><41f>: Abbrev Number: 8 (DW_TAG_template_type_param) <420> DW_AT_type : <0x42a> <424> DW_AT_name : (indirect string, offset: 0xa65e): T Closesrust-lang#9224

@RalfJung

…cramertj Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks It isn't settled exactly how references to uninhabited types and unions of uninhabited types should act, but we should be more conservative here, as it's likely it will be permitted to soundly have values of such types. This will also be more important in light of the changes at rust-lang#54125. cc @RalfJung

@oli-obk

update miri This should make miri green again :) (Includes rust-lang/miri#553) r? @oli-obk

@davidtwco

…ref, r=davidtwco Refer to the second borrow as the "second borrow" in E0501.rs Fixesrust-lang#55314. r? @davidtwco

…kler Deal with EINTR in net timeout tests We've seen sporadic QE failures in the timeout tests on this assertion: assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut); So there's an error, but not either of the expected kinds. Adding a format to show the kind revealed `ErrorKind::Interrupted` (`EINTR`). For the cases that were using `read`, we can just use `read_exact` to keep trying after interruption. For those using `recv_from`, we have to manually loop until we get a non-interrupted result.

@SimonSapin

…nSapin Stabilize dbg!(...) Per FCP in rust-lang#54306 (which is ~1 day from completion). r? @SimonSapin The PR is fairly isolated so a rollup should probably work.

…e, r=Centril Improve the unstable book example for #[marker] trait The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.

@kennytm

Update RLS and Rustfmt Closesrust-lang#56261 r? @kennytm

Mark-Simulacrum · 2018-12-01T14:08:21Z

@bors r+ p=10

bors · 2018-12-01T14:08:22Z

📌 Commit 4f3b334 has been approved by Mark-Simulacrum

Mark-Simulacrum · 2018-12-01T14:26:27Z

@bors r+ p=10

bors · 2018-12-01T14:26:27Z

📌 Commit 490a1e9 has been approved by Mark-Simulacrum

Centril · 2018-12-01T18:00:10Z

Might want to add #56416 #56401 #56412 to the rollup?

bors · 2018-12-01T18:11:08Z

⌛ Testing commit 490a1e9 with merge 5a0257f...

@ghost

Rollup of 9 pull requests Successful merges: - #55010 (Add template parameter debuginfo to generic types) - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks) - #56305 (update miri) - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs) - #56394 (Deal with EINTR in net timeout tests) - #56395 (Stabilize dbg!(...)) - #56402 (Improve the unstable book example for #56408 [marker] trait) - #56406 (Update RLS and Rustfmt) - #56366 (Stabilize self_in_typedefs feature) Failed merges: r? @ghost

bors · 2018-12-01T19:48:56Z

💔 Test failed - status-appveyor

RalfJungand others added 24 commits November 28, 2018 21:22

update miri
c343bbd

Consider references and unions potentially inhabited during privacy-r…
682f0f8
…especting inhabitedness checks

Add a test for uninhabitedness changes
d2b3407

Clarify undecided semantics
32a8dec

Fix broken tests
46ef9f8

Fix error message after rebase
1cdf5df

update miri
113ae0f

Refer to the second borrow as the "second borrow".
1560a75

Removed feature gate.
aa5a4ef

Removed chapter from Unstable Book.
7bc1255

Updated ui tests.
d609fdf

stabilize std::dbg!(...)
f4cde5b

Improve the unstable book example for #[marker]
a3b7a21
The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.

Update RLS and Rustfmt
7a7445b
Closesrust-lang#56261

Rollup merge ofrust-lang#56305- RalfJung:miri, r=oli-obk
83be646
update miri This should make miri green again :) (Includes rust-lang/miri#553) r? @oli-obk

Rollup merge ofrust-lang#56372- wildarch:issue-55314-second-borrow-…
58fb406
…ref, r=davidtwco Refer to the second borrow as the "second borrow" in E0501.rs Fixesrust-lang#55314. r? @davidtwco

Rollup merge ofrust-lang#56395- Centril:stabilize-dbg-macro, r=Simo…
964d722
…nSapin Stabilize dbg!(...) Per FCP in rust-lang#54306 (which is ~1 day from completion). r? @SimonSapin The PR is fairly isolated so a rollup should probably work.

Rollup merge ofrust-lang#56402- scottmcm:better-marker-trait-exampl…
4ede578
…e, r=Centril Improve the unstable book example for #[marker] trait The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.

Rollup merge ofrust-lang#56406- nrc:update, r=kennytm
4f3b334
Update RLS and Rustfmt Closesrust-lang#56261 r? @kennytm

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 1, 2018

Rollup merge ofrust-lang#56366- Stabilize self_in_typedefs feature
490a1e9

Mark-Simulacrum changed the title ~~Rollup of 8 pull requests~~Rollup of 9 pull requestsDec 1, 2018

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 Dec 1, 2018

Centril mentioned this pull request Dec 1, 2018
Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks #56110
Merged

Mark-Simulacrum closed this Dec 1, 2018

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Navigation Menu

Uh oh!

Uh oh!

Rollup of 9 pull requests - #56408

Rollup of 9 pull requests#56408
Mark-Simulacrum wants to merge 25 commits into
rust-lang:masterfrom
Mark-Simulacrum:rollup

Mark-Simulacrum commented Dec 1, 2018•
edited
Loading

Uh oh!

Mark-Simulacrum commented Dec 1, 2018

Uh oh!

bors commented Dec 1, 2018

Uh oh!

Mark-Simulacrum commented Dec 1, 2018

Uh oh!

bors commented Dec 1, 2018

Uh oh!

Centril commented Dec 1, 2018•
edited
Loading

Uh oh!

bors commented Dec 1, 2018

Uh oh!

bors commented Dec 1, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

Mark-Simulacrum commented Dec 1, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mark-Simulacrum commented Dec 1, 2018

Uh oh!

bors commented Dec 1, 2018

Uh oh!

Mark-Simulacrum commented Dec 1, 2018

Uh oh!

bors commented Dec 1, 2018

Uh oh!

Centril commented Dec 1, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Dec 1, 2018

Uh oh!

bors commented Dec 1, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Mark-Simulacrum commented Dec 1, 2018•
edited
Loading

Centril commented Dec 1, 2018•
edited
Loading