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

Merged
merged 21 commits into from
Jan 7, 2025
Merged

Rollup of 9 pull requests #135183

merged 21 commits into from
Jan 7, 2025

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Jan 7, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

BoxyUwU and others added 21 commits January 2, 2025 17:16
Gated behind an unstable `-Z emscripten-wasm-eh` flag
inline_threshold mark deprecated

no-stack-check

print deprecation message for -Car too

inline_threshold deprecated and do nothing: make in untracked

make OptionDesc struct from tuple
I'm also removing myself from the MIR syntax changes notifications.
Previously, the main content used "Aliased Type", while the sidebar said
"Aliased type". Now, they both say "Aliased Type", which is the more common
capitalization in Rustdoc.

See the following link for an example.
https://doc.rust-lang.org/1.83.0/std/io/type.Result.html
…kingjubilee

Add support for wasm exception handling to Emscripten target

This is a draft because we need some additional setting for the Emscripten target to select between the old exception handling and the new exception handling. I don't know how to add a setting like that, would appreciate advice from Rust folks. We could maybe choose to use the new exception handling if `Ctarget-feature=+exception-handling` is passed? I tried this but I get errors from llvm so I'm not doing it right.
Improve diagnostics for `HostEffectPredicate` in the new solver

Adds derived cause for host effect predicates. Some diagnostics regress, but that's connected to the fact that our predicate visitor doesn't play well with aliases just yet.
Release notes for 1.84.0

cc ``@rust-lang/release`` r? ``@Mark-Simulacrum``
…r=lcnr

Don't ice on bad transmute in typeck in new solver

Old trait solver ends up getting its infcx tainted because we try to normalize the type, but the new trait solver doesn't. This means we try to compute the stalled transmute obligations, which tries to normalize a type an ICEs. Let's make this a delayed bug.

r? lcnr
…-projection, r=lqd,jieyouxu

Suggest to replace tuple constructor through projection

See the code example. when `Self::Assoc` normalizes to a struct that has a tuple constructor, you cannot construct the type via `Self::Assoc(field, field)`. Instead, suggest to replace it with the correct named struct.

Fixes rust-lang#120871
rustdoc: Fix mismatched capitalization in sidebar

Previously, the main content used "Aliased Type", while the sidebar said "Aliased type". Now, they both say "Aliased Type", which is the more common capitalization in Rustdoc.

See the following link for an example.
https://doc.rust-lang.org/1.83.0/std/io/type.Result.html
…r=jieyouxu

mark deprecated option as deprecated in rustc_session to remove copypasta and small refactor

This marks deprecated options as deprecated via flag in options table in rustc_session, which removes copypasted deprecation text from rustc_driver_impl.

This also adds warning for deprecated `-C ar` option, which didn't emitted any warnings before.
Makes `inline_threshold` `[UNTRACKED]`, as it do nothing.
Adds few tests.

See individual commits.
[generic_assert] Constify methods used by the formatting system

cc rust-lang#44838

Starts the "constification" of all the elements required to allow the execution of the formatting system in constant environments.

```rust
const _: () = { panic!("{:?}", 1i32); };
```

Further stuff is blocked by rust-lang#133999.
…eyouxu

Update triagebot.toml: celinval vacation is over

I'm also removing myself from the MIR syntax changes notifications.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. T-release Relevant to the release subteam, 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jan 7, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Jan 7, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 7, 2025

📌 Commit ee55b34 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 Jan 7, 2025
@bors
Copy link
Contributor

bors commented Jan 7, 2025

⌛ Testing commit ee55b34 with merge 6f2ca60...

@bors
Copy link
Contributor

bors commented Jan 7, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 6f2ca60 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 7, 2025
@bors bors merged commit 6f2ca60 into rust-lang:master Jan 7, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 7, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#131830 Add support for wasm exception handling to Emscripten target 6a7bc3f4097f952cd5f69f6b74def43fa834b346 (link)
#132345 Improve diagnostics for HostEffectPredicate in the new so… a66ee16c9fd4b49d8e99d42cf5ff26472e341919 (link)
#134568 Release notes for 1.84.0 fb4c42c172a34bcdd054a4a6a53c7b0c0e7a6b87 (link)
#134744 Don't ice on bad transmute in typeck in new solver 8840e5bdd8aace3bba527b6db35bc6c67b86ff96 (link)
#135090 Suggest to replace tuple constructor through projection 0752fc28d86f57552693f6bde80055c875407db2 (link)
#135116 rustdoc: Fix mismatched capitalization in sidebar a859d9e084c42491bb988fcadc603fcea195d44b (link)
#135126 mark deprecated option as deprecated in rustc_session to re… f79948d8dac4ac15a4abc063354be6addcb8f853 (link)
#135139 [generic_assert] Constify methods used by the formatting sy… 84501098e4c923119499887f9e603af1f5ac6499 (link)
#135170 Update triagebot.toml: celinval vacation is over 3362650bad41403ef71ddb45821fe8091975c372 (link)

previous master: 0f1e965fec

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 (6f2ca60): 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)

Results (primary 3.5%, secondary -3.7%)

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)
3.5% [3.5%, 3.5%] 1
Regressions ❌
(secondary)
2.1% [2.0%, 2.1%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-6.7% [-9.5%, -1.0%] 4
All ❌✅ (primary) 3.5% [3.5%, 3.5%] 1

Cycles

Results (secondary -1.8%)

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

Binary size

Results (primary -0.0%)

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.0% [-0.1%, -0.0%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.0% [-0.1%, -0.0%] 2

Bootstrap: 763.24s -> 764.114s (0.11%)
Artifact size: 325.59 MiB -> 325.66 MiB (0.02%)

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 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-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. T-release Relevant to the release subteam, 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.