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 #113468

Closed
wants to merge 25 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nbdd0121 and others added 25 commits June 30, 2023 18:38
…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`
miri: check that assignments do not self-overlap

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

Remove unused from_method from rustc_on_unimplemented

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`
…er-errors

Avoid calling report_forbidden_specialization for RPITITs

Fixes rust-lang#113438

r? `@compiler-errors`
Update cargo

1 commits in 5b377cece0e0dd0af686cf53ce4637d5d85c2a10..45782b6b8afd1da042d45c2daeec9c0744f72cc7
2023-06-30 00:01:00 +0000 to 2023-07-05 16:54:51 +0000
- docs(ref): Provide guidance on version requirements (rust-lang/cargo#12323)

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

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Jul 8, 2023

📌 Commit c5563b8 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 8, 2023
@bors
Copy link
Contributor

bors commented Jul 8, 2023

⌛ Testing commit c5563b8 with merge d19c89b11f30f4dbf24ba3461007b569f8662362...

@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_symbol_mangling v0.0.0 (/checkout/compiler/rustc_symbol_mangling)
 Documenting rustc_incremental v0.0.0 (/checkout/compiler/rustc_incremental)
 Documenting rustc_monomorphize v0.0.0 (/checkout/compiler/rustc_monomorphize)
 Documenting rustc_ast_passes v0.0.0 (/checkout/compiler/rustc_ast_passes)
thread 'rustc' panicked at 'assertion failed: cx.impl_trait_bounds.is_empty()', src/librustdoc/clean/utils.rs:542:5
   0:     0xffffa2277c58 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h8808b1cd3faecba3
   1:     0xffffa22de728 - core::fmt::write::hcf14a9c8d4c7f6e2
   2:     0xffffa226d19c - std::io::Write::write_fmt::heb795c77f3e70088
   3:     0xffffa2277aa8 - std::sys_common::backtrace::print::h11050f4265e01f0f
---
   8:     0xffffa227af38 - std::panicking::begin_panic_handler::{{closure}}::hbcf23fd19901d558
   9:     0xffffa22780d4 - std::sys_common::backtrace::__rust_end_short_backtrace::h06a09a556fa374dc
  10:     0xffffa227acac - rust_begin_unwind
  11:     0xffffa223d020 - core::panicking::panic_fmt::h196d41cedc722b63
  12:     0xffffa223d090 - core::panicking::panic::h3b99888121b641f5
  13:     0xaaaae8acf240 - rustdoc[1388d70a758260ce]::clean::utils::enter_impl_trait::<rustdoc[1388d70a758260ce]::clean::clean_function::{closure#0}, (rustdoc[1388d70a758260ce]::clean::types::Generics, rustdoc[1388d70a758260ce]::clean::types::FnDecl)>
  14:     0xaaaae8d27f20 - rustdoc[1388d70a758260ce]::clean::clean_fn_or_proc_macro
  15:     0xaaaae8b82f18 - <rustdoc[1388d70a758260ce]::core::DocContext>::with_param_env::<alloc[e2ce97d577e88ba2]::vec::Vec<rustdoc[1388d70a758260ce]::clean::types::Item>, rustdoc[1388d70a758260ce]::clean::clean_maybe_renamed_item::{closure#1}>
  16:     0xaaaae8d1bc48 - <&mut rustdoc[1388d70a758260ce]::clean::clean_doc_module::{closure#2} as core[87487b02e85623af]::ops::function::FnOnce<(&(&rustc_hir[caa03a2f1bb1f71c]::hir::Item, core[87487b02e85623af]::option::Option<rustc_span[fdd44fb721be735b]::symbol::Symbol>, core[87487b02e85623af]::option::Option<rustc_span[fdd44fb721be735b]::def_id::LocalDefId>),)>>::call_once
  17:     0xaaaae8c12610 - <alloc[e2ce97d577e88ba2]::vec::Vec<rustdoc[1388d70a758260ce]::clean::types::Item> as alloc[e2ce97d577e88ba2]::vec::spec_extend::SpecExtend<rustdoc[1388d70a758260ce]::clean::types::Item, core[87487b02e85623af]::iter::adapters::flatten::FlatMap<indexmap[46a27ef3aecea61c]::map::iter::Values<(rustc_span[fdd44fb721be735b]::def_id::LocalDefId, core[87487b02e85623af]::option::Option<rustc_span[fdd44fb721be735b]::symbol::Symbol>), (&rustc_hir[caa03a2f1bb1f71c]::hir::Item, core[87487b02e85623af]::option::Option<rustc_span[fdd44fb721be735b]::symbol::Symbol>, core[87487b02e85623af]::option::Option<rustc_span[fdd44fb721be735b]::def_id::LocalDefId>)>, alloc[e2ce97d577e88ba2]::vec::Vec<rustdoc[1388d70a758260ce]::clean::types::Item>, rustdoc[1388d70a758260ce]::clean::clean_doc_module::{closure#2}>>>::spec_extend
  18:     0xaaaae8d2128c - rustdoc[1388d70a758260ce]::clean::clean_doc_module
  19:     0xaaaae8d1b2ac - <&mut rustdoc[1388d70a758260ce]::clean::clean_doc_module::{closure#1} as core[87487b02e85623af]::ops::function::FnMut<(&rustdoc[1388d70a758260ce]::visit_ast::Module,)>>::call_mut
  20:     0xaaaae8c11b78 - <alloc[e2ce97d577e88ba2]::vec::Vec<rustdoc[1388d70a758260ce]::clean::types::Item> as alloc[e2ce97d577e88ba2]::vec::spec_extend::SpecExtend<rustdoc[1388d70a758260ce]::clean::types::Item, core[87487b02e85623af]::iter::adapters::filter_map::FilterMap<core[87487b02e85623af]::slice::iter::Iter<rustdoc[1388d70a758260ce]::visit_ast::Module>, rustdoc[1388d70a758260ce]::clean::clean_doc_module::{closure#1}>>>::spec_extend
  21:     0xaaaae8d2124c - rustdoc[1388d70a758260ce]::clean::clean_doc_module
  22:     0xaaaae8acb0fc - rustdoc[1388d70a758260ce]::clean::utils::krate
  23:     0xaaaae8ae9e50 - <rustc_session[f0b008c6a9a5f72f]::session::Session>::time::<rustdoc[1388d70a758260ce]::clean::types::Crate, rustdoc[1388d70a758260ce]::core::run_global_ctxt::{closure#5}>
  24:     0xaaaae8b8604c - rustdoc[1388d70a758260ce]::core::run_global_ctxt
  25:     0xaaaae8aea34c - <rustc_session[f0b008c6a9a5f72f]::session::Session>::time::<(rustdoc[1388d70a758260ce]::clean::types::Crate, rustdoc[1388d70a758260ce]::config::RenderOptions, rustdoc[1388d70a758260ce]::formats::cache::Cache), rustdoc[1388d70a758260ce]::main_args::{closure#1}::{closure#0}::{closure#0}::{closure#0}>
  26:     0xaaaae8caa38c - <rustc_middle[e1e7d8dc8964f7f9]::ty::context::GlobalCtxt>::enter::<rustdoc[1388d70a758260ce]::main_args::{closure#1}::{closure#0}::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>
  27:     0xaaaae8a4c81c - <rustc_interface[8fd86c11df45c9eb]::interface::Compiler>::enter::<rustdoc[1388d70a758260ce]::main_args::{closure#1}::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>
  28:     0xaaaae8c5fa6c - rustc_span[fdd44fb721be735b]::set_source_map::<core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>, rustc_interface[8fd86c11df45c9eb]::interface::run_compiler<core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>, rustdoc[1388d70a758260ce]::main_args::{closure#1}>::{closure#0}::{closure#0}>
  29:     0xaaaae8b888c4 - <scoped_tls[6f1d74ae08934c53]::ScopedKey<rustc_span[fdd44fb721be735b]::SessionGlobals>>::set::<rustc_interface[8fd86c11df45c9eb]::interface::run_compiler<core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>, rustdoc[1388d70a758260ce]::main_args::{closure#1}>::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>
  30:     0xaaaae8c831cc - std[222eaf9bfb19de37]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[8fd86c11df45c9eb]::util::run_in_thread_pool_with_globals<rustc_interface[8fd86c11df45c9eb]::interface::run_compiler<core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>, rustdoc[1388d70a758260ce]::main_args::{closure#1}>::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>
  31:     0xaaaae8d188b8 - <<std[222eaf9bfb19de37]::thread::Builder>::spawn_unchecked_<rustc_interface[8fd86c11df45c9eb]::util::run_in_thread_pool_with_globals<rustc_interface[8fd86c11df45c9eb]::interface::run_compiler<core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>, rustdoc[1388d70a758260ce]::main_args::{closure#1}>::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[87487b02e85623af]::result::Result<(), rustc_span[fdd44fb721be735b]::ErrorGuaranteed>>::{closure#1} as core[87487b02e85623af]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  33:     0xffffa2199624 - start_thread
  34:     0xffffa20cc49c - <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 (d19c89b11 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 (d19c89b11 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] syn test:false 7.537
Build completed unsuccessfully in 0:34:47

@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 c5563b8 with merge 835111fd97643f8a4d1c700e7a6f1db1ebfda05e...

@matthiaskrgr matthiaskrgr deleted the rollup-plpjxe5 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.