Skip to content

Rollup of 8 pull requests #104259

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

Closed
wants to merge 22 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddle and others added 22 commits November 7, 2022 11:13
Add lots of comments to this test and enable parts of the test that were
added but never ran.

Signed-off-by: David Wood <david.wood@huawei.com>
`CompiledModule` should not think a DWARF object was emitted when a
bitcode-only compilation has happened, this can confuse archive file
creation (which expects to create an archive containing non-existent dwo
files).

Signed-off-by: David Wood <david.wood@huawei.com>
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>
Previously, a `delay_span_bug` was isssued, failing normalization. This
create a `TyKind::Error` in the signature, which caused
`compare_predicate_entailment` to swallow its signature mismatch error,
causing ICEs because no error was emitted.
…elwoerister

llvm: dwo only emitted when object code emitted

Fixes rust-lang#103932.

`CompiledModule` should not think a DWARF object was emitted when a bitcode-only compilation has happened, this can confuse archive file creation (which expects to create an archive containing non-existent dwo files).

r? ``@michaelwoerister``
prevent uninitialized access in black_box for zero-sized-types

Don't read the pointer location in black_box for zero sized types, just emit a memory clobber instead. Addresses  rust-lang#103304 when rust is build against LLVM at HEAD.

Zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm/topic/.28with.20llvm.20at.20HEAD.29.3A.20msan.20error.20in.20core.3A.3Ahint.3A.3Ablack_box
…ckh726

Mark `trait_upcasting` feature no longer incomplete.

This marks the `trait_upcasting` feature no longer incomplete since rust-lang#101336 has been settled for a little while.

r? ``@jackh726``
…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>
Remove `save_and_restore_in_snapshot_flag`, use `ObligationCtxt` more

r? ``@lcnr``
…iler-errors

Emit error in `collecting_trait_impl_trait_tys` on mismatched signatures

Previously, a `delay_span_bug` was isssued, failing normalization. This create a `TyKind::Error` in the signature, which caused `compare_predicate_entailment` to swallow its signature mismatch error, causing ICEs because no error was emitted.

fixes rust-lang#104183

r? ``@compiler-errors``
@rustbot rustbot added 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-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 10, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Nov 10, 2022

📌 Commit 20ec6a9 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 10, 2022
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 10, 2022
@bors
Copy link
Collaborator

bors commented Nov 10, 2022

⌛ Testing commit 20ec6a9 with merge 0f625c3dd5e4a0cb7257aac9c74324e47ca9e86b...

@bors
Copy link
Collaborator

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
@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)
      Memory: 14 GB
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMY1BLtd4aqK
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234
---
    Finished release [optimized] target(s) in 13.90s
[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: [] } -- 13.970
[TIMING] tool::HtmlChecker { compiler: Compiler { stage: 0, host: x86_64-apple-darwin }, target: x86_64-apple-darwin } -- 0.002
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 1933 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 3028 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.RangeToInclusive.html` (error code: 1) <=
line 49 column 765 - 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 765 - 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 769 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 98 column 1251 - 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 2045 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 754 - Warning: unescaped & or unknown entity "&mut" (UNKNOWN_ENTITY)
line 2383 column 750 - 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:23:31

@matthiaskrgr matthiaskrgr deleted the rollup-959c17j branch December 22, 2022 10:46
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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.