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 #121870

Merged
merged 29 commits into from
Mar 2, 2024
Merged

Rollup of 11 pull requests #121870

merged 29 commits into from
Mar 2, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RavuAlHemio and others added 29 commits February 26, 2024 15:35
Operations such as starts_with, ends_with, strip_prefix and strip_suffix
can be either strict (do not consider a slice to be a prefix/suffix of
itself) or not. In Rust's case, they are not strict. Add a few phrases to
the documentation to clarify this.
Reusing `self.test` wasn't actually pulling a lot of weight.
AIX ld needs special option to merge objects with profiling. Also,
profiler_builtins should include builtins for AIX from compiler-rt.
also change the number of allowed fixpoint steps to be fixed instead
of using the `log` of the total recursion depth.
Moves the sanitizer ui tests to the sanitizer directory and removes the
sanitizer prefix from tests file names similarly to how the sanitizer
codegen tests are organized.
When a trait bound error occurs, we look for alternative types that
would have made the bound succeed. For some reason `{type error}`
sometimes would appear as a type that would do so.

We now remove `{type error}` from the list in every case to avoid
nonsensical `note`s.
…tr-into-err, r=rustdoc

Made `INVALID_DOC_ATTRIBUTES` lint deny by default

Fixes rust-lang#82730.

# Explanations

The `INVALID_DOC_ATTRIBUTES` lint was marked as "will become a hard error into the future" for quite some time so making it `deny` by default.

<del>Waiting on rust-lang/backtrace-rs#524 for now.</del>
…tebank

Delete line if suggestion would replace it with an empty line

Fixes rust-lang#120296
…mismatch, r=estebank

Suggest removing superfluous semicolon when statements used as expression

Fixes rust-lang#105431

- it's not a pure recursive visitor, so I guess there may be some more complex scenarios not covered.
- moved `consider_removing_semicolon` to `compiler/rustc_infer` for reusing this helper function.
…recursion-limit, r=compiler-errors

`-Znext-solver=coherence`: suggest increasing recursion limit

r? `@compiler-errors`
…cs, r=cuviper

Clarify behavior of slice prefix/suffix operations in case of equality

Operations such as starts_with, ends_with, strip_prefix and strip_suffix can be either strict (do not consider a slice to be a prefix/suffix of itself) or not. In Rust's case, they are not strict. Add a few phrases to the documentation to clarify this.
… r=matthewjasper

match lowering: Remove hacky branch in sort_candidate

Reusing `self.test()` there wasn't actually pulling a lot of weight. In particular the `TestKind::Len` cases were all already correctly handled.

r? `@matthewjasper`
Add profiling support to AIX

AIX ld needs special option to merge objects with profiling. Also, profiler_builtins should include builtins for AIX from compiler-rt.
…jasper

match lowering: Separate the `bool` case from other integers in `TestKind`

`TestKind::SwitchInt` had a special case for `bool` essentially everywhere it's used, so I made `TestKind::If` to handle the bool case on its own.

r? `@matthewjasper`
…0277, r=compiler-errors

Never say "`Trait` is implemented for `{type error}`"

When a trait bound error occurs, we look for alternative types that would have made the bound succeed. For some reason `{type error}` sometimes would appear as a type that would do so.

We now remove `{type error}` from the list in every case to avoid nonsensical `note`s.
…sanitizer-directory, r=compiler-errors

Move sanitizer ui tests to sanitizer directory

Moves the sanitizer ui tests to the sanitizer directory and removes the sanitizer prefix from tests file names similarly to how the sanitizer codegen tests are organized.
Implement missing ABI structures in StableMIR

Add implementations for Scalar, Primitive and WrappingRange for StableMIR.

FYI, I thought about reusing the `rustc_abi` module, since it is designed to not necessarily depend on the `rustc` internals, but the maintenance burden to maintain this crate in crates.io doesn't seem worth it at this point.

Fixes rust-lang/project-stable-mir#58
@rustbot rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Mar 1, 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-libs Relevant to the library 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Mar 1, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=11

@bors
Copy link
Contributor

bors commented Mar 1, 2024

📌 Commit 63e916e 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 Mar 1, 2024
@bors
Copy link
Contributor

bors commented Mar 2, 2024

⌛ Testing commit 63e916e with merge eaee1e9...

@bors
Copy link
Contributor

bors commented Mar 2, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 2, 2024
@bors bors merged commit eaee1e9 into rust-lang:master Mar 2, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 2, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#111505 Made INVALID_DOC_ATTRIBUTES lint deny by default df7915c17db39ab70ad6dad9d4abddd3ec5f1484 (link)
#120305 Delete line if suggestion would replace it with an empty li… a670466ce7163507788405a37530a33f1a2bc806 (link)
#121153 Suggest removing superfluous semicolon when statements used… 60204fd0860e09f8d10c4d267cb83795bfa220f4 (link)
#121497 -Znext-solver=coherence: suggest increasing recursion lim… 81cfd5a14338ea8efdc3863cd6eb59a72ddbae73 (link)
#121634 Clarify behavior of slice prefix/suffix operations in case … cf2abbebf3bae3193c9f8951f13d8eba9350cd2f (link)
#121706 match lowering: Remove hacky branch in sort_candidate de072942bafb18407a7fcecffd77f6a7e509ee1b (link)
#121730 Add profiling support to AIX 05a227b8b934ca721c198c8c7d4bbfe1357417a6 (link)
#121750 match lowering: Separate the bool case from other integer… d1519b03fe4462db09bfe50ee5c2ad8f2dc2f68b (link)
#121803 Never say "Trait is implemented for {type error}" dbd678b5381622c665e43b21f346020765341078 (link)
#121811 Move sanitizer ui tests to sanitizer directory 15ade639f934b9def947e5325d6bab10aeaeb7c9 (link)
#121824 Implement missing ABI structures in StableMIR 56c520b51812cbea2832e2556a49ef87f085ac22 (link)

previous master: e612d079a1

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 (eaee1e9): 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: 652.171s -> 651.148s (-0.16%)
Artifact size: 175.40 MiB -> 175.41 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-mfpa3jx branch March 16, 2024 18:19
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. 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.