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 4 pull requests #117887

Merged
merged 9 commits into from
Nov 13, 2023
Merged

Rollup of 4 pull requests #117887

merged 9 commits into from
Nov 13, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Alex Zepeda and others added 9 commits July 29, 2023 14:37
getHostCPUName calls into libkstat but as of
LLVM 16.0.6 libLLVMTargetParser is not explicitly
linked against libkstat causing builds to fail
due to undefined symbols.

See also: llvm/llvm-project#64186
Suggestions are reordered to to make sure potential missing expect on Option/Result runs
before the suggestion to remove the last method call
This was broken by upstream
llvm/llvm-project@dc6d077. It's easy
enough to use a regex match to support both, so we do that.

r? @nikic
@rustbot label: +llvm-main
…rapper, r=cuviper

rustc_llvm: Link to libkstat on Solaris/SPARC

getHostCPUName calls into libkstat but as of
LLVM 16.0.6 libLLVMTargetParser is not explicitly
linked against libkstat causing builds to fail
due to undefined symbols.

See also: llvm/llvm-project#64186
…ver-last-method-call, r=compiler-errors

Reorder checks to make sure potential missing expect on Option/Result…

… runs before removing last method call

Fixes rust-lang#117669
tests: update check for inferred nneg on zext

This was broken by upstream
llvm/llvm-project@dc6d077. It's easy enough to use a regex match to support both, so we do that.

r? `@nikic`
`@rustbot` label: +llvm-main
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative rollup A PR which is a rollup labels Nov 13, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Nov 13, 2023

📌 Commit 6d5d509 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 Nov 13, 2023
@bors
Copy link
Contributor

bors commented Nov 13, 2023

⌛ Testing commit 6d5d509 with merge ba7c7a3...

@bors
Copy link
Contributor

bors commented Nov 13, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 13, 2023
@bors bors merged commit ba7c7a3 into rust-lang:master Nov 13, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 13, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#114224 rustc_llvm: Link to libkstat on Solaris/SPARC d60a7c2ee30a00a3810e5da73ead2df86c526802 (link)
#117695 Reorder checks to make sure potential missing expect on Opt… 0dbb0c387a9752504bca494d5ac032150baa125f (link)
#117870 fn args_ref_X to fn args_X fc735c4b5024f64ea6d1b877b8de14b0d024ed46 (link)
#117879 tests: update check for inferred nneg on zext a5628e3ea69c0361c53aef046381928f24b245e3 (link)

previous master: 85b8450466

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 (ba7c7a3): 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.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-0.6%, 0.6%] 2

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.8% [0.8%, 0.8%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.8% [0.8%, 0.8%] 1

Binary size

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

Bootstrap: 674.958s -> 674.708s (-0.04%)
Artifact size: 311.10 MiB -> 311.11 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-rgur03f branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants