Rollup of 6 pull requests by Dylan-DPC · Pull Request #95500 · rust-lang/rust

Dylan-DPC · 2022-03-30T20:22:29Z

Successful merges:

Fix cargo run tidy #94806 (Fix cargo run tidy)
async: Give predictable name to binding generated from .await expressions. #95011 (async: Give predictable name to binding generated from .await expressions.)
Clean up, categorize and sort unstable features in std. #95032 (Clean up, categorize and sort unstable features in std.)
Reduce max hash in raw strings from u16 to u8 #95251 (Reduce max hash in raw strings from u16 to u8)
Fix double drop of allocator in IntoIter impl of Vec #95298 (Fix double drop of allocator in IntoIter impl of Vec)
Don't ICE when opaque types get their hidden type constrained again. #95471 (Don't ICE when opaque types get their hidden type constrained again.)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

When I implemented rust-only bootstrapping in rust-lang#92260, I neglected to test stage0 tools - it turns out they were broken because they couldn't find the sysroot of the initial bootstrap compiler. This fixes stage0 tools by using `rustc --print sysroot` instead of assuming rustc is already in a sysroot and hard-coding the relative directory.

Co-authored-by: Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>

…it expressions. This name makes it to debuginfo and allows debuggers to identify such bindings and their captured versions in suspended async fns.

Contrary to popular belief, `codegen_fulfill_obligation` does not get used solely in codegen, so we cannot rely on `param_env` being set to RevealAll and thus revealing the hidden types instead of constraining them.

…acrum Fix `cargo run tidy` When I implemented rust-only bootstrapping in rust-lang#92260, I neglected to test stage0 tools - it turns out they were broken because they couldn't find the sysroot of the initial bootstrap compiler. This fixes stage0 tools by using `rustc --print sysroot` instead of assuming rustc is already in a sysroot and hard-coding the relative directory. Fixes rust-lang#94797 (properly, without having to change rustup).

…mandry async: Give predictable name to binding generated from .await expressions. This name makes it to debuginfo and allows debuggers to identify such bindings and their captured versions in suspended async fns. This will be useful for async stack traces, as discussed in https://internals.rust-lang.org/t/async-debugging-logical-stack-traces-setting-goals-collecting-examples/15547. I don't know if this needs some discussion by ```@rust-lang/compiler,``` e.g. about the name of the binding (`__awaitee`) or about the fact that this PR introduces a (soft) guarantee about a compiler generated name. Although, regarding the later, I think the same reasoning applies here as it does for debuginfo in general. r? ```@tmandry```

Clean up, categorize and sort unstable features in std.

Reduce max hash in raw strings from u16 to u8 [Relevant discussion](https://rust-lang.zulipchat.com/#narrow/stream/237824-t-lang.2Fdoc/topic/Max.20raw.20string.20delimiters)

…ator-in-vec-into-iter, r=oli-obk Fix double drop of allocator in IntoIter impl of Vec Fixes rust-lang#95269 The `drop` impl of `IntoIter` reconstructs a `RawVec` from `buf`, `cap` and `alloc`, when that `RawVec` is dropped it also drops the allocator. To avoid dropping the allocator twice we wrap it in `ManuallyDrop` in the `InttoIter` struct. Note this is my first contribution to the standard library, so I might be missing some details or a better way to solve this.

Don't ICE when opaque types get their hidden type constrained again. Contrary to popular belief, `codegen_fulfill_obligation` does not get used solely in codegen, so we cannot rely on `param_env` being set to RevealAll and thus revealing the hidden types instead of constraining them. Fixes rust-lang#89312 (for real this time)

Dylan-DPC · 2022-03-30T20:23:26Z

@bors r+ rollup=never p=5

bors · 2022-03-30T20:23:27Z

📌 Commit e5d022f has been approved by Dylan-DPC

bors · 2022-03-30T21:34:31Z

⌛ Testing commit e5d022f with merge 0c651be809e5a59728df51808e7792c6dcf03e5c...

bors · 2022-03-30T21:38:21Z

💔 Test failed - checks-actions

Dylan-DPC · 2022-03-30T21:40:42Z

@bors retry (spurious)

rust-log-analyzer · 2022-03-30T21:41:13Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2022-03-30T21:42:49Z

⌛ Testing commit e5d022f with merge 42e40c3792422acab2c54c3e8efd5b20b8085ead...

bors · 2022-03-30T22:09:47Z

💔 Test failed - checks-actions

compiler-errors · 2022-03-30T22:22:25Z

@Dylan-DPC: I think this failure is due to #![feature(associated_type_bounds)] being removed in #95032?

Dylan-DPC · 2022-03-30T22:23:22Z

yes yes hold on :P

compiler-errors · 2022-03-30T22:24:55Z

lol, sorry for the ping, I was just being nosey.... carry on 😅

Dylan-DPC · 2022-03-30T22:25:28Z

no nothing about being nosey, appreciate the help :)

rust-log-analyzer · 2022-03-30T23:48:16Z

The job dist-various-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] gimli test:false 5.114
warning: dropping unsupported crate type `dylib` for target `x86_64-fortanix-unknown-sgx`

error[E0658]: associated type bounds are unstable
   --> library/std/src/sys/sgx/abi/usercalls/alloc.rs:574:24
    |
574 |     I: SliceIndex<[T], Output: UserSafe>,
    |
    = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
error[E0658]: associated type bounds are unstable
error[E0658]: associated type bounds are unstable
   --> library/std/src/sys/sgx/abi/usercalls/alloc.rs:594:24
    |
594 |     I: SliceIndex<[T], Output: UserSafe>,
    |
    = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
For more information about this error, try `rustc --explain E0658`.
[RUSTC-TIMING] std test:false 1.852
warning: `std` (lib) generated 1 warning
error: could not compile `std` due to 2 previous errors; 1 warning emitted

jyn514 and others added 20 commits March 10, 2022 17:25

Reduce max hash in raw strings from u16 to u8

38e0ae5

Update syntax tree definition

b51f20e

Fix double drop of allocator in IntoIter impl of Vec

0cf6061

Use ManuallyDrop::take instead of into_inner

d14c0d2

Co-authored-by: Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>

Add a test verifying the number of drop calls

4b53f56

Update clippy helper function types

c3840c9

Add another assertion without into_iter

d9a438d

async: Give predictable, reserved name to binding generated from .awa…

78e27e2

…it expressions. This name makes it to debuginfo and allows debuggers to identify such bindings and their captured versions in suspended async fns.

Don't ICE when opaque types get their hidden type constrained again.

1144677

Contrary to popular belief, `codegen_fulfill_obligation` does not get used solely in codegen, so we cannot rely on `param_env` being set to RevealAll and thus revealing the hidden types instead of constraining them.

Remove unused #![feature]s from std.

f0b12f4

Categorize and sort unstable features in std.

e4248fe

Put back std #![feature]s that were not unused.

39a8442

Update error message & remove outdated test comment

759d1e6

Rollup merge of rust-lang#95032 - m-ou-se:std-features, r=yaahc

e0719bd

Clean up, categorize and sort unstable features in std.

Rollup merge of rust-lang#95251 - GrishaVar:hashes-u16-to-u8, r=dtolnay

957dc51

Reduce max hash in raw strings from u16 to u8 [Relevant discussion](https://rust-lang.zulipchat.com/#narrow/stream/237824-t-lang.2Fdoc/topic/Max.20raw.20string.20delimiters)

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 30, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 30, 2022

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 Mar 30, 2022

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 30, 2022

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 Mar 30, 2022

Dylan-DPC mentioned this pull request Mar 30, 2022

Clean up, categorize and sort unstable features in std. #95032

Merged

Dylan-DPC closed this Mar 30, 2022

Dylan-DPC deleted the rollup-4qenxwz branch March 30, 2022 22:25

Uh oh!

Conversation

Dylan-DPC commented Mar 30, 2022

Uh oh!

Dylan-DPC commented Mar 30, 2022

Uh oh!

bors commented Mar 30, 2022

Uh oh!

bors commented Mar 30, 2022

Uh oh!

bors commented Mar 30, 2022

Uh oh!

Dylan-DPC commented Mar 30, 2022

Uh oh!

rust-log-analyzer commented Mar 30, 2022

Uh oh!

bors commented Mar 30, 2022

Uh oh!

bors commented Mar 30, 2022

Uh oh!

compiler-errors commented Mar 30, 2022

Uh oh!

Dylan-DPC commented Mar 30, 2022

Uh oh!

compiler-errors commented Mar 30, 2022

Uh oh!

Dylan-DPC commented Mar 30, 2022

Uh oh!

rust-log-analyzer commented Mar 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants