Skip to content

Rollup of 5 pull requests #110684

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 16 commits into from
Closed

Rollup of 5 pull requests #110684

wants to merge 16 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillot and others added 16 commits April 18, 2023 18:00
@cjgillot
Refactor SyntaxContext::ctxt logic.
99962a8
@compiler-errors
Remove find_map_relevant_impl
1467877
@jyn514
Remove unnecessary test_kind field and TestKind struct
a1780a7
@jyn514
[wip] separate out a test_crate_args fn
d49c7d6
@jyn514
switch Crate to run_cargo_test
6348fac
@jyn514
Convert the rest of the test Steps to run_cargo_test
84e7253
@jyn514
Combine several Steps into a single step with multiple paths
c7ebddb
@jyn514
Fix x test --no-deps
b3ee81a 
- Use `cargo metadata` to determine whether a crate has a library
  package or not
- Collect metadata for all workspaces, not just the root workspace and
  cargo
- Don't pass `--lib` for crates without a library
- Use `run_cargo_test` for rust-installer
- Don't build documentation in `lint-docs` if `--no-doc` is passed
@notriddle
rustdoc: remove unneeded handleKey from settings.js
5cefe75 
This code was added in 9dc5dfb
and 704050d because the browser-
native checkbox was `display: none`, breaking native keyboard
accessibility.

The native checkbox is now merely `appearance: none`, which does
not turn off [behavior semantics], so JavaScript to
reimplement it isn't needed any more.

[behavior semantics]: https://w3c.github.io/csswg-drafts/css-ui/#appearance-semantics
@notriddle
rustdoc: remove unused CSS color: inherit
1d0f34f 
This code was added back when `border-color: currentColor` was used.
Since it was changed in ad9a89e, the
current color is not used any more.
@Ezrashaw
stop x fmt formatting alt build dirs
e9c52a5
@matthiaskrgr
Rollup merge of rust-lang#110497 - cjgillot:span-ctxt, r=b-naber
a16852f 
Refactor `SyntaxContext::ctxt` logic.

I'm still trying to make a test from the issue.

cc ``@deepink-mas`` does this solve the issue?

Fixes rust-lang#110230
@matthiaskrgr
Rollup merge of rust-lang#110514 - compiler-errors:remove-find_map_re…
130fd49 
…levant_impl, r=b-naber

Remove `find_map_relevant_impl`

Fixes rust-lang#108895
@matthiaskrgr
Rollup merge of rust-lang#110576 - jyn514:unify-test-args, r=ozkanonur
b12c332 
bootstrap: Unify test argument handling

Fixes rust-lang#104198. Does *not* help with rust-lang#80124 because I couldn't figure out a reasonable way to omit `--lib` only for `panic_abort` and not other `std` dependencies.

- Remove unnecessary `test_kind` field and `TestKind` struct. These are just subsets of the existing `builder.kind` / `Kind` struct.
- Add a new `run_cargo_test` function which handles passing arguments to cargo based on `builder.config`
- Switch all Steps in `mod test` to `run_cargo_test` where possible
- Combine several steps into one `CrateBootstrap` step. These tests all do the same thing, just with different crate names.
- Fix `x test --no-doc`. This is much simpler after the refactors mentioned earlier, but I'm happy to split it into a separate PR if desired. Before, this would panic a lot because steps forgot to pass `--lib`.
@matthiaskrgr
Rollup merge of rust-lang#110661 - notriddle:notriddle/settings-js-ha…
d02c205 
…ndlekey, r=GuillaumeGomez

rustdoc: clean up settings.css and settings.js

`handleKey` was added in 9dc5dfb and 704050d because the browser-native checkbox was `display: none`, breaking native keyboard accessibility.

The native checkbox is now merely `appearance: none`, which does not turn off [behavior semantics], so JavaScript to reimplement it isn't needed any more.

[behavior semantics]: https://w3c.github.io/csswg-drafts/css-ui/#appearance-semantics

The other, one line change to settings.css is follow-up to rust-lang#110205
@matthiaskrgr
Rollup merge of rust-lang#110664 - Ezrashaw:fix-bootstrap-build-forma…
45fe909 
…t, r=jyn514

stop `x fmt` formatting untracked directories

I don't think there's anything else to do? I've confirmed that you get a "skip untracked path foo/ during rustfmt invocations" for the alternative build directory.

r? ``@jyn514``
@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-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) rollup A PR which is a rollup labels Apr 22, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 22, 2023

📌 Commit 45fe909 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 22, 2023
@bors
Copy link
Collaborator

bors commented Apr 22, 2023

⌛ Testing commit 45fe909 with merge 2695da6462103d08281648b5d0bda1c81a7a91fa...

@bors
Copy link
Collaborator

bors commented Apr 22, 2023

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 22, 2023
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 22, 2023
@rust-log-analyzer
Copy link
Collaborator

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

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

@apiraino
Copy link
Contributor

@matthiaskrgr why is this rollup failing on the dist-apple-various target? 🤔 is it a spurious CI error or the last commit rust-lang-ci@2695da6 broke it?

@bors
Copy link
Collaborator

bors commented May 22, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup-e6dgge7 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-e6dgge7 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging src/bootstrap/tool.rs
Auto-merging src/bootstrap/test.rs
CONFLICT (content): Merge conflict in src/bootstrap/test.rs
Auto-merging src/bootstrap/lib.rs
Auto-merging src/bootstrap/builder/tests.rs
Auto-merging src/bootstrap/builder.rs
Automatic merge failed; fix conflicts and then commit the result.

@matthiaskrgr matthiaskrgr deleted the rollup-e6dgge7 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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-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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@matthiaskrgr @bors @rust-log-analyzer @apiraino @rustbot @cjgillot @compiler-errors @jyn514 @notriddle @Ezrashaw