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 8 pull requests #113460

Closed
wants to merge 24 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 24 commits July 6, 2023 07:11
Comments out the C string literals due to rust-lang#113334

Fixes rust-lang/rust-clippy#11121
…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```
…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
…itit-gat, r=spastorino

Remove `variances_of` on RPITIT GATs, remove its one use-case

It doesn't make sense to implement variances on a GAT anyways, since we don't relate GATs with variance:

https://github.com/rust-lang/rust/blob/85bf07972a1041b9e25393b803d0e006bec3eaaf/compiler/rustc_middle/src/ty/relate.rs#L569-L579

r? `@spastorino`
miri: check that assignments do not self-overlap

r? ```@oli-obk```
…er-errors

Remove from_method symbol

Fixes rust-lang#113439

`on_unimplemented_note` was calling `item_name` for RPITITs and that produced ICEs. I've added a regression test for that but also have removed `from_method` symbol entirely because it wasn't even used and by doing that the `item_name` call was also removed.

r? `@compiler-errors`
Fix failing clippy tests

Comments out the C string literals due to rust-lang#113334

Fixes rust-lang/rust-clippy#11121

Opened against `rust-lang/rust` in order to unblock rust-lang#113450

r? ``@Nilstrieb``
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. 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. 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 rollup A PR which is a rollup labels Jul 7, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=25 rollup=never

@bors
Copy link
Contributor

bors commented Jul 7, 2023

📌 Commit d8f0b1f has been approved by GuillaumeGomez

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 7, 2023
@bors
Copy link
Contributor

bors commented Jul 7, 2023

⌛ Testing commit d8f0b1f with merge 56257caec947bf2efd853cc2ed99b7e38f96b216...

@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_ast_passes v0.0.0 (/checkout/compiler/rustc_ast_passes)
 Documenting rustc_query_impl v0.0.0 (/checkout/compiler/rustc_query_impl)
 Documenting rustc_symbol_mangling v0.0.0 (/checkout/compiler/rustc_symbol_mangling)
 Documenting rustc_monomorphize v0.0.0 (/checkout/compiler/rustc_monomorphize)
thread 'rustc' panicked at 'assertion failed: cx.impl_trait_bounds.is_empty()', src/librustdoc/clean/utils.rs:542:5
   0:     0xffffac2c9cb8 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::hc3eb6d04b6d70e6b
   1:     0xffffac330788 - core::fmt::write::ha1900f78729a10d5
   2:     0xffffac2bf16c - std::io::Write::write_fmt::ha3cbf17058e4192e
   3:     0xffffac2c9b08 - std::sys_common::backtrace::print::h538bd09386c997af
---
   8:     0xffffac2ccf98 - std::panicking::begin_panic_handler::{{closure}}::h6263c9a054f360d1
   9:     0xffffac2ca134 - std::sys_common::backtrace::__rust_end_short_backtrace::h1bec8e88f37c196d
  10:     0xffffac2ccd0c - rust_begin_unwind
  11:     0xffffac28f080 - core::panicking::panic_fmt::h55266116a1dcbbb9
  12:     0xffffac28f0f0 - core::panicking::panic::h16c1ec023650f57c
  13:     0xaaaae7c61aa4 - rustdoc[fee22ceda32116d5]::clean::utils::enter_impl_trait::<rustdoc[fee22ceda32116d5]::clean::clean_function::{closure#0}, (rustdoc[fee22ceda32116d5]::clean::types::Generics, rustdoc[fee22ceda32116d5]::clean::types::FnDecl)>
  14:     0xaaaae7eba1d4 - rustdoc[fee22ceda32116d5]::clean::clean_fn_or_proc_macro
  15:     0xaaaae7d11a14 - <rustdoc[fee22ceda32116d5]::core::DocContext>::with_param_env::<alloc[859101fa7b712225]::vec::Vec<rustdoc[fee22ceda32116d5]::clean::types::Item>, rustdoc[fee22ceda32116d5]::clean::clean_maybe_renamed_item::{closure#1}>
  16:     0xaaaae7eade58 - <&mut rustdoc[fee22ceda32116d5]::clean::clean_doc_module::{closure#2} as core[7aebce7503e1aff4]::ops::function::FnOnce<(&(&rustc_hir[a0e210316441957]::hir::Item, core[7aebce7503e1aff4]::option::Option<rustc_span[be9ca603420d5f82]::symbol::Symbol>, core[7aebce7503e1aff4]::option::Option<rustc_span[be9ca603420d5f82]::def_id::LocalDefId>),)>>::call_once
  17:     0xaaaae7da5fb8 - <alloc[859101fa7b712225]::vec::Vec<rustdoc[fee22ceda32116d5]::clean::types::Item> as alloc[859101fa7b712225]::vec::spec_extend::SpecExtend<rustdoc[fee22ceda32116d5]::clean::types::Item, core[7aebce7503e1aff4]::iter::adapters::flatten::FlatMap<indexmap[1ec9fa2cbaad8700]::map::iter::Values<(rustc_span[be9ca603420d5f82]::def_id::LocalDefId, core[7aebce7503e1aff4]::option::Option<rustc_span[be9ca603420d5f82]::symbol::Symbol>), (&rustc_hir[a0e210316441957]::hir::Item, core[7aebce7503e1aff4]::option::Option<rustc_span[be9ca603420d5f82]::symbol::Symbol>, core[7aebce7503e1aff4]::option::Option<rustc_span[be9ca603420d5f82]::def_id::LocalDefId>)>, alloc[859101fa7b712225]::vec::Vec<rustdoc[fee22ceda32116d5]::clean::types::Item>, rustdoc[fee22ceda32116d5]::clean::clean_doc_module::{closure#2}>>>::spec_extend
  18:     0xaaaae7eb349c - rustdoc[fee22ceda32116d5]::clean::clean_doc_module
  19:     0xaaaae7ead678 - <&mut rustdoc[fee22ceda32116d5]::clean::clean_doc_module::{closure#1} as core[7aebce7503e1aff4]::ops::function::FnMut<(&rustdoc[fee22ceda32116d5]::visit_ast::Module,)>>::call_mut
  20:     0xaaaae7da5520 - <alloc[859101fa7b712225]::vec::Vec<rustdoc[fee22ceda32116d5]::clean::types::Item> as alloc[859101fa7b712225]::vec::spec_extend::SpecExtend<rustdoc[fee22ceda32116d5]::clean::types::Item, core[7aebce7503e1aff4]::iter::adapters::filter_map::FilterMap<core[7aebce7503e1aff4]::slice::iter::Iter<rustdoc[fee22ceda32116d5]::visit_ast::Module>, rustdoc[fee22ceda32116d5]::clean::clean_doc_module::{closure#1}>>>::spec_extend
  21:     0xaaaae7eb345c - rustdoc[fee22ceda32116d5]::clean::clean_doc_module
  22:     0xaaaae7c5de24 - rustdoc[fee22ceda32116d5]::clean::utils::krate
  23:     0xaaaae7cb2c64 - <rustc_session[b630bf1b20a0b44d]::session::Session>::time::<rustdoc[fee22ceda32116d5]::clean::types::Crate, rustdoc[fee22ceda32116d5]::core::run_global_ctxt::{closure#5}>
  24:     0xaaaae7d14b48 - rustdoc[fee22ceda32116d5]::core::run_global_ctxt
  25:     0xaaaae7cb3160 - <rustc_session[b630bf1b20a0b44d]::session::Session>::time::<(rustdoc[fee22ceda32116d5]::clean::types::Crate, rustdoc[fee22ceda32116d5]::config::RenderOptions, rustdoc[fee22ceda32116d5]::formats::cache::Cache), rustdoc[fee22ceda32116d5]::main_args::{closure#1}::{closure#0}::{closure#0}::{closure#0}>
  26:     0xaaaae7e3d9dc - <rustc_middle[5ffe206c984ad8c3]::ty::context::GlobalCtxt>::enter::<rustdoc[fee22ceda32116d5]::main_args::{closure#1}::{closure#0}::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>
  27:     0xaaaae7bdd3c0 - <rustc_interface[c7cf2951ee0eafe1]::interface::Compiler>::enter::<rustdoc[fee22ceda32116d5]::main_args::{closure#1}::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>
  28:     0xaaaae7df33e4 - rustc_span[be9ca603420d5f82]::set_source_map::<core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>, rustc_interface[c7cf2951ee0eafe1]::interface::run_compiler<core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>, rustdoc[fee22ceda32116d5]::main_args::{closure#1}>::{closure#0}::{closure#0}>
  29:     0xaaaae7d17480 - <scoped_tls[6d26d8c0f8e550e9]::ScopedKey<rustc_span[be9ca603420d5f82]::SessionGlobals>>::set::<rustc_interface[c7cf2951ee0eafe1]::interface::run_compiler<core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>, rustdoc[fee22ceda32116d5]::main_args::{closure#1}>::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>
  30:     0xaaaae7e16b44 - std[61ce19836df25d62]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[c7cf2951ee0eafe1]::util::run_in_thread_pool_with_globals<rustc_interface[c7cf2951ee0eafe1]::interface::run_compiler<core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>, rustdoc[fee22ceda32116d5]::main_args::{closure#1}>::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>
  31:     0xaaaae7eaac84 - <<std[61ce19836df25d62]::thread::Builder>::spawn_unchecked_<rustc_interface[c7cf2951ee0eafe1]::util::run_in_thread_pool_with_globals<rustc_interface[c7cf2951ee0eafe1]::interface::run_compiler<core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>, rustdoc[fee22ceda32116d5]::main_args::{closure#1}>::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[7aebce7503e1aff4]::result::Result<(), rustc_span[be9ca603420d5f82]::ErrorGuaranteed>>::{closure#1} as core[7aebce7503e1aff4]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  33:     0xffffac1eb624 - start_thread
  34:     0xffffac11e49c - <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 (56257caec 2023-07-07) 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 (56257caec 2023-07-07)' --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] syn test:false 6.879
Build completed unsuccessfully in 0:35:10

@bors
Copy link
Contributor

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
@bors
Copy link
Contributor

bors commented Jul 8, 2023

⌛ Testing commit d8f0b1f with merge a9836d4907e242f74d21a04a3c9ed6663dcc4411...

@rust-log-analyzer
Copy link
Collaborator

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

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

@GuillaumeGomez GuillaumeGomez deleted the rollup-ofkg2cg branch July 8, 2023 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues about the rust-lang/rust repository. 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. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants