Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rollup of 5 pull requests #128298

Merged
merged 16 commits into from
Jul 28, 2024
Merged

Rollup of 5 pull requests #128298

merged 16 commits into from
Jul 28, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

folkertdev and others added 16 commits July 16, 2024 22:06
- merge error codes
- use attribute name that is incompatible in error message
- add test for conditional incompatible attribute
- add `linkage` to the allowlist
based on the module comment in
rust/compiler/rustc_target/src/spec/mod.rs

Fixes rust-lang#128280
…ssages, r=bjorn3

`#[naked]`: report incompatible attributes

tracking issue: rust-lang#90957

this is a re-implementation of rust-lang#93809 by ``@bstrie`` which was closed 2 years ago due to inactivity.

This PR takes some of the final comments into account, specifically providing a little more context in error messages, and using an allow list to determine which attributes are compatible with `#[naked]`.

Notable attributes that are incompatible with `#[naked]` are:

  * `#[inline]`
  * `#[track_caller]`
  * ~~`#[target_feature]`~~ (this is now allowed, see PR discussion)
  * `#[test]`, `#[ignore]`, `#[should_panic]`

These attributes just directly conflict with what `#[naked]` should do.

Naked functions are still important for systems programming, embedded, and operating systems, so I'd like to move them forward.
Add a README to rustbook to explain its purpose

This adds a README to the rustbook tool to help explain what it is for and how to use it.
Stabilize `is_sorted`

Closes: rust-lang#53485.

~~Question: does~~ https://github.com/rust-lang/rust/blob/8fe0c753f23e7050b87a444b6622caf4d2272d5d/compiler/rustc_lint_defs/src/builtin.rs#L1986-L1994 ~~need a new example?~~
edit: It causes a test failure and needs to be changed anyway.

``@rustbot`` label: +T-libs-api

r? libs-api
…bilee

bitwise and bytewise methods on `NonZero`

Implementation for `nonzero_bitwise`
Tracking issue rust-lang#128281
ACP rust-lang/libs-team#413
… r=jieyouxu

rustc book: document how the RUST_TARGET_PATH variable is used

based on the module comment in
rust/compiler/rustc_target/src/spec/mod.rs

Fixes rust-lang#128280
@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. 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 28, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 28, 2024

📌 Commit b801fab 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 28, 2024
@bors
Copy link
Contributor

bors commented Jul 28, 2024

⌛ Testing commit b801fab with merge 3954398...

@bors
Copy link
Contributor

bors commented Jul 28, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2024
@bors bors merged commit 3954398 into rust-lang:master Jul 28, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 28, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#127853 #[naked]: report incompatible attributes a49f0521a8b43d20aa57e636492876d3fe193eab (link)
#128276 Add a README to rustbook to explain its purpose 8e07afa6283f2655f3baa07c678760d4e2c5a3d6 (link)
#128279 Stabilize is_sorted 5b9c33c3cd34d40a5dbd7ef301aed814016af756 (link)
#128282 bitwise and bytewise methods on NonZero 066753d2e594850143a376104429dbf158b56988 (link)
#128285 rustc book: document how the RUST_TARGET_PATH variable is u… fea1e00b537f3f9e63c5ce5a561194a73e012a41 (link)

previous master: 0bb6fec1c9

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 (3954398): 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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)
0.7% [0.7%, 0.7%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [0.2%, 0.2%] 1

Max RSS (memory usage)

Results (primary -2.5%, secondary 3.8%)

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

Cycles

Results (secondary -2.4%)

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)
-2.4% [-4.2%, -1.5%] 12
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 772.73s -> 770.349s (-0.31%)
Artifact size: 331.60 MiB -> 331.55 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-0wdu2wo branch September 1, 2024 17:35
# for free to join this conversation on GitHub. Already have an account? # 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. 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