Skip to content
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

Rollup of 6 pull requests #95675

Closed
wants to merge 15 commits into from
Closed

Rollup of 6 pull requests #95675

wants to merge 15 commits into from

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddle and others added 15 commits April 4, 2022 12:16
@notriddle
diagnostics: use correct span for const generics
6ece80f 
Fixes rust-lang#95616
@anp
Rely on #[link] attribute for unwind on Fuchsia.
92246c0 
Closes rust-lang#95575.
@yaahc
Update panic docs to make it clearer when to use panic vs Result
ccb704c
@ohno418
Suggest derivable trait on E0277
0d2a000
@ohno418
Suggest only when Rhs for PartialEq and PartialOrd is the same type a…
0ff2f58 
…s self
@ohno418
Suggest only when all fields impl the trait
de23782
@ohno418
Fix ui test for nll
b831b60
@TaKO8Ki
remove unused function parameters
9759804
@lnicola
⬆️ rust-analyzer
505573e
@Dylan-DPC
Rollup merge of rust-lang#95525 - ohno418:suggest-derivable-trait-E02…
e028d93 
…77, r=compiler-errors

Suggest derivable trait on E0277 error

Closes rust-lang#95099 .
@Dylan-DPC
Rollup merge of rust-lang#95654 - notriddle:notriddle/issue-95616, r=…
33b0fba 
…davidtwco

diagnostics: use correct span for const generics

Fixes rust-lang#95616
@Dylan-DPC
Rollup merge of rust-lang#95659 - anp:remove-link-print, r=tmandry
cd7543f 
Rely on #[link] attribute for unwind on Fuchsia.

Closes rust-lang#95575.
@Dylan-DPC
Rollup merge of rust-lang#95660 - yaahc:panic-docs-update, r=Dylan-DPC
0826ef7 
Update panic docs to make it clearer when to use panic vs Result

This is based on a question that came up in one of my [error handling office hours](https://twitter.com/yaahc_/status/1506376624509374467?s=20&t=Sp-cEjrx5kpMdNsAGPOo9w) meetings. I had a user who was fairly familiar with error type design, thiserror and anyhow, and rust in general, but who was still confused about when to use panics vs when to use Result and `Error`.

This will also be cross referenced in an error handling FAQ that I will be creating in the https://github.com/rust-lang/project-error-handling repo shortly.
@Dylan-DPC
Rollup merge of rust-lang#95670 - TaKO8Ki:remove-unused-function-para…
9711e9d 
…meters, r=davidtwco

Refactor: remove unused function parameters
@Dylan-DPC
Rollup merge of rust-lang#95673 - lnicola:rust-analyzer-2022-04-05, r…
73a8f95 
…=lnicola

⬆️ rust-analyzer

r? `@ghost`
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 5, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 5, 2022

📌 Commit 73a8f95 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 5, 2022
@bors
Copy link
Contributor

bors commented Apr 5, 2022

⌛ Testing commit 73a8f95 with merge 8537ba5b8c32aa1c136e3b9fc3a73637640cf6d3...

@bors
Copy link
Contributor

bors commented Apr 5, 2022

💔 Test failed - checks-actions

@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 5, 2022
@rust-log-analyzer
Copy link
Collaborator

The job wasm32 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 

---- [ui] ui/invalid/invalid-llvm-passes.rs stdout ----
diff of stderr:

1 error: failed to run LLVM passes: unknown pass name 'unknown-pass'
+ thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
+   left: `LLVMing`,
+   left: `LLVMing`,
+  right: `Codegenning`', /checkout/compiler/rustc_codegen_ssa/src/back/write.rs:1471:21
+    0:     0x7f3d7fce478d - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h59ae1a7b22004c8c
+    0:     0x7f3d7fce478d - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h59ae1a7b22004c8c
+    1:     0x7f3d7fd47a38 - core::fmt::write::ha7e7cf912fe9539a
+    2:     0x7f3d7fcd5711 - std::io::Write::write_fmt::h5510ee268d07df7b
+    3:     0x7f3d7fce45ab - std::sys_common::backtrace::print::h08bb60edf9be83f1
+    4:     0x7f3d7fce7f24 - std::panicking::default_hook::{{closure}}::h3ffc2d123ec2b8d5
+    5:     0x7f3d7fce7b9c - std::panicking::default_hook::h2e979a8c86f0f0bf
+    6:     0x7f3d80e65a1a - rustc_driver[68b56281aac6e522]::DEFAULT_HOOK::{closure#0}::{closure#0}
+    7:     0x7f3d7fce85fa - std::panicking::rust_panic_with_hook::h6d85312f2998bd9b
+    8:     0x7f3d7fce8427 - std::panicking::begin_panic_handler::{{closure}}::h656f29de7596b1f2
+    9:     0x7f3d7fce4cc4 - std::sys_common::backtrace::__rust_end_short_backtrace::hd163467b5b5c7a90
+   10:     0x7f3d7fce8119 - rust_begin_unwind
+   11:     0x7f3d7fc9cbb3 - core::panicking::panic_fmt::hb65d42c9d8beea97
+   12:     0x7f3d7fd444e8 - core::panicking::assert_failed_inner::hb5765767a3717cf6
+   13:     0x7f3d809d85fb - core[7aa401e17aad33d1]::panicking::assert_failed::<rustc_codegen_ssa[9a695caeb5983c6]::back::write::MainThreadWorkerState, rustc_codegen_ssa[9a695caeb5983c6]::back::write::MainThreadWorkerState>
+   14:     0x7f3d8105f7db - rustc_codegen_ssa[9a695caeb5983c6]::back::write::start_executing_work::<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend>::{closure#4}
+   15:     0x7f3d8105adc6 - std[a46efefb3fd5620c]::sys_common::backtrace::__rust_begin_short_backtrace::<<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend as rustc_codegen_ssa[9a695caeb5983c6]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[9a695caeb5983c6]::back::write::start_executing_work<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend>::{closure#4}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>::{closure#0}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>
+   16:     0x7f3d811d3749 - <<std[a46efefb3fd5620c]::thread::Builder>::spawn_unchecked_<<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend as rustc_codegen_ssa[9a695caeb5983c6]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[9a695caeb5983c6]::back::write::start_executing_work<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend>::{closure#4}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>::{closure#0}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>::{closure#1} as core[7aa401e17aad33d1]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
+   17:     0x7f3d7fcf4503 - std::sys::unix::thread::Thread::new::thread_start::h0e3ab9d360f09880
+   18:     0x7f3d7fa1c609 - start_thread
+   19:     0x7f3d7fb5c163 - clone
+   20:                0x0 - <unknown>
+ error: internal compiler error: unexpected panic
+ 
+ note: the compiler unexpectedly panicked. this is a bug.
+ 
+ 
+ note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md
+ 
+ note: rustc 1.62.0-nightly (8537ba5b8 2022-04-05) running on x86_64-unknown-linux-gnu
+ 
+ note: compiler flags: -Z threads=1 -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -C prefer-dynamic -C rpath -C debuginfo=0 -C passes=unknown-pass -Z new-llvm-pass-manager=yes
+ query stack during panic:
+ end of query stack
3 error: aborting due to previous error
4 
---
To only update this specific test, also pass `--test-args invalid/invalid-llvm-passes.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/invalid/invalid-llvm-passes.rs" "-Zthreads=1" "--target=wasm32-unknown-emscripten" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/invalid/invalid-llvm-passes" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-unknown-emscripten/native/rust-test-helpers" "-Cpasses=unknown-pass" "-Z" "new-llvm-pass-manager=yes" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/invalid/invalid-llvm-passes/auxiliary"
stdout: none
--- stderr -------------------------------
error: failed to run LLVM passes: unknown pass name 'unknown-pass'
thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
  left: `LLVMing`,
  left: `LLVMing`,
 right: `Codegenning`', /checkout/compiler/rustc_codegen_ssa/src/back/write.rs:1471:21
   0:     0x7f3d7fce478d - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h59ae1a7b22004c8c
   0:     0x7f3d7fce478d - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h59ae1a7b22004c8c
   1:     0x7f3d7fd47a38 - core::fmt::write::ha7e7cf912fe9539a
   2:     0x7f3d7fcd5711 - std::io::Write::write_fmt::h5510ee268d07df7b
   3:     0x7f3d7fce45ab - std::sys_common::backtrace::print::h08bb60edf9be83f1
   4:     0x7f3d7fce7f24 - std::panicking::default_hook::{{closure}}::h3ffc2d123ec2b8d5
   5:     0x7f3d7fce7b9c - std::panicking::default_hook::h2e979a8c86f0f0bf
   6:     0x7f3d80e65a1a - rustc_driver[68b56281aac6e522]::DEFAULT_HOOK::{closure#0}::{closure#0}
   7:     0x7f3d7fce85fa - std::panicking::rust_panic_with_hook::h6d85312f2998bd9b
   8:     0x7f3d7fce8427 - std::panicking::begin_panic_handler::{{closure}}::h656f29de7596b1f2
   9:     0x7f3d7fce4cc4 - std::sys_common::backtrace::__rust_end_short_backtrace::hd163467b5b5c7a90
  10:     0x7f3d7fce8119 - rust_begin_unwind
  11:     0x7f3d7fc9cbb3 - core::panicking::panic_fmt::hb65d42c9d8beea97
  12:     0x7f3d7fd444e8 - core::panicking::assert_failed_inner::hb5765767a3717cf6
  13:     0x7f3d809d85fb - core[7aa401e17aad33d1]::panicking::assert_failed::<rustc_codegen_ssa[9a695caeb5983c6]::back::write::MainThreadWorkerState, rustc_codegen_ssa[9a695caeb5983c6]::back::write::MainThreadWorkerState>
  14:     0x7f3d8105f7db - rustc_codegen_ssa[9a695caeb5983c6]::back::write::start_executing_work::<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend>::{closure#4}
  15:     0x7f3d8105adc6 - std[a46efefb3fd5620c]::sys_common::backtrace::__rust_begin_short_backtrace::<<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend as rustc_codegen_ssa[9a695caeb5983c6]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[9a695caeb5983c6]::back::write::start_executing_work<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend>::{closure#4}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>::{closure#0}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>
  16:     0x7f3d811d3749 - <<std[a46efefb3fd5620c]::thread::Builder>::spawn_unchecked_<<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend as rustc_codegen_ssa[9a695caeb5983c6]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[9a695caeb5983c6]::back::write::start_executing_work<rustc_codegen_llvm[36f3397ee907c4b6]::LlvmCodegenBackend>::{closure#4}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>::{closure#0}, core[7aa401e17aad33d1]::result::Result<rustc_codegen_ssa[9a695caeb5983c6]::back::write::CompiledModules, ()>>::{closure#1} as core[7aa401e17aad33d1]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  17:     0x7f3d7fcf4503 - std::sys::unix::thread::Thread::new::thread_start::h0e3ab9d360f09880
  18:     0x7f3d7fa1c609 - start_thread
  19:     0x7f3d7fb5c163 - clone
  20:                0x0 - <unknown>
error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.


note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

note: rustc 1.62.0-nightly (8537ba5b8 2022-04-05) running on x86_64-unknown-linux-gnu

note: compiler flags: -Z threads=1 -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -C prefer-dynamic -C rpath -C debuginfo=0 -C passes=unknown-pass -Z new-llvm-pass-manager=yes
query stack during panic:
end of query stack
error: aborting due to previous error
------------------------------------------

@Dylan-DPC Dylan-DPC mentioned this pull request Apr 5, 2022
Open
@Dylan-DPC Dylan-DPC closed this Apr 6, 2022
@Dylan-DPC Dylan-DPC deleted the rollup-3fbqotx branch April 6, 2022 01:29
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
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@Dylan-DPC @bors @rust-log-analyzer @rustbot @notriddle @anp @yaahc @ohno418 @TaKO8Ki @lnicola