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

Merged
merged 34 commits into from
Jun 14, 2024
Merged

Rollup of 10 pull requests #126439

merged 34 commits into from
Jun 14, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jieyouxu and others added 30 commits June 10, 2024 12:25
- Remove the ValuePairs glob import
- Make DummyPairs -> ValuePairs::Dummy and make it bug more
- Fix WC
- Make interner return `impl IntoIterator`s
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Miri no longer respects `MIRI_SYSROOT` and wants to be treated like a
REAL rustc, with `--sysroot`. *pats Miri* sure Miri, just for you :3.
…ontext -> CompileTimeInterpCx

to match the terms used in the shared interpreter infrastructure
When both `std::` and `core::` items are available, only suggest the
`std::` ones. We ensure that in `no_std` crates we suggest `core::`
items.

Ensure that the list of items suggested to be imported are always in the
order of local crate items, `std`/`core` items and finally foreign crate
items.

Tweak wording of import suggestion: if there are multiple items but they
are all of the same kind, we use the kind name and not the generic "items".

Fix rust-lang#83564.
…rieb

Clarify `Command::new` behavior for programs with arguments

I mistakenly passed program path along arguments as the same string into `Command::new` a couple of times now. It might be useful to explicitly highlight that `Command::new` intends to accept path to a program, not path to a program plus arguments. Also nudge the user to use `Command::arg` or `Command::args` if they wish to pass arguments.
[1/2] clean-up / general improvements

This PR applies various clippy suggestions on the tools. I have only applied the ones that make sense and left out trivial changes (e.g., suggestions like 'remove &' are ignored to keep the original commit history for the lines).

I am planning to do the same for the library and compiler, but those will add too many changes to this PR, so I will handle them in a separate PR later.
Fix Miri sysroot for `x run`

Miri no longer (after rust-lang/miri#3411) respects `MIRI_SYSROOT` and wants to be treated like a REAL rustc, with `--sysroot`. \*pats Miri\* sure Miri, just for you :3.

fixes rust-lang#126233

r? RalfJung (or whoever else feels like it)
…rochenkov

Add pub struct with allow(dead_code) into worklist

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->

Fixes rust-lang#126289
…traits, r=lcnr

Uplift `structural_traits.rs` into the new trait solver

Self-explanatory. I will leave some comments inline regarding design decisions.
Tweak output of import suggestions

When both `std::` and `core::` items are available, only suggest the `std::` ones. We ensure that in `no_std` crates we suggest `core::` items.

Ensure that the list of items suggested to be imported are always in the order of local crate items, `std`/`core` items and finally foreign crate items.

Tweak wording of import suggestion: if there are multiple items but they are all of the same kind, we use the kind name and not the generic "items".

Fix rust-lang#83564.
@rustbot rustbot added 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. 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 Jun 13, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=13

@bors
Copy link
Contributor

bors commented Jun 13, 2024

📌 Commit 3494ea1 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 Jun 13, 2024
@bors
Copy link
Contributor

bors commented Jun 13, 2024

⌛ Testing commit 3494ea1 with merge 8ff13a6...

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

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126238 (Fix Miri sysroot for `x run`)
 - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
 - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
 - rust-lang#126371 (Tweak output of import suggestions)
 - rust-lang#126388 (const-eval: make lint scope computation consistent)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)

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

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

Click to see the possible cause of the failure (guessed by this bot)
.......... (120/124)
...F       (124/124)


/checkout/tests/rustdoc-gui/help-page.goml help-page... FAILED
[ERROR] `tests/rustdoc-gui/utils.goml` line 16
    from `tests/rustdoc-gui/help-page.goml` line 23
    from `tests/rustdoc-gui/help-page.goml` line 32: Error: Evaluation failed: The following errors happened: [localStorage item "rustdoc-theme" (of value "ayu") != "null"]: for command `assert-local-storage: {"rustdoc-theme": |theme|}`
Error: ()
Build completed unsuccessfully in 0:03:30
  local time: Thu Jun 13 21:45:38 UTC 2024
  network time: Thu, 13 Jun 2024 21:45:38 GMT

@estebank
Copy link
Contributor

This seems to have been caused by #126371. (And I have no idea why.)

@estebank estebank closed this Jun 13, 2024
@matthiaskrgr matthiaskrgr reopened this Jun 13, 2024
@matthiaskrgr
Copy link
Member Author

@estebank it happens everywhere, also #126426 for example.
fix is prepared in #126436

@GuillaumeGomez
Copy link
Member

To be clear: no idea either. This test was not updated in a long time, so it's surprising that it's breaking out of the blue.

@matthiaskrgr
Copy link
Member Author

@bors p=12 retry

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
.......... (120/124)
...F       (124/124)


/checkout/tests/rustdoc-gui/help-page.goml help-page... FAILED
[ERROR] `tests/rustdoc-gui/utils.goml` line 16
    from `tests/rustdoc-gui/help-page.goml` line 23
    from `tests/rustdoc-gui/help-page.goml` line 32: Error: Evaluation failed: The following errors happened: [localStorage item "rustdoc-theme" (of value "ayu") != "null"]: for command `assert-local-storage: {"rustdoc-theme": |theme|}`
Error: ()
Build completed unsuccessfully in 0:03:30
  local time: Thu Jun 13 22:59:35 UTC 2024
  network time: Thu, 13 Jun 2024 22:59:35 GMT

@bors
Copy link
Contributor

bors commented Jun 14, 2024

⌛ Testing commit 3494ea1 with merge bfa098e...

@bors
Copy link
Contributor

bors commented Jun 14, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing bfa098e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 14, 2024
@bors bors merged commit bfa098e into rust-lang:master Jun 14, 2024
9 of 13 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 14, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#123726 Clarify Command::new behavior for programs with arguments f682583cfa768e21ee330b1a02d1f66cf89aa4f8 (link)
#126088 [1/2] clean-up / general improvements 0d82ff07a520ea722e40831d9c867d964ed8664e (link)
#126238 Fix Miri sysroot for x run f7c804fd21ff3b0ade598deacc9afb0386d1512b (link)
#126315 Add pub struct with allow(dead_code) into worklist 1d675b2f814482cba3f53529b2a837ab2d19f260 (link)
#126360 Uplift structural_traits.rs into the new trait solver d055c3016d3f87fd70ddc404871fd05cade6ec3f (link)
#126371 Tweak output of import suggestions a198af33e69911ebac280c904c8cb3253fca6596 (link)
#126388 const-eval: make lint scope computation consistent 851128db9225ea3b9338ad920921d72afd03eacc (link)
#126390 Fix wording in {checked_}next_power_of_two 31650c78dc2d25a67d0ffc0bf054d4e3510f41df (link)
#126392 Small style improvement in gvn.rs 85c3229ffc66aab2e5f37917f8249cdb72e99a93 (link)
#126402 Fix wrong assert_unsafe_precondition message for `core::p… a1c9368e47a29c1e147b6257bfcaf3258cd842ac (link)

previous master: 0ef0dd2451

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bfa098e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results (secondary 0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.0% [0.0%, 0.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Bootstrap: 671.505s -> 670.207s (-0.19%)
Artifact size: 320.37 MiB -> 319.70 MiB (-0.21%)

@matthiaskrgr matthiaskrgr deleted the rollup-856xt18 branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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. 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
Development

Successfully merging this pull request may close these issues.