Skip to content

Rollup of 7 pull requests - #100330

Closed
Dylan-DPC wants to merge 20 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-3lmvi1w
Closed

Rollup of 7 pull requests#100330
Dylan-DPC wants to merge 20 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-3lmvi1w

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ChrisDentonand others added 20 commits August 2, 2022 01:08
Temporaries created with `MirPatch::new_temp` will be declared after
patch application. Remove manually created duplicate declarations.
Removing duplicates exposes another issue. Visitor elaborates
terminator twice and attempts to access new, but not yet available,
local declarations. Remove duplicated call to `visit_terminator`.
Error on broken pipe but do not backtrace or ICE
Windows will report a broken pipe as a normal error which in turn `println!` will panic on. Currently this causes rustc to produce a backtrace and ICE. However, this is not a bug with rustc so a backtrace is overly verbose and ultimately unhelpful to the user.
Kind of fixesrust-lang#98700. Although this is admittedly a bit of a hack because at panic time all we have is a string to inspect. On zulip it was suggested that libstd might someday provide a way to indicate a soft panic but that day isn't today.
…iser
Add more `// unit-test`s to MIR opt tests
I only changed things which are hopefully completely uninteresting. I plan to submit more PRs that cover more files, but those cases will need some more complicated (and hence possibly controversial) changes, so I'll try and submit those in reasonably sized batches.
r? rust-lang/wg-mir-opt
…ixups, r=davidtwco
Some "this expression has a field"-related fixes
Each commit does something different and is worth reviewing, but the final diff from `master..HEAD` contains the sum of the changes to the UI tests, since some commits added UI tests "regressions" which were later removed in other commits.
The only change I could see adding on top of this is suppressing `Clone::clone` from the "this expression has a field that has this method" suggestion, since it's so commonly implemented by types that it's not worthwhile suggesting in general.
…gisa
Remove duplicated temporaries creating during box derefs elaboration
Temporaries created with `MirPatch::new_temp` will be declared after
patch application. Remove manually created duplicate declarations.
Removing duplicates exposes another issue. Visitor elaborates
terminator twice and attempts to access new, but not yet available,
local declarations. Remove duplicated call to `visit_terminator`.
Extracted from rust-lang#99946.
Do not manually craft a span pointing inside a multibyte character.
Fixesrust-lang#92462
Set tainted errors bit before emitting coerce suggestions.
Fixesrust-lang#100246.
rust-lang#89576 basically got 99% of the way there but the match typechecking code (which calls `coerce_inner`) also needed a similar fix.
…=Dylan-DPC
Remove more Clean trait implementations
Follow-up of rust-lang#99638.
r? `@Dylan-DPC`
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 9, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 6109582 has been approved by Dylan-DPC

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 9, 2022
@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6109582 with merge 45264e1473c2d548da96f8671539e39009902118...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-stable failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
test [mir-opt] src/test/mir-opt/storage_live_dead_in_statics.rs ... ok
failures:
---- [mir-opt] src/test/mir-opt/instrument_coverage.rs stdout ----
8 let mut _3: !; // in scope 0 at /the/src/instrument_coverage.rs:+2:18: +4:10
10 bb0: {
10 bb0: {
- + Coverage::Counter(1) for /the/src/instrument_coverage.rs:10:1 - 10:11; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
+ + Coverage::Counter(1) for /the/src/instrument_coverage.rs:11:1 - 11:11; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
12 goto -> bb1; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
14 15 bb1: {
15 bb1: {
- + Coverage::Expression(4294967295) = 1 + 2 for /the/src/instrument_coverage.rs:11:5 - 12:17; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
+ + Coverage::Expression(4294967295) = 1 + 2 for /the/src/instrument_coverage.rs:12:5 - 13:17; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
17 falseUnwind -> [real: bb2, cleanup: bb6]; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
19 21 StorageLive(_2); // scope 0 at /the/src/instrument_coverage.rs:+2:12: +2:17
22 _2 = bar() -> [return: bb3, unwind: bb6]; // scope 0 at /the/src/instrument_coverage.rs:+2:12: +2:17
23 // mir::Constant
- // + span: /the/src/instrument_coverage.rs:12:12: 12:15
+ // + span: /the/src/instrument_coverage.rs:13:12: 13:15
25 // + literal: Const { ty: fn() -> bool {bar}, val: Value(<ZST>) }
27 30 }
31 31 32 bb4: {
- + Coverage::Expression(4294967293) = 4294967294 + 0 for /the/src/instrument_coverage.rs:16:1 - 16:2; // scope 0 at /the/src/instrument_coverage.rs:+6:2: +6:2
- + Coverage::Expression(4294967294) = 4294967295 - 2 for /the/src/instrument_coverage.rs:13:13 - 13:18; // scope 0 at /the/src/instrument_coverage.rs:+6:2: +6:2
+ + Coverage::Expression(4294967293) = 4294967294 + 0 for /the/src/instrument_coverage.rs:17:1 - 17:2; // scope 0 at /the/src/instrument_coverage.rs:+6:2: +6:2
+ + Coverage::Expression(4294967294) = 4294967295 - 2 for /the/src/instrument_coverage.rs:14:13 - 14:18; // scope 0 at /the/src/instrument_coverage.rs:+6:2: +6:2
35 _0 = const (); // scope 0 at /the/src/instrument_coverage.rs:+3:13: +3:18
36 StorageDead(_2); // scope 0 at /the/src/instrument_coverage.rs:+4:9: +4:10
37 return; // scope 0 at /the/src/instrument_coverage.rs:+6:2: +6:2
38 }
39 40 bb5: {
40 bb5: {
- + Coverage::Counter(2) for /the/src/instrument_coverage.rs:14:10 - 14:11; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
+ + Coverage::Counter(2) for /the/src/instrument_coverage.rs:15:10 - 15:11; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
42 _1 = const (); // scope 0 at /the/src/instrument_coverage.rs:+4:10: +4:10
43 StorageDead(_2); // scope 0 at /the/src/instrument_coverage.rs:+4:9: +4:10
44 goto -> bb1; // scope 0 at /the/src/instrument_coverage.rs:+1:5: +5:6
thread '[mir-opt] src/test/mir-opt/instrument_coverage.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff', src/tools/compiletest/src/runtest.rs:3513:25
failures:
[mir-opt] src/test/mir-opt/instrument_coverage.rs

@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Aug 9, 2022
@tmiaskotmiasko closed this Aug 9, 2022
@Dylan-DPC
Dylan-DPC deleted the rollup-3lmvi1w branch August 10, 2022 05:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@Dylan-DPC@bors@rust-log-analyzer@rustbot@tmiasko@ChrisDenton@compiler-errors@cjgillot@JakobDegen@GuillaumeGomez@luqmana