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 5 pull requests #124424

Merged
merged 14 commits into from
Apr 27, 2024
Merged

Rollup of 5 pull requests #124424

merged 14 commits into from
Apr 27, 2024

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Apr 26, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 14 commits April 24, 2024 19:59
Macro calls are ephemeral, they should not add anything to the definition tree, even if their AST could contains something with identity.
Thankfully, macro call AST cannot contain anything like that, so these walks are just noops.
In majority of other places in def_collector / build_reduced_graph they are already not visited.

(Also, a minor match reformatting is included.)
For code clarity.
Making this a proper struct, and giving its fields names, makes things
easier to understand.
These functions are only used in `rustc_builtin_macros`, so it makes
sense for them to live there. This allows them to be changed from `pub`
to `pub(crate)`.
…r-errors

resolve: Remove two cases of misleading macro call visiting

Macro calls are ephemeral, they should not add anything to the definition tree, even if their AST could contains something with identity.
Thankfully, macro call AST cannot contain anything like that, so these walks are just noops.
In majority of other places in def_collector / build_reduced_graph they are already not visited.

(Also, a minor match reformatting is included.)
…s, r=jieyouxu

Port run-make `--print=native-static-libs` to rmake.rs

This PR port the run-make `--print=native-static-libs` test to rmake.rs

The dedup was really awful in the `Makefile`, I'm glad to finally have a proper dedup detection for this.

Related to rust-lang#121876

r? `@jieyouxu`
…s, r=fee1-dead

`rustc_builtin_macros` cleanups

Some improvements I found while looking over this code.

r? ``@fee1-dead``
…strieb

PathBuf: replace transmuting by accessor functions

The existing `repr(transparent)` was anyway insufficient as `OsString` was not `repr(transparent)`. And furthermore, on Windows it was blatantly wrong as `OsString` wraps `Wtf8Buf` which is a `repr(Rust)` type with 2 fields:

https://github.com/rust-lang/rust/blob/51a7396ad3d78d9326ee1537b9ff29ab3919556f/library/std/src/sys_common/wtf8.rs#L131-L146

So let's just be honest about what happens and add accessor methods that make this abstraction-breaking act of PathBuf visible on the APIs that it pierces through.

Fixes rust-lang#124409
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 26, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Apr 26, 2024

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 26, 2024

📌 Commit 7cbba53 has been approved by jhpratt

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

bors commented Apr 27, 2024

⌛ Testing commit 7cbba53 with merge 80d1c83...

@bors
Copy link
Contributor

bors commented Apr 27, 2024

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 80d1c83 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 27, 2024
@bors bors merged commit 80d1c83 into rust-lang:master Apr 27, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 27, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#124341 resolve: Remove two cases of misleading macro call visiting 0eaced33a707a3d77947115b54a4bad582d12d5d (link)
#124383 Port run-make --print=native-static-libs to rmake.rs 80b66959d23dd1c42500b70ce38fd6e6b40f5eb7 (link)
#124391 rustc_builtin_macros cleanups bf9c8b48680e28585ada4de804d0855e97a23022 (link)
#124408 crashes: add more tests 3ebac652a07b0d0b9aa37e2021f73fd155d42dcc (link)
#124410 PathBuf: replace transmuting by accessor functions 21d7a1fe4a2b57abb85dee35a364c9fd85da8ffc (link)

previous master: aa6a8ee270

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 (80d1c83): 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: 673.585s -> 672.763s (-0.12%)
Artifact size: 315.93 MiB -> 315.92 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-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-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