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.

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

Rollup of 11 pull requests #132497

Merged
merged 27 commits into from
Nov 2, 2024
Merged

Rollup of 11 pull requests #132497

merged 27 commits into from
Nov 2, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tshepang and others added 27 commits October 29, 2024 23:57
The OS version depends on the deployment target environment variables,
the access of which we want to move to later in the compilation pipeline
that has access to more information, for example `env_depinfo`.
To align with the general decision to have this sort of information
there instead.

Also use the visionOS values added in newer `object` release.
This adds a bunch of missing mailmap entries for many people. These are
needed when using rust-lang/team information in rust-lang/thanks, as the
emails there may differ.

These are all the "easy" ones, where there was a mailmap entry already,
making it clear which one is the preferred email address.
…g, r=petrochenkov

Move versioned Apple LLVM targets from `rustc_target` to `rustc_codegen_ssa`

Fully specified LLVM targets contain the OS version on macOS/iOS/tvOS/watchOS/visionOS, and this version depends on the deployment target environment variables like `MACOSX_DEPLOYMENT_TARGET`, `IPHONEOS_DEPLOYMENT_TARGET` etc.

We would like to move this to later in the compilation pipeline, both because it feels impure to access environment variables when fetching target information, but mostly because we need access to more information from rust-lang#130883 to do rust-lang#118204. See also rust-lang#129342 (comment) for some discussion.

The first and second commit does the actual refactor, it should be a non-functional change, the third commit adds diagnostics for invalid deployment targets, which are now possible to do because we have access to the session.

Tested with the same commands as in rust-lang#130435.

r? ``````@petrochenkov``````
…ieyouxu

Add a Few Codegen Tests

Closes rust-lang#86109
Closes rust-lang#64219

Those issues somehow got fixed over time.

So, this PR adds a couple of codegen tests to ensure we don't regress in the future.
rust_analyzer_helix.toml: add library/ manifest
…s, r=Kobzol

CI: switch dist-x86_64-musl to free runner

try-job: dist-x86_64-musl
…sparent, r=jieyouxu

Also treat `impl` definition parent as transparent regarding modules

This PR changes the `non_local_definitions` lint logic to also consider `impl` definition parent as transparent regarding modules.

See tests and explanation in the changes.

``````@rustbot`````` label +L-non_local_definitions
Fixes *(after beta-backport)* rust-lang#132427
cc ``````@leighmcculloch``````
r? ``````@jieyouxu``````
…gjubilee

Remove needless #![feature(asm_experimental_arch)] from loongarch64 inline assembly test

inline assembly is already stable on this architecture.
…e-fixme-comment-for-omit-git-hash, r=jieyouxu

refactor(config): remove FIXME statement in comment of `omit-git-hash`

It is already fixed.
…rrors

Account for late-bound depth when capturing all opaque lifetimes.

Fixes rust-lang#132429

r? ````@compiler-errors````
…ark-Simulacrum

Add a bunch of mailmap entries

This adds a bunch of missing mailmap entries for many people. These are needed when using rust-lang/team information in rust-lang/thanks (rust-lang/thanks#53), as the emails there may differ.

These are "easy" ones, where there was a mailmap entry already, making it clear which one is the preferred email address.
…=jieyouxu

Remove or fix some more `FIXME(async_closure)`

Self-explanatory
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) labels Nov 2, 2024
@rustbot rustbot added 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 Nov 2, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=11

@bors
Copy link
Contributor

bors commented Nov 2, 2024

📌 Commit 30497b0 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 Nov 2, 2024
@bors
Copy link
Contributor

bors commented Nov 2, 2024

⌛ Testing commit 30497b0 with merge 588a420...

@bors
Copy link
Contributor

bors commented Nov 2, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 2, 2024
@bors bors merged commit 588a420 into rust-lang:master Nov 2, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 2, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#131037 Move versioned Apple LLVM targets from rustc_target to `r… 055da9b091dac963fa44df20ba08cfafe4dace44 (link)
#132170 Add a Few Codegen Tests 268c1bd1d6dbaf77307914ea8ebf1a3d4ea12084 (link)
#132333 rust_analyzer_helix.toml: add library/ manifest 5e48a46ff76920c2d7d397add4a91f5002d6ea6c (link)
#132398 Add a couple of intra-doc links to str f46f4b27a03d5666b1b700751e6cf7bffbe3fd1b (link)
#132411 CI: switch dist-x86_64-musl to free runner d28351e23856474ec8b408426f1c3cdc6240cefa (link)
#132453 Also treat impl definition parent as transparent regardin… 1af467c2819008a21f2528f57f6596e0ebec7010 (link)
#132457 Remove needless #![feature(asm_experimental_arch)] from loo… e784706bf43fa395290d2aae7431042d2c23222d (link)
#132465 refactor(config): remove FIXME statement in comment of `omi… 2cc0ad4a288a81559739deaf8c0d2154e89aaf57 (link)
#132466 Account for late-bound depth when capturing all opaque life… bb4decc745771915914b5b532cdb576d0546ab86 (link)
#132471 Add a bunch of mailmap entries cac6a15ba52bf6dca08ed7d4943a1e49829b953d (link)
#132488 Remove or fix some more FIXME(async_closure) 48b3b544cd16bb6e2dbc48f3320eea97011b8aa6 (link)

previous master: b5f4883a06

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

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

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

Binary size

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

Bootstrap: 779.165s -> 780.173s (0.13%)
Artifact size: 335.32 MiB -> 335.37 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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
Development

Successfully merging this pull request may close these issues.