Skip to content

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cbeuw and others added 30 commits June 22, 2023 18:48
Setting `RUSTC_LOG_COLOR=always` is sometimes useful if tools that one
pipes `RUSTC_LOG` into support coloured output, but it makes this test
fail.

Signed-off-by: David Wood <[email protected]>
Currently, this won't change anything, because we only have one relevant workflow (`CI`), but for future proofing we should probably include the workflow name in the concurrency group.
Enable zlib in LLVM on aarch64-apple-darwin

Works on macOS 13.4, Xcode version 14.3.1.0.1.1683849156

This was disabled in rust-lang#75500 on Apple Silicon Developer Transition Kit, but Apple appears to have fixed their zlib now
…-test, r=wesleywiser

tests: unset `RUSTC_LOG_COLOR` in a test

Setting `RUSTC_LOG_COLOR=always` is sometimes useful if tools that one pipes `RUSTC_LOG` into support coloured output, but it makes this test fail because it has a `.stderr` file with `WARN` log output.
…ow, r=pietroalbini

CI: include workflow name in concurrency group

Currently, this won't change anything, because we only have one relevant workflow (`CI`), but for future proofing we should probably include the workflow name in the concurrency group.

Found by `@klensy` [here](rust-lang#113059 (comment)).
…new-solver, r=lcnr

Reveal opaques in new solver

We were testing against the wrong reveal mode 😨

Also a couple of misc commits that I don't want to really put in separate prs

r? ````@lcnr````
…ath, r=notriddle,fmease

[rustdoc] If re-export is private, get the next item until a public one is found or expose the private item directly

Fixes rust-lang#81141.

If we have:

```rust
use Private as Something;

pub fn foo() -> Something {}
```

Then `Something` will be replaced by `Private`.

r? `````@notriddle`````
CGU formation tweaks

Minor improvements I found while trying out something bigger that didn't work out.

r? ``@wesleywiser``
…at-again, r=oli-obk

Structurally normalize again for byte string lit pat checking

We need to structurally normalize the pointee of a match scrutinee when trying to match byte string patterns -- we used[^1] to call `structurally_resolve_type`, which errors for type vars[^2], but lcnr added `try_structurally_resolve_type`[^3] in the mean time, which is the right thing to use here since it's totally opportunistic.

Fixes rust-lang/trait-system-refactor-initiative#38

[^1]: rust-lang#112428
[^2]: rust-lang#112993
[^3]: rust-lang#113086
Add basic types to SMIR

Still incomplete but I think this can be merged and we can keep iterating over it.

r? `@oli-obk`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 8, 2023
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Jul 8, 2023

📌 Commit ed2cc0d has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot added the rollup A PR which is a rollup label Jul 8, 2023
@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 8, 2023
@bors
Copy link
Collaborator

bors commented Jul 8, 2023

⌛ Testing commit ed2cc0d with merge 38e426245875179acf3ff7fc7fa796a67d55be06...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
 Documenting rustc_mir_dataflow v0.0.0 (/checkout/compiler/rustc_mir_dataflow)
 Documenting rustc_symbol_mangling v0.0.0 (/checkout/compiler/rustc_symbol_mangling)
[RUSTC-TIMING] syn test:false 6.894
    Checking synstructure v0.13.0
thread 'rustc' panicked at 'assertion failed: cx.impl_trait_bounds.is_empty()', src/librustdoc/clean/utils.rs:542:5
   0:     0xffff8e69bc58 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h043f9c49d69b3b7b
   1:     0xffff8e702728 - core::fmt::write::h4d3729e109f082c0
   2:     0xffff8e69110c - std::io::Write::write_fmt::h722e3ff15bf851e6
   3:     0xffff8e69baa8 - std::sys_common::backtrace::print::h0b7dc328cf752d38
---
   8:     0xffff8e69ef38 - std::panicking::begin_panic_handler::{{closure}}::h7a65025d6dca3eb5
   9:     0xffff8e69c0d4 - std::sys_common::backtrace::__rust_end_short_backtrace::hb4fc54926591992a
  10:     0xffff8e69ecac - rust_begin_unwind
  11:     0xffff8e661020 - core::panicking::panic_fmt::h6efc38ada4e859c5
  12:     0xffff8e661090 - core::panicking::panic::h631eda67b0e0868d
  13:     0xaaaacde9a45c - rustdoc[cee7d35d2579894]::clean::utils::enter_impl_trait::<rustdoc[cee7d35d2579894]::clean::clean_function::{closure#0}, (rustdoc[cee7d35d2579894]::clean::types::Generics, rustdoc[cee7d35d2579894]::clean::types::FnDecl)>
  14:     0xaaaace0e9c3c - rustdoc[cee7d35d2579894]::clean::clean_fn_or_proc_macro
  15:     0xaaaacdf80d14 - <rustdoc[cee7d35d2579894]::core::DocContext>::with_param_env::<alloc[85221a7b03f224e]::vec::Vec<rustdoc[cee7d35d2579894]::clean::types::Item>, rustdoc[cee7d35d2579894]::clean::clean_maybe_renamed_item::{closure#1}>
  16:     0xaaaace0ddbb4 - <&mut rustdoc[cee7d35d2579894]::clean::clean_doc_module::{closure#2} as core[d758616c3f7f893e]::ops::function::FnOnce<(&(&rustc_hir[145fcbb52b7aa5e3]::hir::Item, core[d758616c3f7f893e]::option::Option<rustc_span[100a7a950175ac67]::symbol::Symbol>, core[d758616c3f7f893e]::option::Option<rustc_span[100a7a950175ac67]::def_id::LocalDefId>),)>>::call_once
  17:     0xaaaacdfcd7f8 - <alloc[85221a7b03f224e]::vec::Vec<rustdoc[cee7d35d2579894]::clean::types::Item> as alloc[85221a7b03f224e]::vec::spec_extend::SpecExtend<rustdoc[cee7d35d2579894]::clean::types::Item, core[d758616c3f7f893e]::iter::adapters::flatten::FlatMap<indexmap[dd9dc23015fc4d93]::map::iter::Values<(rustc_span[100a7a950175ac67]::def_id::LocalDefId, core[d758616c3f7f893e]::option::Option<rustc_span[100a7a950175ac67]::symbol::Symbol>), (&rustc_hir[145fcbb52b7aa5e3]::hir::Item, core[d758616c3f7f893e]::option::Option<rustc_span[100a7a950175ac67]::symbol::Symbol>, core[d758616c3f7f893e]::option::Option<rustc_span[100a7a950175ac67]::def_id::LocalDefId>)>, alloc[85221a7b03f224e]::vec::Vec<rustdoc[cee7d35d2579894]::clean::types::Item>, rustdoc[cee7d35d2579894]::clean::clean_doc_module::{closure#2}>>>::spec_extend
  18:     0xaaaace0e3c1c - rustdoc[cee7d35d2579894]::clean::clean_doc_module
  19:     0xaaaace0dd024 - <&mut rustdoc[cee7d35d2579894]::clean::clean_doc_module::{closure#1} as core[d758616c3f7f893e]::ops::function::FnMut<(&rustdoc[cee7d35d2579894]::visit_ast::Module,)>>::call_mut
  20:     0xaaaacdfccd60 - <alloc[85221a7b03f224e]::vec::Vec<rustdoc[cee7d35d2579894]::clean::types::Item> as alloc[85221a7b03f224e]::vec::spec_extend::SpecExtend<rustdoc[cee7d35d2579894]::clean::types::Item, core[d758616c3f7f893e]::iter::adapters::filter_map::FilterMap<core[d758616c3f7f893e]::slice::iter::Iter<rustdoc[cee7d35d2579894]::visit_ast::Module>, rustdoc[cee7d35d2579894]::clean::clean_doc_module::{closure#1}>>>::spec_extend
  21:     0xaaaace0e3bdc - rustdoc[cee7d35d2579894]::clean::clean_doc_module
  22:     0xaaaacde96be8 - rustdoc[cee7d35d2579894]::clean::utils::krate
  23:     0xaaaacdf85e84 - <rustc_session[f5b48b6e983d49dc]::session::Session>::time::<rustdoc[cee7d35d2579894]::clean::types::Crate, rustdoc[cee7d35d2579894]::core::run_global_ctxt::{closure#5}>
  24:     0xaaaacdf83e4c - rustdoc[cee7d35d2579894]::core::run_global_ctxt
  25:     0xaaaacdf86380 - <rustc_session[f5b48b6e983d49dc]::session::Session>::time::<(rustdoc[cee7d35d2579894]::clean::types::Crate, rustdoc[cee7d35d2579894]::config::RenderOptions, rustdoc[cee7d35d2579894]::formats::cache::Cache), rustdoc[cee7d35d2579894]::main_args::{closure#1}::{closure#0}::{closure#0}::{closure#0}>
  26:     0xaaaace0743dc - <rustc_middle[3baf37820cc1e5c3]::ty::context::GlobalCtxt>::enter::<rustdoc[cee7d35d2579894]::main_args::{closure#1}::{closure#0}::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>
  27:     0xaaaace101ad0 - <rustc_interface[d78327aa89a77314]::interface::Compiler>::enter::<rustdoc[cee7d35d2579894]::main_args::{closure#1}::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>
  28:     0xaaaace06b4a8 - rustc_span[100a7a950175ac67]::set_source_map::<core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>, rustc_interface[d78327aa89a77314]::interface::run_compiler<core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>, rustdoc[cee7d35d2579894]::main_args::{closure#1}>::{closure#0}::{closure#0}>
  29:     0xaaaacdf2da3c - <scoped_tls[1f0bb54b56179846]::ScopedKey<rustc_span[100a7a950175ac67]::SessionGlobals>>::set::<rustc_interface[d78327aa89a77314]::interface::run_compiler<core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>, rustdoc[cee7d35d2579894]::main_args::{closure#1}>::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>
  30:     0xaaaacde47138 - std[6fad934f06c0dd0d]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[d78327aa89a77314]::util::run_in_thread_pool_with_globals<rustc_interface[d78327aa89a77314]::interface::run_compiler<core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>, rustdoc[cee7d35d2579894]::main_args::{closure#1}>::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>
  31:     0xaaaace0d7080 - <<std[6fad934f06c0dd0d]::thread::Builder>::spawn_unchecked_<rustc_interface[d78327aa89a77314]::util::run_in_thread_pool_with_globals<rustc_interface[d78327aa89a77314]::interface::run_compiler<core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>, rustdoc[cee7d35d2579894]::main_args::{closure#1}>::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[d758616c3f7f893e]::result::Result<(), rustc_span[100a7a950175ac67]::ErrorGuaranteed>>::{closure#1} as core[d758616c3f7f893e]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  33:     0xffff8e5bd624 - start_thread
  34:     0xffff8e4f049c - <unknown>
  35:                0x0 - <unknown>


error: 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-rustdoc&template=ice.md
note: rustc 1.72.0-nightly (38e426245 2023-07-08) running on aarch64-unknown-linux-gnu


note: compiler flags: --crate-type lib -Z unstable-options -Z unstable-options -C symbol-mangling-version=v0 -Z unstable-options -Z unstable-options -Z normalize-docs -Z crate-attr=warn(rust_2018_idioms) -Z force-unstable-if-unmarked -Z unstable-options
note: some of the compiler flags provided by cargo are hidden

query stack during panic:
end of query stack
end of query stack
error: could not document `rustc_trait_selection`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2021 --crate-type lib --crate-name rustc_trait_selection compiler/rustc_trait_selection/src/lib.rs --target aarch64-unknown-linux-gnu -o /checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/doc -Zunstable-options --check-cfg 'values(feature)' --check-cfg 'names()' --check-cfg 'values()' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=8bccfe947f9f451a -L dependency=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/release/deps --extern rustc_ast=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_ast-1fe5b9dff7892db6.rmeta --extern rustc_attr=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_attr-c93714f0ddf1f583.rmeta --extern rustc_data_structures=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_data_structures-0d38ca45af74e47f.rmeta --extern rustc_errors=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_errors-102f5d9462136939.rmeta --extern rustc_fluent_macro=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/release/deps/librustc_fluent_macro-5ece8e1e21b27d23.so --extern rustc_hir=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_hir-6ea37a2f796d358c.rmeta --extern rustc_index=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_index-9f93f14d714390fb.rmeta --extern rustc_infer=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_infer-1dda0cff8cd8cf3b.rmeta --extern rustc_macros=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/release/deps/librustc_macros-464628d5e62c04e5.so --extern rustc_middle=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_middle-d7c307a0627f7a45.rmeta --extern rustc_parse_format=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_parse_format-62d916763103297c.rmeta --extern rustc_query_system=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_query_system-5623a3d5db13716f.rmeta --extern rustc_serialize=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_serialize-b3c8cf6764c871d4.rmeta --extern rustc_session=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_session-784411df3069ffc6.rmeta --extern rustc_span=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_span-72e6a929d7eccbf5.rmeta --extern rustc_target=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_target-127006d95a761834.rmeta --extern rustc_transmute=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/librustc_transmute-746ca4d542ad897a.rmeta --extern smallvec=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/libsmallvec-ed8b7cc5df53142c.rmeta --extern tracing=/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-rustc/aarch64-unknown-linux-gnu/release/deps/libtracing-1e48c348890d7c9e.rmeta --extern-html-root-url 'smallvec=https://docs.rs/smallvec/1.10.0/' --extern-html-root-url 'tracing=https://docs.rs/tracing/0.1.37/' -Zunstable-options --cfg=windows_raw_dylib -Csymbol-mangling-version=v0 -Zunstable-options '--check-cfg=values(bootstrap)' '--check-cfg=values(parallel_compiler)' '--check-cfg=values(no_btreemap_remove_entry)' '--check-cfg=values(crossbeam_loom)' '--check-cfg=values(span_locations)' '--check-cfg=values(rustix_use_libc)' '--check-cfg=values(emulate_second_only_system)' '--check-cfg=values(windows_raw_dylib)' -Dwarnings '-Wrustdoc::invalid_codeblock_attributes' --crate-version '1.72.0-nightly (38e426245 2023-07-08)' --document-private-items '-Arustdoc::private-intra-doc-links' --enable-index-page -Zunstable-options -Znormalize-docs --show-type-layout --generate-link-to-definition '-Zcrate-attr=warn(rust_2018_idioms)' --extern-html-root-url 'ena=https://docs.rs/ena/latest/'` (exit status: 101)
[RUSTC-TIMING] synstructure test:false 0.471
Build completed unsuccessfully in 0:34:57

@bors
Copy link
Collaborator

bors commented Jul 8, 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 8, 2023
@compiler-errors compiler-errors deleted the rollup-2kryioh branch August 11, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.