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 10 pull requests #122096

Closed
wants to merge 24 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jefferyto and others added 24 commits March 4, 2024 10:35
This allows the bootstrap cache path to be set by the
`RUSTC_BOOTSTRAP_CACHE` environment variable.

Setting the bootstrap cache path to an external location can help to
speed up builds in cases where the build directory is not kept between
builds, e.g. in CI or other automated build systems.
Setting the bootstrap cache path to an external location can help to
speed up builds in cases where the build directory is not kept between
builds, e.g. in CI or other automated build systems.
This makes it easier to see that the call to `in_scope` returns both the then
block and the else block. The rather confusing `unpack!` step is confined to
its own separate line.

(This patch reindents several lines, so using "ignore whitespace" is
recommended in order to focus on the actual changes.)
The `TraitPredicate` no longer has constness as we have desugared it to work with the type system through const generics instead.
…t, r=petrochenkov

Fix redundant import errors for preload extern crate

Fixes rust-lang#121915
Add an option to have an external download/bootstrap cache

Follow up from rust-lang#116697 to address rust-lang#116697 (review)
…chenkov

loongarch: add frecipe and relax target feature

This PR adds `frecipe` and `relax` target features to LoongArch:

* frecipe - Support frecipe.{s/d} and frsqrte.{s/d} instructions..
* relax - Enable Linker relaxation.
Do not try to format removed files

If you removed a file, `x fmt` would confusingly print
```
formatting modified file path/to/file.rs
```
and pass it to the formatting logic. Filter out files with `D` (removed) status
…astorino

Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries

This PR moves the `type_of` and `generics_of` query feeding out of `associated_type_for_impl_trait_in_impl`, since eagerly feeding results in query cycles due to a subtle interaction with `resolve_bound_vars`.

Fixes rust-lang#122019

r? spastorino
Make the lowering of `thir::ExprKind::If` easier to follow

This targets a few code patterns that I found very confusing when I first tried to understand what this code is doing.

No functional changes. I recommend looking at the changes individually, with whitespace hidden.
Add proper cfgs for struct HirIdValidator used only with debug-assert

See rust-lang#122065 (comment).
I think it's due to rust-lang#121752.
Add missing PartialOrd trait implementation doc for array

Analogously to vectors and slices, this PR documents the lexicographic sorting of PartialOrd as rustdoc comment on the trait implementation of PartialOrd for arrays.
Associated issue: rust-lang#122073.
…, r=compiler-errors

remove outdated fixme comment

The `TraitPredicate` no longer has constness as we have desugared it to work with the type system through const generics instead.
Note why we're using a new thread in `test_get_os_named_thread`

`@RalfJung` expressed some "surprise and confusion" about why we're spawning a new thread in this test. Hopefully this comment will help future readers.
@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Mar 6, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Mar 6, 2024

📌 Commit 3fc4cf6 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 Mar 6, 2024
@bors
Copy link
Contributor

bors commented Mar 6, 2024

⌛ Testing commit 3fc4cf6 with merge 4268d71...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121976 (Add an option to have an external download/bootstrap cache)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122026 (Do not try to format removed files)
 - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries)
 - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow)
 - rust-lang#122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert)
 - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array)
 - rust-lang#122082 (remove outdated fixme comment)
 - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

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

---- [ui] tests/ui/issues/issue-44216-sub-instant.rs stdout ----

error: error pattern 'overflow' not found!
command: RUST_TEST_THREADS="8" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-44216-sub-instant/a"
--- stdout -------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-44216-sub-instant/a", waiting for result
------------------------------------------

@bors
Copy link
Contributor

bors commented Mar 6, 2024

💔 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 Mar 6, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry
2024-03-06T19:54:16.1975149Z client.read_exact(&mut header) failed with Connection reset by peer (os error 104)

@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 Mar 6, 2024
@bors
Copy link
Contributor

bors commented Mar 6, 2024

⌛ Testing commit 3fc4cf6 with merge ed4cff2...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121976 (Add an option to have an external download/bootstrap cache)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122026 (Do not try to format removed files)
 - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries)
 - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow)
 - rust-lang#122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert)
 - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array)
 - rust-lang#122082 (remove outdated fixme comment)
 - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
For more information about this error, try `rustc --explain E0433`.
error: could not document `rustc_interface`

Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/bootstrap/debug/rustdoc --edition=2021 --crate-type lib --crate-name rustc_interface compiler/rustc_interface/src/lib.rs --target aarch64-apple-darwin -o /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/doc --cfg 'feature="llvm"' --cfg 'feature="rustc-rayon"' --cfg 'feature="rustc-rayon-core"' --cfg 'feature="rustc_codegen_llvm"' --cfg 'feature="rustc_use_parallel_compiler"' -Zunstable-options --check-cfg 'cfg(feature, values("llvm", "rustc-rayon", "rustc-rayon-core", "rustc_codegen_llvm", "rustc_use_parallel_compiler"))' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=dc888fedbc6478c7 -L dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps -L dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/release/deps --extern rayon=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librayon-e8089436137ae0b4.rmeta --extern rayon_core=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librayon_core-bdbdf9b52361f5b6.rmeta --extern rustc_ast=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_ast-50e69610fa1c829d.rmeta --extern rustc_ast_lowering=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_ast_lowering-789b5ec04de61019.rmeta --extern rustc_ast_passes=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_ast_passes-7de6b6372b2805c7.rmeta --extern rustc_attr=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_attr-d38575ad3725cd50.rmeta --extern rustc_borrowck=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_borrowck-33a4634a59ccb8bf.rmeta --extern rustc_builtin_macros=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_builtin_macros-fefda805449e61fd.rmeta --extern rustc_codegen_llvm=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_codegen_llvm-72b67d4427ada542.rmeta --extern rustc_codegen_ssa=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_codegen_ssa-333cbb05fe06404e.rmeta --extern rustc_const_eval=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_const_eval-f4e1364249aea94a.rmeta --extern rustc_data_structures=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_data_structures-5f999d6b4016c8fb.rmeta --extern rustc_errors=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_errors-6836ee3125d4e6fe.rmeta --extern rustc_expand=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_expand-22e02fbb19f2bfde.rmeta --extern rustc_feature=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_feature-653396c7e64a389a.rmeta --extern rustc_fluent_macro=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/release/deps/librustc_fluent_macro-9df6a5d113ce483a.dylib --extern rustc_fs_util=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_fs_util-6aeab01da9bbb73c.rmeta --extern rustc_hir=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_hir-e1a5d64117e9dcfb.rmeta --extern rustc_hir_analysis=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_hir_analysis-cfd37872686b5ee3.rmeta --extern rustc_hir_typeck=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_hir_typeck-ceba9917fab079d1.rmeta --extern rustc_incremental=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_incremental-3a73c3179e91708f.rmeta --extern rustc_lint=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_lint-29d82239c1893dd8.rmeta --extern rustc_macros=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/release/deps/librustc_macros-5ca1dc174de8533e.dylib --extern rustc_metadata=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_metadata-d0ec85d279a87200.rmeta --extern rustc_middle=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_middle-8d91230de6c1f3dc.rmeta --extern rustc_mir_build=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_mir_build-aa98131ee984641d.rmeta --extern rustc_mir_transform=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_mir_transform-d2aef1449e1b4760.rmeta --extern rustc_monomorphize=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_monomorphize-eac39a959ece8382.rmeta --extern rustc_parse=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_parse-b692da6f234b0c4a.rmeta --extern rustc_passes=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_passes-357c582678796e5c.rmeta --extern rustc_privacy=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_privacy-c606894eb68c59a8.rmeta --extern rustc_query_impl=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_query_impl-7164e9c8b085e5ea.rmeta --extern rustc_query_system=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_query_system-6e94df4401c348b2.rmeta --extern rustc_resolve=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_resolve-cfcc77a0f068225b.rmeta --extern rustc_serialize=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_serialize-4988238994abdfab.rmeta --extern rustc_session=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_session-9a0155c801581a44.rmeta --extern rustc_span=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_span-0e629c5d26841847.rmeta --extern rustc_symbol_mangling=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_symbol_mangling-274f4a8432b6f12a.rmeta --extern rustc_target=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_target-72ab6c640845bfa3.rmeta --extern rustc_trait_selection=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_trait_selection-7e408aea3aed5f69.rmeta --extern rustc_traits=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_traits-7c9e38c529eff446.rmeta --extern rustc_ty_utils=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/librustc_ty_utils-e6a1e08d8e5a6d4d.rmeta --extern tracing=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-rustc/aarch64-apple-darwin/release/deps/libtracing-e0eb3f5f2a6498d4.rmeta --extern-html-root-url 'rayon=https://docs.rs/rustc-rayon/0.5.0/' --extern-html-root-url 'rayon_core=https://docs.rs/rustc-rayon-core/0.5.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=cfg(bootstrap)' '--check-cfg=cfg(parallel_compiler)' '--check-cfg=cfg(no_btreemap_remove_entry)' '--check-cfg=cfg(crossbeam_loom)' '--check-cfg=cfg(span_locations)' '--check-cfg=cfg(rustix_use_libc)' '--check-cfg=cfg(emulate_second_only_system)' '--check-cfg=cfg(windows_raw_dylib)' -Dwarnings '-Wrustdoc::invalid_codeblock_attributes' --crate-version '1.78.0-nightly (ed4cff21d 2024-03-06)' --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)' --cfg=parallel_compiler --extern-html-root-url 'ena=https://docs.rs/ena/latest/'` (exit status: 1)
Build completed unsuccessfully in 0:51:34
  local time: Wed Mar  6 21:38:04 UTC 2024
  network time: Wed, 06 Mar 2024 21:38:04 GMT
##[error]Process completed with exit code 1.

@bors
Copy link
Contributor

bors commented Mar 6, 2024

💔 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 Mar 6, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-s8sh1rn 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
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. 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.