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

Merged
merged 43 commits into from
Apr 16, 2024
Merged

Rollup of 10 pull requests #124026

merged 43 commits into from
Apr 16, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 30 commits March 17, 2024 16:41
Previously, we were checking the LLVM stamp before fetching the submodule
which leads to not being able to compile llvm on submodule updates.

Signed-off-by: onur-ozkan <[email protected]>
It's been 7 months since we deprecated this. It should be fine to remove it now.

Signed-off-by: onur-ozkan <[email protected]>
Windows: add basic support for FormatMessageW
Handle Miri sysroot entirely outside the Miri driver

(Extracted from rust-lang/miri#3409)

This entirely moves the responsibility of setting miri-sysroot to whatever *invokes* the Miri driver.  cargo-miri knows whether it is inside rustdoc or not and can adjust accordingly. I previously avoided doing that because there are a bunch of places that are invoking the driver (cargo-miri, the ui test suite, `./miri run`, `./x.py run miri`) and they all need to be adjusted now. But it is also somewhat less fragile as we usually have more information there -- and we can just decide that `./miri run file.rs --sysroot path` is not supported. The advantage of this is that the driver is reasonably clean and doesn't need magic environment variables like MIRI_SYSROOT, and we don't have to fight rustc_driver to use a different default sysroot. Everything is done in cargo-miri (and the other much simpler driver wrappers) where it can hopefully be debugged much better.
add some basic support for GetFullPathNameW

This is the last missing piece to make std `path::` tests work on Windows.
It will allow more flexible uses in the future. This makes `split_simd_to_128bit_chunks` simpler, moving some of the complexity to its callers.
We assert that we are in the new solver in the line above
Make `split_simd_to_128bit_chunks` take only one operand

It will allow more flexible uses in the future. This makes `split_simd_to_128bit_chunks` simpler, moving some of the complexity to its callers.
Rustfix remains TODO
The lint is unstable, and the lint group `rust_2024_compatibility` must keep working on stable
Co-authored-by: Guillaume Boisseau <[email protected]>
…ding_mode_2024, r=Nadrieril

Match ergonomics 2024: `mut` doesn't reset binding mode

r? ``@Nadrieril``

cc rust-lang#123076

``@rustbot`` label A-edition-2024 A-patterns
…albertlarsan68

drop `changelog-seen`

It's been 7 months since we deprecated this. It should be fine to remove it now.
…mpiler-errors

The new solver ignores `DefineOpaqueTypes`, so switch it to `Yes`

We assert that we are in the new solver in the line above

r? ``@compiler-errors``
…mpiler-errors

Change a diagnostics-path-only `DefineOpaqueTypes` to `Yes`.

This can't possibly affect compilation, so it's safe to flip, even if I couldn't come up with an affected test

r? ``@compiler-errors``
…i-obk

interpret: pass MemoryKind to before_memory_deallocation

This will be needed for rust-lang/miri#3475.

r? ``@oli-obk``
interpret: remove outdated comment

In rust-lang#107756, allocation became generally fallible, so the "only panic if there is provenance" no longer applies.

r? ``@oli-obk``
@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-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. rollup A PR which is a rollup labels Apr 16, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Apr 16, 2024

📌 Commit 4971d9f 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 16, 2024
@bors
Copy link
Contributor

bors commented Apr 16, 2024

⌛ Testing commit 4971d9f with merge 468f115...

@bors
Copy link
Contributor

bors commented Apr 16, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2024
@bors bors merged commit 468f115 into rust-lang:master Apr 16, 2024
13 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 16, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#122632 fetch submodule before checking llvm stamp b19896a3c8a83f9cfd3cd63ab756341ce563da6f (link)
#123355 Support type '/' to search 6297a309778fdb98bcaa159fec04f43dbb3f5ef6 (link)
#123501 Stabilize checking of cfgs at compile-time: --check-cfg o… c2a020cd8e183fb8a683fb22e0e49bd55c2c5022 (link)
#123535 Match ergonomics 2024: mut doesn't reset binding mode 42a3b5c68443888e321d446947686d9770e1801c (link)
#123711 drop changelog-seen e92ed7a387f5b72b8f376ead7cc6d1ef57e85278 (link)
#123969 The new solver ignores DefineOpaqueTypes, so switch it to… d5bd0d4fa7ff2b95a77d8becd21e6e5330f4a70f (link)
#124007 Miri subtree update 813e43cbdc85c7b8fa533a627032b3cf29e30e31 (link)
#124017 Change a diagnostics-path-only DefineOpaqueTypes to Yes. 53de808dacae65e7394e2447934525ab8222eee2 (link)
#124018 interpret: pass MemoryKind to before_memory_deallocation 0e034ff2c05f5044e6e6f4b29da2576778dd23f0 (link)
#124024 interpret: remove outdated comment 6ed8bcce5b7c2894e1fd2115042f234c2c6c1346 (link)

previous master: 1dea922ea6

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 (468f115): 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)

Results

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
Improvements ✅
(primary)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
-6.7% [-6.7%, -6.7%] 1
All ❌✅ (primary) -2.1% [-2.1%, -2.1%] 1

Cycles

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

Binary size

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

Bootstrap: 679.507s -> 677.864s (-0.24%)
Artifact size: 316.08 MiB -> 316.11 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-an6s6gq 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-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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.