Skip to content

Cleanup codegen_fn_attrs#109091

Merged
bors merged 2 commits into
rust-lang:masterfrom
Noratrieb:match-on-attr
Mar 27, 2023
Merged

Cleanup codegen_fn_attrs#109091
bors merged 2 commits into
rust-lang:masterfrom
Noratrieb:match-on-attr

Conversation

@Noratrieb

Copy link
Copy Markdown
Member

The match control flow construct has been stable since 1.0, we should use it here.

Sorry for the hard to review diff, I did try to at least split it into two commits. But looking at before-after side-by-side (instead of whatever github is doing) is probably the easiest way to make sure that I didn't forget about anything.

On top of #109088, you can wait for that

@rustbot

rustbot commented Mar 13, 2023

Copy link
Copy Markdown
Collaborator

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@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. labels Mar 13, 2023
@Noratrieb Noratrieb added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 13, 2023
@Noratrieb Noratrieb added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 14, 2023
@Noratrieb Noratrieb added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 15, 2023
@cjgillot

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 18, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 1d70bd4 has been approved by cjgillot

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 Mar 18, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 20, 2023
Cleanup `codegen_fn_attrs`

The `match` control flow construct has been stable since 1.0, we should use it here.

Sorry for the hard to review diff, I did try to at least split it into two commits. But looking at before-after side-by-side (instead of whatever github is doing) is probably the easiest way to make sure that I didn't forget about anything.

On top of rust-lang#109088, you can wait for that
@matthiaskrgr

Copy link
Copy Markdown
Member

@Noratrieb

Copy link
Copy Markdown
Member Author

Hmm, doesn't seem that likely as it's happening when building LLVM, but I'll take another look here anyways.

@Noratrieb

Copy link
Copy Markdown
Member Author

I took another look at the diff and it all seemed fine to me, so I'll leave it open and we'll see whether it fails again or whether that was spurious or some other PR.

@bors

bors commented Mar 24, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1d70bd4 with merge c807155be55a3833d1b8290a928d9a45d236922f...

@bors

bors commented Mar 24, 2023

Copy link
Copy Markdown
Collaborator

💔 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 Mar 24, 2023
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@cjgillot

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Mar 25, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1d70bd4 with merge 1b866165b1836283a1f3551125717b2b6a2cf79a...

@bors

bors commented Mar 26, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2023
@ehuss

ehuss commented Mar 26, 2023

Copy link
Copy Markdown
Contributor

@bors retry

#108227 since LLVM update

@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 Mar 26, 2023
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
   Compiling regex v1.5.6
   Compiling rust-demangler v0.0.1 (/checkout/src/tools/rust-demangler)
[RUSTC-TIMING] rust_demangler test:false 0.558
[RUSTC-TIMING] regex_syntax test:false 8.485
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

@scottmcm

Copy link
Copy Markdown
Member

@bors p=101 (#109357 made it through, so let's give this one a shot 🤞)

@bors

bors commented Mar 26, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1d70bd4 with merge dfe4e76d991aab5ef43ed9430b2042b19f4c241c...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[2557/3103] Linking CXX static library lib\libLLVMPowerPCAsmParser.a
[2558/3103] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/LogBuilderConsumer.cpp.obj
[2559/3103] Linking CXX static library lib\libLLVMSparcAsmParser.a
FAILED: lib/libLLVMSparcAsmParser.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMSparcAsmParser.a && C:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMSparcAsmParser.a  lib/Target/Sparc/AsmParser/CMakeFiles/LLVMSparcAsmParser.dir/SparcAsmParser.cpp.obj && C:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMSparcAsmParser.a && cd ."
C:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2560/3103] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/RecordInitializer.cpp.obj
[2561/3103] Linking CXX static library lib\libLLVMRISCVDisassembler.a
[2562/3103] Linking CXX static library lib\libLLVMRISCVAsmParser.a
[2563/3103] Linking CXX static library lib\libLLVMRISCVTargetMCA.a
[2563/3103] Linking CXX static library lib\libLLVMRISCVTargetMCA.a
[2564/3103] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRTraceWriter.cpp.obj
[2565/3103] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/Trace.cpp.obj
[2566/3103] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/InstrumentationMap.cpp.obj
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
 finished in 332.201 seconds
Build completed unsuccessfully in 0:08:30

@bors

bors commented Mar 26, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2023
@scottmcm

Copy link
Copy Markdown
Member

@bors retry p=0

@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 Mar 26, 2023
@ehuss

ehuss commented Mar 27, 2023

Copy link
Copy Markdown
Contributor

@bors treeclosed-

#109643 should resolve the issue for now

@bors

bors commented Mar 27, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1d70bd4 with merge 7a06007...

@bors

bors commented Mar 27, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 7a06007 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 27, 2023
@bors bors merged commit 7a06007 into rust-lang:master Mar 27, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 27, 2023
@Noratrieb Noratrieb deleted the match-on-attr branch March 27, 2023 11:41
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (7a06007): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)
1.4% [0.4%, 2.5%] 15
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.8% [-3.8%, -3.8%] 1
All ❌✅ (primary) 1.4% [0.4%, 2.5%] 15

Cycles

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

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. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.