Skip to content

Rollup of 6 pull requests #106215

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 15 commits into from
Dec 28, 2022
Merged

Rollup of 6 pull requests #106215

merged 15 commits into from
Dec 28, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

estebank and others added 15 commits December 26, 2022 18:21
…illaumeGomez

docs/test: add UI test and long-form error docs for `E0461`

Might take a couple of tries to pass CI. The UI test is x86-linux only; I'm not sure how to generalize it to other architectures.

r? ``@GuillaumeGomez``
…piler-errors

Suggest `impl Iterator` when possible for `_` return type

Address rust-lang#106096.
…hods, r=jackh726

Deduplicate `op` methods

There are some operator-checking flavored methods in `FnCtxt` that can be deduplicated.
… r=estebank

Recover `fn` keyword as `Fn` trait in bounds

`impl fn()` -> `impl Fn()`

Fixes rust-lang#82515
…ound, r=GuillaumeGomez

rustdoc: combine common sidebar background color CSS rules
…, r=compiler-errors

Silence knock-down errors on `[type error]` bindings

Fix rust-lang#56036, fix rust-lang#76589.
@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 28, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Dec 28, 2022

📌 Commit d37cb3f 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 Dec 28, 2022
@bors
Copy link
Collaborator

bors commented Dec 28, 2022

⌛ Testing commit d37cb3f with merge 8edf9ec5ac21b078595cc302366080473731f9ae...

@bors
Copy link
Collaborator

bors commented Dec 28, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 28, 2022
@matthiaskrgr
Copy link
Member Author

@bors retry

--- stderr -------------------------------
thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
------------------------------------------

@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 Dec 28, 2022
@rust-log-analyzer
Copy link
Collaborator

The job armhf-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [ui] src/test/ui/typeck/issue-98982.rs ... ok
test [ui] src/test/ui/typeck/point-at-type-param-in-path-expr.rs ... ok
test [ui] src/test/ui/typeck/issue-92481.rs ... ok
test [ui] src/test/ui/typeck/issue-91328.rs ... ok
test [ui] src/test/ui/typeck/quiet-type-err-let-binding.rs ... ok
test [ui] src/test/ui/typeck/type-placeholder-fn-in-const.rs ... ok
test [ui] src/test/ui/typeck/typeck-cast-pointer-to-float.rs ... ok
test [ui] src/test/ui/typeck/struct-enum-wrong-args.rs ... ok
test [ui] src/test/ui/typeck/return_type_containing_closure.rs ... ok
---
---- [ui] src/test/ui/expr-copy.rs stdout ----

error: test run failed!
status: exit status: 101
command: RUST_TEST_THREADS="16" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/expr-copy/a"
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/expr-copy/a", waiting for result
------------------------------------------
--- stderr -------------------------------
thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9

@bors
Copy link
Collaborator

bors commented Dec 28, 2022

⌛ Testing commit d37cb3f with merge 270c94e...

@bors
Copy link
Collaborator

bors commented Dec 28, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 28, 2022
@bors bors merged commit 270c94e into rust-lang:master Dec 28, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 28, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#106199 06397f11c89527870bc3db0be1f876f6958ad7a4
#106194 024f2f643fd3d1407b4e632bccc94890cab58fef
#106176 023278d2fb7463f49d775921c9492add5b70c124
#106173 a2ef550a5b4450cef2ec396d246390075b17442d
#106172 d3fbaf33f27fc77c77c273b28175ed3f8298058b
#106028 ab2f533cf289a125f489c994367aadb87dd5dbfb

previous master: 83a28ef095

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 (270c94e): 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

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)
2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)
2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.7%, -0.7%] 3
All ❌✅ (primary) 2.5% [2.5%, 2.5%] 1

Cycles

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

@matthiaskrgr matthiaskrgr deleted the rollup-53r89ww branch March 16, 2024 18:18
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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-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.

9 participants