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 8 pull requests #104275

Closed
wants to merge 22 commits into from
Closed

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 22 commits October 23, 2022 19:30
Corresponding subsection in async book is not `07.05` not `07.06`.

The information on the linked page is the same so it may be reasonable to remove the whole sentence.
This allows retrying binding TCP Socket multiple times. This is useful
when using emulators as network might not be available in the beginning.
This was orignally implemented in rust-lang#100316

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
The fluent argument syntax is a little special and easy to get wrong, so
we emit a small help message when someone gets it wrong.

Example:
```
parser_mismatched_closing_delimiter = mismatched closing delimiter: `${delimiter}`
```
panics with
```
thread 'rustc' panicked at 'Encountered errors while formatting message for `parser_mismatched_closing_delimiter`
help: Argument `delimiter` exists but was not referenced correctly. Try using `{$delimiter}` instead
attr: `None`
args: `FluentArgs([("delimiter", String("}"))])`
errors: `[ResolverError(Reference(Message { id: "delimiter", attribute: None }))]`', compiler/rustc_errors/src/translation.rs:123:21
```
Do not point at whole statement, only at the expression (skip pointing at `;`)
… `Future::Output`

No longer lint against `#[must_use] async fn foo()`.

When encountering a statement that awaits on a `Future`, check if the
`Future`'s parent item is annotated with `#[must_use]` and emit a lint
if so. This effectively makes `must_use` an annotation on the
`Future::Output` instead of only the `Future` itself.

Fix rust-lang#78149.
… r=tmandry

Consider `#[must_use]` annotation on `async fn` as also affecting the `Future::Output`

No longer lint against `#[must_use] async fn foo()`.

When encountering a statement that awaits on a `Future`, check if the
`Future`'s parent item is annotated with `#[must_use]` and emit a lint
if so. This effectively makes `must_use` an annotation on the
`Future::Output` instead of only the `Future` itself.

Fix rust-lang#78149.
`#[test]`: Point at return type if `Termination` bound is unsatisfied

Together with rust-lang#103142 (already merged) this fully fixes rust-lang#50291.

I don't consider my current solution of changing a few spans “here and there” very clean since the
failed obligation is a `FunctionArgumentObligation` and we point at a type instead of a function argument.

If you agree with me on this point, I can offer to keep the spans of the existing nodes and instead inject
`let _: AssertRetTyIsTermination<$ret_ty>;` (type to be defined in `libtest`) similar to `AssertParamIsEq` etc.
used by some built-in derive-macros.

I haven't tried that approach yet though and cannot promise that it would actually work out or
be “cleaner” for that matter.

```@rustbot``` label A-libtest A-diagnostics
r? ```@estebank```
Fix broken link in description of error code E0706

Corresponding subsection in async book is `07.05` not `07.06`.

The information on the linked page is the same so it may be reasonable to remove the whole sentence.
…n514

Retry binding TCP Socket in remote-test-server

This allows retrying binding TCP Socket multiple times. This is useful when using emulators as network might not be available in the beginning.

This was orignally implemented in rust-lang#100316

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
…r-traits, r=estebank

Don't ICE on operator trait methods with generic methods

Emit a fatal error instead.
fixes rust-lang#104213
…aKO8Ki

Display help message when fluent arg was referenced incorrectly

The fluent argument syntax is a little special and easy to get wrong, so we emit a small help message when someone gets it wrong.

Example:
```
parser_mismatched_closing_delimiter = mismatched closing delimiter: `${delimiter}`
```
panics with
```
thread 'rustc' panicked at 'Encountered errors while formatting message for `parser_mismatched_closing_delimiter`
help: Argument `delimiter` exists but was not referenced correctly. Try using `{$delimiter}` instead
attr: `None`
args: `FluentArgs([("delimiter", String("}"))])`
errors: `[ResolverError(Reference(Message { id: "delimiter", attribute: None }))]`', compiler/rustc_errors/src/translation.rs:123:21
```

fixes rust-lang#103539
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 11, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Nov 11, 2022

📌 Commit b70b8c8 has been approved by Dylan-DPC

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 Nov 11, 2022
@bors
Copy link
Contributor

bors commented Nov 11, 2022

⌛ Testing commit b70b8c8 with merge 34c1c22dd02adbefcaa0e56e4369a5b75ea4e682...

@bors
Copy link
Contributor

bors commented Nov 11, 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 Nov 11, 2022
@Dylan-DPC Dylan-DPC closed this Nov 11, 2022
@Dylan-DPC Dylan-DPC deleted the rollup-rp4lkai branch November 11, 2022 15:20
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Finished release [optimized] target(s) in 14.48s
[TIMING] tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-apple-darwin }, target: x86_64-apple-darwin, tool: "html-checker", path: "src/tools/html-checker", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 14.558
[TIMING] tool::HtmlChecker { compiler: Compiler { stage: 0, host: x86_64-apple-darwin }, target: x86_64-apple-darwin } -- 0.000
Running HTML checker...
=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/core/sync/struct.Exclusive.html` (error code: 1) <=
line 66 column 552 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/array/struct.IntoIter.html` (error code: 1) <=
line 93 column 443 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/slice/fn.from_mut.html` (error code: 1) <=
line 1 column 4612 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/slice/struct.IterMut.html` (error code: 1) <=
line 62 column 443 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/io/struct.BorrowedCursor.html` (error code: 1) <=
line 20 column 432 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/io/struct.IoSliceMut.html` (error code: 1) <=
line 1946 column 440 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2108 column 4308 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/simd/struct.Simd.html` (error code: 1) <=
line 225 column 55460 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/vec/struct.IntoIter.html` (error code: 1) <=
line 14 column 544 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/vec/struct.Vec.html` (error code: 1) <=
line 657 column 538 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 3041 column 440 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 3203 column 1626 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 3203 column 3346 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 3203 column 6503 - Warning: unescaped & or unknown entity "&Vec" (UNKNOWN_ENTITY)
line 3203 column 9633 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 3205 column 3107 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 3308 column 6549 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/ops/struct.RangeFull.html` (error code: 1) <=
line 34 column 769 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/ops/struct.RangeToInclusive.html` (error code: 1) <=
line 49 column 769 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/ops/struct.RangeFrom.html` (error code: 1) <=
line 79 column 765 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 98 column 1255 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/ops/struct.RangeTo.html` (error code: 1) <=
line 49 column 769 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/ops/struct.Range.html` (error code: 1) <=
line 94 column 769 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 129 column 1239 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/ops/struct.RangeInclusive.html` (error code: 1) <=
line 133 column 769 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 153 column 1266 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/primitive.slice.html` (error code: 1) <=
line 2058 column 434 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2229 column 1378 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2229 column 2677 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2229 column 4648 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2229 column 6275 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2229 column 34273 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2229 column 35862 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2237 column 1483 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2363 column 754 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2373 column 750 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2383 column 754 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2393 column 754 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2403 column 754 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2413 column 754 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/string/struct.String.html` (error code: 1) <=
line 732 column 629 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 936 column 543 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/primitive.str.html` (error code: 1) <=
line 119 column 537 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 1535 column 1223 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 1554 column 1235 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 1591 column 1250 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/sync/atomic/struct.AtomicU8.html` (error code: 1) <=
line 32 column 562 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/sync/struct.Exclusive.html` (error code: 1) <=
line 66 column 547 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/collections/vec_deque/struct.VecDeque.html` (error code: 1) <=
line 593 column 573 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/collections/struct.VecDeque.html` (error code: 1) <=
line 593 column 567 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/mem/union.MaybeUninit.html` (error code: 1) <=
line 644 column 684 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)

=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/std/primitive.array.html` (error code: 1) <=
line 223 column 534 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 349 column 3285 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 349 column 10212 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
Error: "HTML check failed: 54 errors"
Done! Read 30910 files...
Build completed unsuccessfully in 2:19:17

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 A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic rollup A PR which is a rollup 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-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.