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 7 pull requests #110119

Closed
wants to merge 18 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 18 commits March 7, 2023 05:41
Part 3: Finishing `collect.rs` file
Fix formatting that rustfmt can't handle currently.

Co-authored-by: Michael Goulet <[email protected]>
…rs-method-probe, r=jackh726

Instantiate instead of erasing binder when probing param methods

Fixes rust-lang#108836

There is a really old comment saying that a `WhereClauseCandidate` probe candidate "should not contain any inference variables", but I'm not really confident that that comment applies anymore. In contrast, other candidates that we assemble during method probe contain inference variables in their substitutions (e.g. `InherentImplCandidate`)...

Since this change is made only to support a nightly feature, I'm happy to gate the new behavior behind this feature flag or discuss it further.

r? types
Updating Wake example to use new 'pin!' macro

Updating the example for the Wake trait to use `pin!` macro instead of `Box::pin`.
rust-lang#109965
…tics-3, r=compiler-errors

Migrate `rustc_hir_analysis` to session diagnostic [Part 3]

Part 3: Finishing `collect.rs` file

r? `@compiler-errors`
…r=Mark-Simulacrum

bump `thiserror` to use syn 2.0

cc rust-lang#109302
…, r=compiler-errors

Migrate remainder of rustc_ty_utils to `SessionDiagnostic`

This moves the remaining errors in `rust_ty_utils` to `SessionsDiagnostic`.

r? `@davidtwco`
…gelog, r=ozkanonur

Add renaming of ignore-git to changelog

`bootstrap`'s `ignore-git` option has been renamed to `omit-git-hash` in rust-lang#110059. This PR adds this change to the `CHANGELOG.md`. See also rust-lang#110020 (comment).
compiletest: Give a better error message if `node` isn't installed
@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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 9, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Apr 9, 2023

📌 Commit 9f3a751 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 Apr 9, 2023
@bors
Copy link
Contributor

bors commented Apr 9, 2023

⌛ Testing commit 9f3a751 with merge d429f2d3e2f28603ccf98c35af7dfea656cb061f...

@bors
Copy link
Contributor

bors commented Apr 9, 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 Apr 9, 2023
@rust-log-analyzer
Copy link
Collaborator

The job dist-mips-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] clippy_lints test:false 41.564
[RUSTC-TIMING] cargo_clippy test:false 0.996
[RUSTC-TIMING] clippy_driver test:false 1.763
    Finished release [optimized] target(s) in 50.71s
duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
the following dependencies have different features:
the following dependencies have different features:
  syn 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)
    `clippy-driver` additionally enabled features {"full"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips-unknown-linux-gnu/release/deps/libsyn-ed4b833c77d09371.rlib"
    `cargo` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips-unknown-linux-gnu/release/deps/libsyn-b24d1c6bd1c1e71f.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
thread 'main' panicked at 'tools should not compile multiple copies of the same crate', tool.rs:250:13
Build completed unsuccessfully in 0:20:01

@matthiaskrgr matthiaskrgr deleted the rollup-x0dkly6 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
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-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.