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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #119009

Merged
merged 13 commits into from
Dec 16, 2023
Merged

Rollup of 6 pull requests #119009

merged 13 commits into from
Dec 16, 2023

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kai Luo and others added 13 commits December 12, 2023 10:20
Add xcoff support
d2402e3
@okaneco
Add ASCII whitespace trimming functions to &str
e4808af 
Add `trim_ascii_start`, `trim_ascii_end`, and `trim_ascii` functions to
`&str` for trimming ASCII whitespace under the `byte_slice_trim_ascii`
feature gate.
Add `inline` to `[u8]` `trim_ascii` functions
Use different cfg for AIX
9f64023
@jyn514
use if cfg instead of #[cfg]
4845665 
this pr is specifically for waffle because i love it <3
@matthiaskrgr
NFC: do not clone types that are copy
74d81d1
@matthiaskrgr
NFC don't convert types to identical types
8479945
@compiler-errors
Simplify lint decorator derive too
108bec6
@workingjubilee
Rollup merge of rust-lang#118523 - okaneco:trim_ascii, r=Mark-Simulacrum
15e84eb 
Add ASCII whitespace trimming functions to `&str`

- Add `trim_ascii_start`, `trim_ascii_end`, and `trim_ascii` functions to `&str` for trimming ASCII whitespace
- Add `#[inline]` to `[u8]` `trim_ascii` functions

These functions are feature-gated by `#![feature(byte_slice_trim_ascii)]` rust-lang#94035
@workingjubilee
Rollup merge of rust-lang#118851 - bzEq:std-xcoff, r=Mark-Simulacrum
6c2f00f 
[std] Add xcoff in object's feature list

object-0.32.0 has supported XCOFF format. And backtrace in submodule has been updated to support XCOFF and AIX. Add `xcoff` to supported feature list to make backtrace built on AIX.
@workingjubilee
Rollup merge of rust-lang#118989 - compiler-errors:lint-decorator-2, …
c7b492e 
…r=WaffleLapkin

Simplify lint decorator derive too

See last commit, since this is stacked on top of rust-lang#118727.

r? WaffleLapkin
@workingjubilee
Rollup merge of rust-lang#118993 - jyn514:cfg-color, r=WaffleLapkin,N…
30231d9 
…ilstrieb

use `if cfg!` instead of `#[cfg]`

this pr is specifically for waffle because i love it <3

fixes rust-lang#118756 (comment)

r? `@WaffleLapkin`
@workingjubilee
Rollup merge of rust-lang#119003 - matthiaskrgr:nein_clone, r=Nadrieril
c9ba458 
NFC: do not clone types that are copy
@workingjubilee
Rollup merge of rust-lang#119004 - matthiaskrgr:conv, r=compiler-errors
c5a3d98 
NFC don't convert types to identical types
@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. 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. rollup A PR which is a rollup labels Dec 16, 2023
@workingjubilee
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Dec 16, 2023

📌 Commit c5a3d98 has been approved by workingjubilee

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 Dec 16, 2023
@bors
Copy link
Contributor

bors commented Dec 16, 2023

⌛ Testing commit c5a3d98 with merge 1c6a061...

@bors
Copy link
Contributor

bors commented Dec 16, 2023

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 1c6a061 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 16, 2023
@bors bors merged commit 1c6a061 into rust-lang:master Dec 16, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 16, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#118523 Add ASCII whitespace trimming functions to &str e21968800faeb15ef117b3ba114af7364eb4f4f0 (link)
#118851 [std] Add xcoff in object's feature list eb3a4ab61215161fd678cb6e546f67cd6d787ec0 (link)
#118989 Simplify lint decorator derive too 4492c199693f64a112eb82696b8b9a3a9e4a84a9 (link)
#118993 use if cfg! instead of #[cfg] 58c8e35602f98c4eb837076afa2c46d2a0a5759d (link)
#119003 NFC: do not clone types that are copy 48c3e8626e3eb4e171bfa76fb396d3ea765db065 (link)
#119004 NFC don't convert types to identical types d1822c6893d7b2e102f0f7a6a7d1b1367ea0bade (link)

previous master: 5c927ab999

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 (1c6a061): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)		 0.4% [0.2%, 1.2%] 8
Improvements ✅
(primary)		 -1.3% [-1.9%, -0.9%] 8
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -1.1% [-1.9%, 0.2%] 9

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.9% [0.1%, 2.8%] 5
Regressions ❌
(secondary)		 2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)		 -1.1% [-1.1%, -1.1%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [-1.1%, 2.8%] 7

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.5% [0.4%, 0.8%] 4
Regressions ❌
(secondary)		 0.7% [0.7%, 0.7%] 1
Improvements ✅
(primary)		 -1.5% [-2.4%, -0.7%] 3
Improvements ✅
(secondary)		 -3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) -0.4% [-2.4%, 0.8%] 7

Binary size

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

Bootstrap: 672.112s -> 672.671s (0.08%)
Artifact size: 312.58 MiB -> 312.49 MiB (-0.03%)

@rustbot rustbot added the perf-regression Performance regression. label Dec 16, 2023
@workingjubilee workingjubilee deleted the rollup-ytexy6j branch December 16, 2023 17:55
@pnkfelix
Copy link
Member

The single tiny regression to exa doc full does not warrant spending time trying to tease apart this rollup, IMO.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Dec 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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. 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.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
9 participants
@workingjubilee @bors @rust-timer @pnkfelix @rustbot @okaneco @jyn514 @matthiaskrgr @compiler-errors