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

Merged
merged 15 commits into from
Jul 26, 2023
Merged

Rollup of 7 pull requests #114103

merged 15 commits into from
Jul 26, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

devnexen and others added 15 commits March 8, 2023 19:24
supported since the 12th release, while 11.4 is EOL since 2021.
CMAKE_SYSTEM_NAME is defined on a cross build if the target is
recognized.  Without this explicit definition cmake will assume that
we're building for the host platform which can bring in unwanted
compiler and linker flags.

Also, add a warning on cross builds with unknown target to aid in
cross builds for future platforms.
Now that we have fixed the underlying cause of long type name
inconsistencies in rust-lang#113893, we can remove the remap-path-prefix logic
from CI
…ngjubilee

rand: freebsd update, using getrandom.

supported since the 12th release, while 11.4 is EOL since 2021.
Add Param and Bound ty to SMIR

r? ``@oli-obk``
…ee1-dead

Squelch a noisy rustc_expand unittest

The test `rustc_parse::tests::bad_path_expr_1` prints an error message to stderr, circumventing libtest's stderr intercept. This causes noise when running tests, in particular they show up 16 times on the GitHub Actions summary page. The solution here is to not use an error emitter that prints to stderr, and instead check that the correct error is generated.
…e-system-name, r=ozkanonur

Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly.

Without `CMAKE_SYSTEM_NAME` set to the target  a cross compile will generally fail.  Related to rust-lang#109170.
Add `sym::iter_mut` + `sym::as_mut_ptr` for Clippy

We currently have `sym::iter` and `sym::iter_repeat`, this PR adds `sym::iter_mut` as it's useful for rust-lang/rust-clippy#11038 and another Clippy lint, it also adds `sym::as_mut_ptr` as it's useful for rust-lang/rust-clippy#10962.
…=fee1-dead

Remove -Z diagnostic-width

This removes the `-Z diagnostic-width` option since it is ignored and does nothing. `-Z diagnostic-width` was stabilized as `--diagnostic-width` in rust-lang#95635. It is not entirely clear why the `-Z` flag was kept, but in part its final use was removed in rust-lang#102216, but the `-Z` flag itself was not removed.
…ci, r=wesleywiser

compiletest: remove ci-specific remap-path-prefix

Now that we have fixed the underlying cause of long type name inconsistencies in rust-lang#113893, we can remove the remap-path-prefix logic from CI

resolves rust-lang#113424
@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 Jul 26, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jul 26, 2023

📌 Commit a1956e2 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 Jul 26, 2023
@bors
Copy link
Contributor

bors commented Jul 26, 2023

⌛ Testing commit a1956e2 with merge fb7e6d0...

@bors
Copy link
Contributor

bors commented Jul 26, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 26, 2023
@bors bors merged commit fb7e6d0 into rust-lang:master Jul 26, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 26, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#101994 rand: freebsd update, using getrandom. 9e8e9b6802e5e02ce31674cbfd71164e1c91b4e7 (link)
#113930 Add Param and Bound ty to SMIR 556d837ea1cf094027b1a54f9d5a1f2cc35cdee3 (link)
#113942 Squelch a noisy rustc_expand unittest c757bcf0cec8bb7fbe52d64b025a2d75a08ab864 (link)
#113996 Define CMAKE_SYSTEM_NAME on a cross build targeting DragonF… eeaf072844cf7afd1d6d0ed7e4f75a3a63206897 (link)
#114070 Add sym::iter_mut + sym::as_mut_ptr for Clippy 3dec648474bd270ddeffe23a84a7fcfa1153ad75 (link)
#114073 Remove -Z diagnostic-width fd4c953a52f2ddd71d1dff583ba4a5accdbf93e7 (link)
#114090 compiletest: remove ci-specific remap-path-prefix 156a01fcbba6993c1b7d6b93dcb0b9523673faa2 (link)

previous master: 6908c73ab0

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 (fb7e6d0): 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)
3.1% [3.1%, 3.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-2.7%, -2.7%] 1
All ❌✅ (primary) - - 0

Cycles

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)
- - 0
Improvements ✅
(secondary)
-3.0% [-4.3%, -2.0%] 19
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 650.44s -> 649.74s (-0.11%)

@matthiaskrgr matthiaskrgr deleted the rollup-01m6l2w branch March 16, 2024 18:18
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 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants