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 5 pull requests #90858

Closed
wants to merge 11 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

vandenheuvel and others added 11 commits November 4, 2021 15:09
…d the conclusion that the code readibility wasn't worth the almost unnoticeable perf improvement
warn on must_use use on async fn's

As referenced in rust-lang#78149

This only works on `async` fn's for now, I can also look into if I can get `Box<dyn Future>` and `impl Future` working at this level (hir)
…sts, r=wesleywiser

Group commandline tests in a directory

I grouped the `ui/command*` tests in `ui/command/argfile/` and `rustdoc-ui/command*` in `rustdoc-ui/commandline-argfile/`.
…ostics, r=estebank

Improve diagnostics when a static lifetime is expected

Makes progress towards rust-lang#90600

The diagnostics here were previously entirely removed due to giving a misleading suggestion but if we instead provide an informative label in that same location it should better help the user understand the situation.

I included the example from the issue as it demonstrates an area where the diagnostics are still lacking.
Happy to remove that if its just adding noise atm.
…ance, r=camelid

Remove unneeded FIXMEs comments in search index generation

Original comment:

> Instead of recreating a new `vec` for each arguments, we re-use the same. The impact on performance should be minor but worth a try.

After testing it, we reached the conclusion that the code readability drop wasn't worth the almost unnoticeable performance improvement.

r? `@camelid`
…e_inputs_output, r=jackh726

Normalize both arguments of `equate_normalized_input_or_output`

Fixes rust-lang#90638
Fixes rust-lang#90612

Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck.

r? `@jackh726`
@rustbot rustbot added the rollup A PR which is a rollup label Nov 13, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Nov 13, 2021

📌 Commit aecc79a has been approved by matthiaskrgr

@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 13, 2021
@bors
Copy link
Contributor

bors commented Nov 13, 2021

⌛ Testing commit aecc79a with merge 42126ed5166ce98ac1373a44a7ec347e6de7e83d...

@bors
Copy link
Contributor

bors commented Nov 13, 2021

💔 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 13, 2021
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] pin_project_lite test:false 0.065
   Compiling either v1.6.0
[RUSTC-TIMING] rustc_hash test:false 0.080
   Compiling rustc-rayon-core v0.3.1
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0x6adfc3)[0xef6fafc3]
[0xf7f6ab50]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0x27ff4e6)[0xf184c4e6]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0x2800974)[0xf184d974]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0xd71de1)[0xefdbede1]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0x2800399)[0xf184d399]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0x25813a7)[0xf15ce3a7]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0xa64890)[0xefab1890]
/checkout/obj/build/i686-unknown-linux-gnu/stage0/bin/../lib/librustc_driver-64918735d27864fa.so(+0xa56b76)[0xefaa3b76]
   Compiling arrayvec v0.7.0
[RUSTC-TIMING] build_script_build test:false 0.361
   Compiling remove_dir_all v0.5.3
[RUSTC-TIMING] build_script_build test:false 0.408
[RUSTC-TIMING] build_script_build test:false 0.408
   Compiling stable_deref_trait v1.2.0
[RUSTC-TIMING] remove_dir_all test:false 0.055
   Compiling rustc_graphviz v0.0.0 (/checkout/compiler/rustc_graphviz)
[RUSTC-TIMING] smallvec test:false 0.450
rustc exited with signal: 11 (core dumped)
error: could not compile `smallvec`
Caused by:
Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name smallvec --edition=2018 /cargo/registry/src/github.com-1285ae84e5963aae/smallvec-1.7.0/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts --crate-type lib --emit=dep-info,metadata,link -C opt-level=3 -C embed-bitcode=no -C debuginfo=0 -C debug-assertions=on --cfg 'feature="may_dangle"' --cfg 'feature="union"' -C metadata=b563e70fe347d393 -C extra-filename=-b563e70fe347d393 --out-dir /checkout/obj/build/i686-unknown-linux-gnu/stage0-rustc/i686-unknown-linux-gnu/release/deps --target i686-unknown-linux-gnu -L dependency=/checkout/obj/build/i686-unknown-linux-gnu/stage0-rustc/i686-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/i686-unknown-linux-gnu/stage0-rustc/release/deps --cap-lints allow --cfg=bootstrap -Zsymbol-mangling-version=v0 -Zmacro-backtrace '-Clink-args=-Wl,-rpath,$ORIGIN/../lib' -Ztls-model=initial-exec -Zunstable-options '-Wrustc::internal' -Cprefer-dynamic -Z binary-dep-depinfo` (exit status: 254)
[RUSTC-TIMING] stable_deref_trait test:false 0.043
[RUSTC-TIMING] build_script_build test:false 0.268
[RUSTC-TIMING] build_script_build test:false 0.529
[RUSTC-TIMING] ppv_lite86 test:false 0.487

@matthiaskrgr
Copy link
Member Author

cc #90812

@matthiaskrgr matthiaskrgr deleted the rollup-2k7yr3x branch November 20, 2021 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants