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

Merged
merged 10 commits into from
Apr 21, 2024
Merged

Rollup of 4 pull requests #124222

merged 10 commits into from
Apr 21, 2024

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 10 commits April 17, 2024 14:04
@onur-ozkan
enable clippy for bootstrap on CI PRs
214bf5a 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
fix clippy warnings on bootstrap
c5fdb39 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@gurry
Suggest using unsigned_abs in abs documentation
02ac46c
@compiler-errors
Flip spans for precise capturing syntax not capturing a ty/ct param
fa0428c
@compiler-errors
Explicitly mention Self
57085a0
@simlay
Fix watchOS and visionOS for pread64 and pwrite64 calls
fa53b9f 
* Refactor apple OSs  to use pwritev and preadv rather pwritev64 and preadv64
* Updated the comments for preadv and pwritev
@GuillaumeGomez
Rollup merge of rust-lang#124069 - onur-ozkan:run-clippy-on-bootstrap…
f122a51 
…, r=albertlarsan68

enable clippy for bootstrap on CI PRs (in `mingw-check` image)

Let's keep the bootstrap codebase cleaner.
@GuillaumeGomez
Rollup merge of rust-lang#124089 - simlay:fix-preadv64-and-pwritev64-…
9efd147 
…link-for-watchos-and-visionos, r=workingjubilee

Fix watchOS and visionOS for pread64 and pwrite64 calls

In rust-lang#122880, links to `preadv64` and `pwritev64` were added for `watchOS` however the underlying [`weak!` macro did not include `target_os = "watchos"`](https://github.com/rust-lang/rust/blob/c45dee5efd0c042e9d1e24559ebd0d6424d8aa70/library/std/src/sys/pal/unix/weak.rs#L30-L74).

This resulted in an `xcodebuild` error when targeting `watchOS`:
```
Undefined symbols for architecture arm64:
  "_preadv64", referenced from:
      __rust_extern_with_linkage_preadv64 in libliveview_native_core.a[274](std-324fdd8d31e8eaa2.std.e18cf7e8d0336778-cgu.08.rcgu.o)
  "_pwritev64", referenced from:
      __rust_extern_with_linkage_pwritev64 in libliveview_native_core.a[274](std-324fdd8d31e8eaa2.std.e18cf7e8d0336778-cgu.08.rcgu.o)
ld: symbol(s) not found for architecture arm64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
```

So I added them. I also went ahead and added the same for visionOS because it's bound to create the same issue.
@GuillaumeGomez
Rollup merge of rust-lang#124184 - gurry:124152-suggest-unsigned-abs-…
24b8c54 
…in-abs-doc, r=jhpratt

Suggest using `unsigned_abs` in `abs` documentation

Fixes rust-lang#124152
@GuillaumeGomez
Rollup merge of rust-lang#124198 - compiler-errors:improve-ty-ct-para…
43d5e00 
…m-span, r=Nadrieril

Flip spans for precise capturing syntax not capturing a ty/const param, and for implicit captures of lifetime params

Make the primary span point to the opaque, rather than the param which might be very far away (e.g. in an impl header hundreds of lines above).
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like 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-infra Relevant to the infrastructure 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 Apr 21, 2024
@GuillaumeGomez
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Apr 21, 2024

📌 Commit 43d5e00 has been approved by GuillaumeGomez

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 Apr 21, 2024
@bors
Copy link
Contributor

bors commented Apr 21, 2024

⌛ Testing commit 43d5e00 with merge aa31bad...

@bors
Copy link
Contributor

bors commented Apr 21, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing aa31bad to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Apr 21, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing aa31bad to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Apr 21, 2024
@bors bors merged commit aa31bad into rust-lang:master Apr 21, 2024
13 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 21, 2024
@GuillaumeGomez GuillaumeGomez deleted the rollup-ws1zju7 branch April 21, 2024 15:09
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#124069 enable clippy for bootstrap on CI PRs (in mingw-check ima… eb0b604fbf4c3cac87d64d90b06cb9644162173a (link)
#124089 Fix watchOS and visionOS for pread64 and pwrite64 calls 82257ad6f7d7ce07f99b3d89c3b9da60e6b33eed (link)
#124184 Suggest using unsigned_abs in abs documentation 197c6b33b1694e3ee25b78fdb8e46e4224532e1d (link)
#124198 Flip spans for precise capturing syntax not capturing a ty/… ea631dca3d7b74404e514cbc79219b37fa9f5a86 (link)

previous master: fecb7b4309

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

Overall result: ✅ improvements - 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
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.3% [-0.3%, -0.3%] 1
Improvements ✅
(secondary)		 -1.2% [-1.2%, -1.2%] 1
All ❌✅ (primary) -0.3% [-0.3%, -0.3%] 1

Max RSS (memory usage)

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

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)		 -0.7% [-0.7%, -0.7%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 672.598s -> 671.849s (-0.11%)
Artifact size: 315.25 MiB -> 315.25 MiB (0.00%)

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-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like 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-infra Relevant to the infrastructure 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
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@GuillaumeGomez @bors @rust-timer @rustbot @onur-ozkan @gurry @compiler-errors @simlay