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 9 pull requests #126886

Closed
wants to merge 21 commits into from
Closed

Rollup of 9 pull requests #126886

wants to merge 21 commits into from

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

devnexen and others added 21 commits June 21, 2024 21:22
@devnexen
std::unix::fs: copy simplification for apple.
65530ba 
since we do support from macOs Sierra, we avoid the little runtime overhead
with the fclonefileat symbol check.
cargo update
9905357 
     Locking 9 packages to latest compatible versions
    Updating clap_complete v4.5.5 -> v4.5.6
    Updating displaydoc v0.2.4 -> v0.2.5
    Removing icu_collections v1.5.0
    Removing icu_normalizer v1.5.0
    Removing icu_normalizer_data v1.5.0
    Removing icu_properties v1.5.0
    Removing icu_properties_data v1.5.0
 Downgrading idna v1.0.0 -> v0.5.0 (latest: v1.0.1)
    Updating lazy_static v1.4.0 -> v1.5.0
    Updating miniz_oxide v0.7.3 -> v0.7.4
    Updating proc-macro2 v1.0.85 -> v1.0.86
    Updating syn v2.0.66 -> v2.0.67
      Adding unicode-bidi v0.3.15
    Updating url v2.5.1 -> v2.5.2
    Removing utf16_iter v1.0.5
    Removing utf8_iter v1.0.4
    Removing write16 v1.0.0
note: pass `--verbose` to see 85 unchanged dependencies behind latest
@surechen
For [E0308]: mismatched types, when expr is in an arm's body, not add…
e8b5ba1 
… semicolon ';' at the end of it.

fixes rust-lang#126222
@workingjubilee
compiler: Fix arm32 asm issues by hierarchically sorting reg classes
0d8f734
@devnexen
std::unix::os::home_dir: fallback's optimisation.
bd9ce3e 
we're using a guaranteed initialised field on success.
@devnexen
fix build
fc50aca
@GuillaumeGomez
Add ar_command in run_make_support
29113bf
@GuillaumeGomez
Migrate run-make/invalid-library to rmake.rs
10990e2
@heiher
ci: Add support for dist-loongarch64-musl
03d73fa
@heiher
Promote loongarch64-unknown-linux-musl to Tier 2 with host tools
16fef40 
MCP: rust-lang/compiler-team#753
@compiler-errors
Implement use<> formatting in rustfmt
a426d6f
@carbotaniuman
Add hard error and migration lint for unsafe attrs
a23917c
@workingjubilee
Rollup merge of rust-lang#126177 - carbotaniuman:unsafe_attr_errors, …
057236a 
…r=jieyouxu

Add hard error and migration lint for unsafe attrs

More implementation work for rust-lang#123757

This adds the migration lint for unsafe attributes, as well as making it a hard error in Rust 2024.
@workingjubilee
Rollup merge of rust-lang#126298 - heiher:loongarch64-musl-ci, r=Mark…
6ec7f2a 
…-Simulacrum

Promote loongarch64-unknown-linux-musl to Tier 2 with host tools

MCP: rust-lang/compiler-team#753
Tracking issue: rust-lang#122592

try-job: dist-loongarch64-musl
@workingjubilee
Rollup merge of rust-lang#126455 - surechen:fix_126222, r=estebank
fa5d4d0 
For [E0308]: mismatched types, when expr is in an arm's body, not add semicolon ';' at the end of it.

For [E0308]: mismatched types, when expr is in an arm's body, and it is the end expr without a semicolon of the block, not add semicolon ';' at the end of it.

fixes rust-lang#126222

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
@workingjubilee
Rollup merge of rust-lang#126754 - compiler-errors:use-rustfmt, r=cal…
91168f2 
…ebcartwright

Implement `use<>` formatting in rustfmt

This PR implements formatting for precise-capturing `use<>` syntax as proposed in rust-lang#126753.

The syntax is implemented as-if the `use<>` bound were a trait bound but with the `use` keyword as its path segment identifier.

I opted to develop this in the rust-lang/rust tree since I'm not certain when the next rustfmt subtree sync is going to be, and I'd rather not block landing nightly support for `use<>` on something I have no control over. If `@rust-lang/rustfmt` would rather I move this PR over to that repository, then I would at least like to know when the next rustfmt->rust subtree sync is going to be, since stabilizing `precise_capturing` without formatting will be disruptive.

This implementation is otherwise rather straightforward.

Tracking:

- rust-lang#123432
@workingjubilee
Rollup merge of rust-lang#126807 - devnexen:copy_file_macos_simpl, r=…
07ed427 
…Mark-Simulacrum

std::unix::fs: copy simplification for apple.

since we do support from macOs Sierra, we avoid the little runtime overhead with the fclonefileat symbol check.
@workingjubilee
Rollup merge of rust-lang#126845 - rust-lang:cargo_update, r=Mark-Sim…
3005eed 
…ulacrum

Weekly `cargo update`

Automation to keep dependencies in `Cargo.lock` current.

The following is the output from `cargo update`:

```txt
     Locking 9 packages to latest compatible versions
    Updating clap_complete v4.5.5 -> v4.5.6
    Updating displaydoc v0.2.4 -> v0.2.5
    Removing icu_collections v1.5.0
    Removing icu_normalizer v1.5.0
    Removing icu_normalizer_data v1.5.0
    Removing icu_properties v1.5.0
    Removing icu_properties_data v1.5.0
 Downgrading idna v1.0.0 -> v0.5.0 (latest: v1.0.1)
    Updating lazy_static v1.4.0 -> v1.5.0
    Updating miniz_oxide v0.7.3 -> v0.7.4
    Updating proc-macro2 v1.0.85 -> v1.0.86
    Updating syn v2.0.66 -> v2.0.67
      Adding unicode-bidi v0.3.15
    Updating url v2.5.1 -> v2.5.2
    Removing utf16_iter v1.0.5
    Removing utf8_iter v1.0.4
    Removing write16 v1.0.0
note: pass `--verbose` to see 85 unchanged dependencies behind latest
```
@workingjubilee
Rollup merge of rust-lang#126849 - workingjubilee:correctly-classify-…
dcd2d6e 
…arm-low-dregs, r=Amanieu

Fix 32-bit Arm reg classes by hierarchically sorting them

We were rejecting legal `asm!` because we were asking for the "greatest" feature that includes a register class, instead of the "least" feature that includes a register class. This was only revealed on certain 32-bit Arm targets because not all have the same register limitations.

This is a somewhat hacky solution, but other solutions would require potentially rearchitecting how the internals of parsing or rejecting register classes work for all targets.

Fixes rust-lang#126797

r​? `@Amanieu`
@workingjubilee
Rollup merge of rust-lang#126854 - devnexen:std_unix_os_fallback_upd,…
12d7736 
… r=Mark-Simulacrum

std::unix::os::home_dir: fallback's optimisation.

we're using a guaranteed initialised field on success.
@workingjubilee
Rollup merge of rust-lang#126861 - GuillaumeGomez:migrate-run-make-in…
969bbc6 
…valid-library, r=Kobzol

Migrate `run-make/invalid-library` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 Jun 24, 2024
@workingjubilee
Copy link
Member Author

@bors rollup=never p=9 r+

@bors
Copy link
Contributor

bors commented Jun 24, 2024

📌 Commit 969bbc6 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 Jun 24, 2024
@bors
Copy link
Contributor

bors commented Jun 24, 2024

⌛ Testing commit 969bbc6 with merge bb6d372...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2024
@bors
Auto merge of rust-lang#126886 - workingjubilee:rollup-e6ar0vq, r=wor…
bb6d372 
…kingjubilee

Rollup of 9 pull requests

Successful merges:

 - rust-lang#126177 (Add hard error and migration lint for unsafe attrs)
 - rust-lang#126298 (Promote loongarch64-unknown-linux-musl to Tier 2 with host tools)
 - rust-lang#126455 (For [E0308]: mismatched types, when expr is in an arm's body, not add semicolon ';' at the end of it.)
 - rust-lang#126754 (Implement `use<>` formatting in rustfmt)
 - rust-lang#126807 (std::unix::fs: copy simplification for apple.)
 - rust-lang#126845 (Weekly `cargo update`)
 - rust-lang#126849 (Fix 32-bit Arm reg classes by hierarchically sorting them)
 - rust-lang#126854 (std::unix::os::home_dir: fallback's optimisation.)
 - rust-lang#126861 (Migrate `run-make/invalid-library` to `rmake.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
---- [run-make] tests\run-make\invalid-library stdout ----

error: rmake recipe failed to complete
status: exit code: 101
command: "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\run-make\\invalid-library\\invalid-library\\rmake.exe"
--- stderr -------------------------------
thread 'main' panicked at C:\a\rust\rust\tests\run-make\invalid-library\rmake.rs:6:5:
failed to retrieve environment variable "AR": NotPresent
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---
test result: FAILED. 259 passed; 1 failed; 94 ignored; 0 measured; 0 filtered out; finished in 83.16s

Some tests failed in compiletest suite=run-make mode=run-make host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc
Build completed unsuccessfully in 1:24:55
make: *** [Makefile:102: ci-msvc-ps1] Error 1
  network time: Mon, 24 Jun 2024 04:16:50 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

@bors
Copy link
Contributor

bors commented Jun 24, 2024

💔 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 Jun 24, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 24, 2024
Merged
@workingjubilee workingjubilee deleted the rollup-e6ar0vq branch June 24, 2024 07:36
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-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like rollup A PR which is a rollup 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.