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.

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

Rollup of 6 pull requests #113666

Closed
wants to merge 17 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

oli-obk and others added 17 commits July 10, 2023 12:22
On RustyHermit, the function `get_processor_count` returns the
number of activated processors.
It's exported publicly, so it should not be linted.
0.3.0 and 0.3.1 have an issue and will be yanked. Consequently, std
should switch to 0.3.2.
…rd-off switch

If someone says `x test rustdoc-js-std` explicitly on the command line, it's because they want to
run the tests. Give an error instead of doing nothing and reporting success.
Adjustments for RustyHermit

The interface between `libstd` and the OS changed and some changes are not correctly merged for RustHermit. For instance, the crate `hermit_abi` isn't defined as public, although it provided the socket interface for the application.

In addition, the support of thread::available_parallelism is realized. It returns the number of available processors.
…gestion, r=b-naber

Add machine-applicable suggestion for `unused_qualifications` lint

```
error: unnecessary qualification
  --> $DIR/unused-qualifications-suggestion.rs:17:5
   |
LL |     foo::bar();
   |     ^^^^^^^^
   |
note: the lint level is defined here
  --> $DIR/unused-qualifications-suggestion.rs:3:9
   |
LL | #![deny(unused_qualifications)]
   |         ^^^^^^^^^^^^^^^^^^^^^
help: replace it with the unqualified path
   |
LL |     bar();
   |     ~~~
```

Closes rust-lang#92198.
…wesleywiser

Permit pre-evaluated constants in simd_shuffle

fixes rust-lang#113500
…oli-obk

Add more ty conversions to smir

add str, slice, and array to smir types

r? ``@spastorino``
…eGomez

Make `nodejs` control the default for RustdocJs tests instead of a hard-off switch

If someone says `x test rustdoc-js-std` explicitly on the command line, it's because they want to run the tests. Give an error instead of doing nothing and reporting success.

Before:
```
; x t rustdoc-js
No nodejs found, skipping "tests/rustdoc-js" tests
Build completed successfully in 0:00:00
```

After:
```
; x t rustdoc-js
thread 'main' panicked at 'need nodejs to run js-doc-test suite', test.rs:1566:13
Build completed unsuccessfully in 0:00:00
```

I recommend viewing the diff with whitespace changes disabled.

r? ``@GuillaumeGomez``
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 13, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jul 13, 2023

📌 Commit 111309f has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2023
@bors
Copy link
Contributor

bors commented Jul 13, 2023

⌛ Testing commit 111309f with merge 421d81f3955d985ae09562dc65a843d9a6a8a557...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] tests/ui/simd/shuffle.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 101
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/simd/shuffle.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/simd/shuffle/a" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/simd/shuffle/auxiliary"
stdout: none
--- stderr -------------------------------
##[error]error: internal compiler error: /checkout/compiler/rustc_codegen_ssa/src/mir/constant.rs:74:26: IDX/#0
  --> fake-test-src-base/simd/shuffle.rs:16:26
   |
LL |     simd_shuffle16(x, y, IDX)

thread 'rustc' panicked at 'Box<dyn Any>', /checkout/compiler/rustc_errors/src/lib.rs:995:33
stack backtrace:
   0:     0x7f6c45e1b831 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h3016949859ff52e9
   0:     0x7f6c45e1b831 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h3016949859ff52e9
   1:     0x7f6c45e882a8 - core::fmt::write::h6097e47d19ad78a3
   2:     0x7f6c45e0fa81 - std::io::Write::write_fmt::he0f5346dc4b3ecf0
   3:     0x7f6c45e1b645 - std::sys_common::backtrace::print::h14487d5700c7550c
   4:     0x7f6c45e1e6fa - std::panicking::default_hook::{{closure}}::h0f3c05f5787a4212
   5:     0x7f6c45e1e456 - std::panicking::default_hook::h181fd7c96f05ebd0
   6:     0x7f6c46a45aab - rustc_driver_impl[6b2c37ae85966272]::install_ice_hook::{closure#0}
   7:     0x7f6c45e1ee08 - std::panicking::rust_panic_with_hook::hd4a339fab7f1d5c1
   8:     0x7f6c46ded7a3 - std[248b060e15c0a50d]::panicking::begin_panic::<rustc_errors[8258c0ad71fcc611]::ExplicitBug>::{closure#0}
   9:     0x7f6c46de4476 - std[248b060e15c0a50d]::sys_common::backtrace::__rust_end_short_backtrace::<std[248b060e15c0a50d]::panicking::begin_panic<rustc_errors[8258c0ad71fcc611]::ExplicitBug>::{closure#0}, !>
  10:     0x7f6c466dde36 - std[248b060e15c0a50d]::panicking::begin_panic::<rustc_errors[8258c0ad71fcc611]::ExplicitBug>
  11:     0x7f6c46d272b5 - <rustc_errors[8258c0ad71fcc611]::HandlerInner>::span_bug::<rustc_span[5296a713300187]::span_encoding::Span, alloc[e94c4731714164c1]::string::String>
  12:     0x7f6c46d26ee8 - <rustc_errors[8258c0ad71fcc611]::Handler>::span_bug::<rustc_span[5296a713300187]::span_encoding::Span, alloc[e94c4731714164c1]::string::String>
  13:     0x7f6c46d99088 - rustc_middle[676e8abee22e67c1]::util::bug::opt_span_bug_fmt::<rustc_span[5296a713300187]::span_encoding::Span>::{closure#0}
  14:     0x7f6c46d990dc - rustc_middle[676e8abee22e67c1]::ty::context::tls::with_opt::<rustc_middle[676e8abee22e67c1]::util::bug::opt_span_bug_fmt<rustc_span[5296a713300187]::span_encoding::Span>::{closure#0}, !>::{closure#0}
  15:     0x7f6c46d97444 - rustc_middle[676e8abee22e67c1]::ty::context::tls::with_context_opt::<rustc_middle[676e8abee22e67c1]::ty::context::tls::with_opt<rustc_middle[676e8abee22e67c1]::util::bug::opt_span_bug_fmt<rustc_span[5296a713300187]::span_encoding::Span>::{closure#0}, !>::{closure#0}, !>
  16:     0x7f6c466d6da7 - rustc_middle[676e8abee22e67c1]::util::bug::span_bug_fmt::<rustc_span[5296a713300187]::span_encoding::Span>
  17:     0x7f6c46eae85b - <rustc_codegen_ssa[82a29d9ee259bef1]::mir::FunctionCx<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>>::simd_shuffle_indices
  18:     0x7f6c46de74ab - <core[78783cff635e5067]::iter::adapters::map::Map<core[78783cff635e5067]::iter::adapters::enumerate::Enumerate<core[78783cff635e5067]::slice::iter::Iter<rustc_middle[676e8abee22e67c1]::mir::syntax::Operand>>, <rustc_codegen_ssa[82a29d9ee259bef1]::mir::FunctionCx<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>>::codegen_call_terminator::{closure#2}> as core[78783cff635e5067]::iter::traits::iterator::Iterator>::fold::<(), core[78783cff635e5067]::iter::traits::iterator::Iterator::for_each::call<rustc_codegen_ssa[82a29d9ee259bef1]::mir::operand::OperandRef<&rustc_codegen_llvm[7555e13e33d81bd4]::llvm_::ffi::Value>, <alloc[e94c4731714164c1]::vec::Vec<rustc_codegen_ssa[82a29d9ee259bef1]::mir::operand::OperandRef<&rustc_codegen_llvm[7555e13e33d81bd4]::llvm_::ffi::Value>>>::extend_trusted<core[78783cff635e5067]::iter::adapters::map::Map<core[78783cff635e5067]::iter::adapters::enumerate::Enumerate<core[78783cff635e5067]::slice::iter::Iter<rustc_middle[676e8abee22e67c1]::mir::syntax::Operand>>, <rustc_codegen_ssa[82a29d9ee259bef1]::mir::FunctionCx<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>>::codegen_call_terminator::{closure#2}>>::{closure#0}>::{closure#0}>
  19:     0x7f6c46e06714 - <alloc[e94c4731714164c1]::vec::Vec<rustc_codegen_ssa[82a29d9ee259bef1]::mir::operand::OperandRef<&rustc_codegen_llvm[7555e13e33d81bd4]::llvm_::ffi::Value>> as alloc[e94c4731714164c1]::vec::spec_from_iter::SpecFromIter<rustc_codegen_ssa[82a29d9ee259bef1]::mir::operand::OperandRef<&rustc_codegen_llvm[7555e13e33d81bd4]::llvm_::ffi::Value>, core[78783cff635e5067]::iter::adapters::map::Map<core[78783cff635e5067]::iter::adapters::enumerate::Enumerate<core[78783cff635e5067]::slice::iter::Iter<rustc_middle[676e8abee22e67c1]::mir::syntax::Operand>>, <rustc_codegen_ssa[82a29d9ee259bef1]::mir::FunctionCx<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>>::codegen_call_terminator::{closure#2}>>>::from_iter
  20:     0x7f6c46eb61ec - <rustc_codegen_ssa[82a29d9ee259bef1]::mir::FunctionCx<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>>::codegen_terminator
  21:     0x7f6c46e9d222 - rustc_codegen_ssa[82a29d9ee259bef1]::mir::codegen_mir::<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>
  22:     0x7f6c46ea14e2 - rustc_codegen_ssa[82a29d9ee259bef1]::base::codegen_instance::<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>
  23:     0x7f6c46dda283 - <rustc_middle[676e8abee22e67c1]::mir::mono::MonoItem as rustc_codegen_ssa[82a29d9ee259bef1]::mono_item::MonoItemExt>::define::<rustc_codegen_llvm[7555e13e33d81bd4]::builder::Builder>
  24:     0x7f6c46e72161 - rustc_codegen_llvm[7555e13e33d81bd4]::base::compile_codegen_unit::module_codegen
  25:     0x7f6c46e70eee - rustc_codegen_llvm[7555e13e33d81bd4]::base::compile_codegen_unit
  26:     0x7f6c46ea0966 - rustc_codegen_ssa[82a29d9ee259bef1]::base::codegen_crate::<rustc_codegen_llvm[7555e13e33d81bd4]::LlvmCodegenBackend>
  27:     0x7f6c46d22b3c - <rustc_codegen_llvm[7555e13e33d81bd4]::LlvmCodegenBackend as rustc_codegen_ssa[82a29d9ee259bef1]::traits::backend::CodegenBackend>::codegen_crate
  28:     0x7f6c46c68723 - <rustc_session[d0a4a6ca467b8b0]::session::Session>::time::<alloc[e94c4731714164c1]::boxed::Box<dyn core[78783cff635e5067]::any::Any>, rustc_interface[f799a641a2d4da4a]::passes::start_codegen::{closure#0}>
  29:     0x7f6c46c27bba - rustc_interface[f799a641a2d4da4a]::passes::start_codegen
  30:     0x7f6c46c8b6e1 - <rustc_middle[676e8abee22e67c1]::ty::context::GlobalCtxt>::enter::<<rustc_interface[f799a641a2d4da4a]::queries::Queries>::ongoing_codegen::{closure#0}, core[78783cff635e5067]::result::Result<alloc[e94c4731714164c1]::boxed::Box<dyn core[78783cff635e5067]::any::Any>, rustc_span[5296a713300187]::ErrorGuaranteed>>
  31:     0x7f6c46c669c6 - <rustc_interface[f799a641a2d4da4a]::queries::Queries>::ongoing_codegen
  32:     0x7f6c46abb00e - <rustc_interface[f799a641a2d4da4a]::interface::Compiler>::enter::<rustc_driver_impl[6b2c37ae85966272]::run_compiler::{closure#1}::{closure#2}, core[78783cff635e5067]::result::Result<core[78783cff635e5067]::option::Option<rustc_interface[f799a641a2d4da4a]::queries::Linker>, rustc_span[5296a713300187]::ErrorGuaranteed>>
Build completed unsuccessfully in 0:30:56
  33:     0x7f6c46a5050b - rustc_span[5296a713300187]::set_source_map::<core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>, rustc_interface[f799a641a2d4da4a]::interface::run_compiler<core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>, rustc_driver_impl[6b2c37ae85966272]::run_compiler::{closure#1}>::{closure#0}::{closure#0}>
  34:     0x7f6c46a6fc7f - <scoped_tls[266614ace1b16b33]::ScopedKey<rustc_span[5296a713300187]::SessionGlobals>>::set::<rustc_interface[f799a641a2d4da4a]::interface::run_compiler<core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>, rustc_driver_impl[6b2c37ae85966272]::run_compiler::{closure#1}>::{closure#0}, core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>>
  35:     0x7f6c46a4ac89 - std[248b060e15c0a50d]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[f799a641a2d4da4a]::util::run_in_thread_pool_with_globals<rustc_interface[f799a641a2d4da4a]::interface::run_compiler<core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>, rustc_driver_impl[6b2c37ae85966272]::run_compiler::{closure#1}>::{closure#0}, core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>>
  36:     0x7f6c46aa92c5 - <<std[248b060e15c0a50d]::thread::Builder>::spawn_unchecked_<rustc_interface[f799a641a2d4da4a]::util::run_in_thread_pool_with_globals<rustc_interface[f799a641a2d4da4a]::interface::run_compiler<core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>, rustc_driver_impl[6b2c37ae85966272]::run_compiler::{closure#1}>::{closure#0}, core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[78783cff635e5067]::result::Result<(), rustc_span[5296a713300187]::ErrorGuaranteed>>::{closure#1} as core[78783cff635e5067]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  38:     0x7f6c3ac75609 - start_thread
  39:     0x7f6c45c88133 - clone
  40:                0x0 - <unknown>


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.73.0-nightly (421d81f39 2023-07-13) running on x86_64-unknown-linux-gnu

note: compiler flags: -Z threads=1 -Z simulate-remapped-rust-src-base=/rustc/FAKE_PREFIX -Z translate-remapped-path-to-local-path=no -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -C strip=debuginfo -C prefer-dynamic -C rpath -C debuginfo=0
query stack during panic:
end of query stack
error: aborting due to previous error
------------------------------------------

@bors
Copy link
Contributor

bors commented Jul 13, 2023

💔 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 Jul 13, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-vwh9hj2 branch March 16, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants