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

Merged
merged 12 commits into from
Oct 20, 2024
Merged

Rollup of 4 pull requests #131958

merged 12 commits into from
Oct 20, 2024

Conversation

Zalathar
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

workingjubilee and others added 12 commits October 18, 2024 17:46
Migrate `llvm::set_comdat` and `llvm::SetUniqueComdat` to LLVM-C FFI.

Note, now we can call `llvm::set_comdat` only when the target actually
supports adding comdat. As this has no convenient LLVM-C API, we
implement this as `TargetOptions::supports_comdat`.

Co-authored-by: Stuart Cook <[email protected]>
…r=Zalathar

compiler: Use LLVM's Comdat support

Acting on these long-ago issues:
- rust-lang#46437
- rust-lang#68955
…-tidy, r=clubby789

compiletest: disambiguate html-tidy from rust tidy tool

when i first saw this error message i was very confused, i thought it was talking about `src/tools/tidy`.  now it should be much more clear what tool should be installed.
…=lukas-code,lnicola

compiler: Adopt rust-analyzer impls for `LayoutCalculatorError`

We're about to massively churn the internals of `rustc_abi`. To minimize the immediate and future impact on rust-analyzer, as a subtree that depends on this crate, grow some API on `LayoutCalculatorError` that reflects their uses of it. This way we can nest the type in theirs, and they can just call functions on it without having to inspect and flatten-out its innards.
…riddle

rustdoc: Clean up footnote handling

Best reviewed commit by commit.

Extracts footnote handling logic into it's own file (first commit) and then makes that file slightly nicer to read/understand.

No functional changes, but lays the groundwork for making more changes to footnotes (eg rust-lang#131901, rust-lang#131946)
@rustbot rustbot added A-compiletest Area: The compiletest test runner 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 20, 2024
@Zalathar
Copy link
Contributor Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Oct 20, 2024

📌 Commit 456821b has been approved by Zalathar

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

bors commented Oct 20, 2024

⌛ Testing commit 456821b with merge d68c327...

@bors
Copy link
Contributor

bors commented Oct 20, 2024

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing d68c327 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2024
@bors bors merged commit d68c327 into rust-lang:master Oct 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 20, 2024
@Zalathar Zalathar deleted the rollup-gkuk3n1 branch October 20, 2024 05:55
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#131876 compiler: Use LLVM's Comdat support d653e1c696882cefbb6c9371b14e7660132ed72f (link)
#131941 compiletest: disambiguate html-tidy from rust tidy tool ad2a9298a6b978a4d677d2caef3098c3ffb0f82b (link)
#131942 compiler: Adopt rust-analyzer impls for `LayoutCalculatorEr… 9b651a426596a290d69310560ffed2c9657e6806 (link)
#131945 rustdoc: Clean up footnote handling b86e2245737c6332c4fb53904ca1b54b0511937e (link)

previous master: 54791efd82

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 (d68c327): 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: 782.091s -> 780.931s (-0.15%)
Artifact size: 333.78 MiB -> 333.70 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants