Rollup of 15 pull requests by JohnTitor · Pull Request #90159 · rust-lang/rust

JohnTitor · 2021-10-22T07:21:25Z

Successful merges:

Clarify undefined behaviour in binary heap, btree and hashset docs #87537 (Clarify undefined behaviour in binary heap, btree and hashset docs)
Stabilize feature saturating_div for rust 1.58.0 #88624 (Stabilize feature saturating_div for rust 1.58.0)
Give better error for macro_rules name #89257 (Give better error for macro_rules name)
nice_region_error: Include lifetime placeholders in error output #89416 (nice_region_error: Include lifetime placeholders in error output)
Ensure that pushing empty path works as before on verbatim paths #89665 (Ensure that pushing empty path works as before on verbatim paths)
Don't mark for loop iter expression as desugared #89895 (Don't mark for loop iter expression as desugared)
Update E0637 description to mention & w/o an explicit lifetime name #89922 (Update E0637 description to mention & w/o an explicit lifetime name)
Change Duration::[try_]from_secs_{f32, f64} underflow error #89944 (Change Duration::[try_]from_secs_{f32, f64} underflow error)
rustc_ast: Turn MutVisitor::token_visiting_enabled into a constant #89991 (rustc_ast: Turn MutVisitor::token_visiting_enabled into a constant)
Reject closures in patterns #90028 (Reject closures in patterns)
Fix const qualification when executed after promotion #90069 (Fix const qualification when executed after promotion)
Add a regression test for issue-83479 #90078 (Add a regression test for issue-83479)
Add some tests for const_generics_defaults #90114 (Add some tests for const_generics_defaults)
Add test for issue #78561 #90115 (Add test for issue ICE: NLL region is not an ReVar: ReEarlyBound(0, 'a) with type_alias_impl_trait and particular type parameter bounds #78561)
triagebot: Treat I-*nominated like I-nominated #90129 (triagebot: Treat I-*nominated like I-nominated)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

As you can see in src/test/ui/traits/self-without-lifetime-constraint.stderr you can get very confusing type names if you don't have this. Fixesrust-lang#87763

Fixes: rust-lang#89658

It's a visitor property rather than something that needs to be determined at runtime

The const qualification was so far performed before the promotion and the implementation assumed that it will never encounter a promoted. With `const_precise_live_drops` feature, checking for live drops is delayed until after drop elaboration, which in turn runs after promotion. so the assumption is no longer true. When evaluating `NeedsNonConstDrop` it is now possible to encounter promoteds. Use type base qualification for the promoted. It is a sound approximation in general, and in the specific case of promoteds and `NeedsNonConstDrop` it is precise.

Now explicitly says negative value.

rustbot doesn't allow unauthenticated users to set `I-nominated`; apply the same permissions to the new `I-*nominated` labels.

Previously, it wasn't clear whether "This could include" was referring to logic errors, or undefined behaviour. Tweak wording to clarify this sentence does not relate to UB.

…rk-Simulacrum Clarify undefined behaviour in binary heap, btree and hashset docs Previously, it wasn't clear whether "This could include" was referring to logic errors, or undefined behaviour. Tweak wording to clarify this sentence does not relate to UB.

Stabilize feature `saturating_div` for rust 1.58.0 The tracking issue is rust-lang#89381 This seems like a reasonable simple change(?). The feature `saturating_div` was added as part of the ongoing effort to implement a `Saturating` integer type (see rust-lang#87921). The implementation has been discussed [here](rust-lang#87921 (comment)) and [here](rust-lang#87921 (comment)). It extends the list of saturating operations on integer types (like `saturating_add`, `saturating_sub`, `saturating_mul`, ...) by the function `fn saturating_div(self, rhs: Self) -> Self`. The stabilization of the feature `saturating_int_impl` (for the `Saturating` type) needs to have this stabilized first. Closesrust-lang#89381

…bank Give better error for `macro_rules name` follow up to rust-lang#89221 r? `@estebank` `@rustbot` modify labels: +A-diagnostics +A-parser

…fetimes-in-region-errors, r=jackh726 nice_region_error: Include lifetime placeholders in error output As you can see in src/test/ui/traits/self-without-lifetime-constraint.stderr you can get very confusing type names if you don't have this. Fixesrust-lang#87763

Ensure that pushing empty path works as before on verbatim paths Fixes: rust-lang#89658 Signed-off-by: Sean Young <sean@mess.org>

…vidtwco Don't mark for loop iter expression as desugared We typically don't mark spans of lowered things as desugared. This helps Clippy rightly discern when code is (not) from expansion. This was discovered by `@flip1995` at rust-lang/rust-clippy#7789 (comment).

Update E0637 description to mention `&` w/o an explicit lifetime name Deal with rust-lang#89824 (comment). Another solution would be splitting the error code into two as (I think) it's a bit unclear to users why they have the same error code.

Change `Duration::[try_]from_secs_{f32, f64}` underflow error The error message now says that it was a negative value. Fixesrust-lang#89913.

rustc_ast: Turn `MutVisitor::token_visiting_enabled` into a constant It's a visitor property rather than something that needs to be determined at runtime

…=spastorino Reject closures in patterns Fixesrust-lang#90013.

…i-obk Fix const qualification when executed after promotion The const qualification was so far performed before the promotion and the implementation assumed that it will never encounter a promoted. With `const_precise_live_drops` feature, checking for live drops is delayed until after drop elaboration, which in turn runs after promotion. so the assumption is no longer true. When evaluating `NeedsNonConstDrop` it is now possible to encounter promoteds. Use type base qualification for the promoted. It is a sound approximation in general, and in the specific case of promoteds and `NeedsNonConstDrop` it is precise. Fixesrust-lang#89938.

…crum Add a regression test for issue-83479 Add a regression test for rust-lang#83479 (comment), but not close the issue, see rust-lang#83479 (comment).

Add some tests for const_generics_defaults I think this covers some of the stuff required for stabilisation report, some of these tests are probably covering stuff we already have but it can't hurt to have more :) r? ```@lcnr```

Add test for issue rust-lang#78561 Adds test for and closesrust-lang#78561 which previously crashed compiler.

…=Mark-Simulacrum triagebot: Treat `I-*nominated` like `I-nominated` rustbot doesn't allow unauthenticated users to set `I-nominated`; apply the same permissions to the new `I-*nominated` labels.

JohnTitor · 2021-10-22T07:21:47Z

@bors r+ p=15 rollup=never

bors · 2021-10-22T07:21:48Z

📌 Commit 1fbce5c has been approved by JohnTitor

bors · 2021-10-22T10:08:23Z

⌛ Testing commit 1fbce5c with merge 300296496b5eb96a6cf2e7ee879bdf5d527140ce...

rust-log-analyzer · 2021-10-22T10:31:50Z

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

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

diff of stderr:
2 --> $DIR/mismatched_trait_impl.rs:9:5
3 |
4 LL | fn foo(&self, x: &'a u32, y: &u32) -> &'a u32;
- | ---------------------------------------------- expected `fn(&i32, &'a u32, &u32) -> &'a u32`
+ | ---------------------------------------------- expected `fn(&'1 i32, &'a u32, &'2 u32) -> &'a u32`
6 ...
7 LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&i32, &u32, &u32) -> &u32`
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 i32, &'2 u32, &'3 u32) -> &'3 u32`
9 |
- = note: expected `fn(&i32, &'a u32, &u32) -> &'a u32`
- found `fn(&i32, &u32, &u32) -> &u32`
+ = note: expected `fn(&'1 i32, &'a u32, &'2 u32) -> &'a u32`
+ found `fn(&'1 i32, &'2 u32, &'3 u32) -> &'3 u32`
12 = help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
13 = help: verify the lifetime relationships in the `trait` and `impl` between the `self` argument, the other inputs and its output
The actual stderr differed from the expected stderr.
The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/in-band-lifetimes/mismatched_trait_impl.nll/mismatched_trait_impl.nll.stderr
To only update this specific test, also pass `--test-args in-band-lifetimes/mismatched_trait_impl.rs`
error: 1 errors occurred comparing output.
error: 1 errors occurred comparing output.
Some tests failed in compiletest suite=ui compare_mode=Nll mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/in-band-lifetimes/mismatched_trait_impl.nll" "-Zborrowck=mir" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/in-band-lifetimes/mismatched_trait_impl.nll/auxiliary"
------------------------------------------
------------------------------------------
stderr:
stderr:
------------------------------------------
error: `impl` item signature doesn't match `trait` item signature
|
|
LL | fn foo(&self, x: &'a u32, y: &u32) -> &'a u32;
| ---------------------------------------------- expected `fn(&'1 i32, &'a u32, &'2 u32) -> &'a u32`
...
LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR `impl` item signature doesn't match
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found `fn(&'1 i32, &'2 u32, &'3 u32) -> &'3 u32`
|
= note: expected `fn(&'1 i32, &'a u32, &'2 u32) -> &'a u32`
found `fn(&'1 i32, &'2 u32, &'3 u32) -> &'3 u32`
= help: the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`
= help: verify the lifetime relationships in the `trait` and `impl` between the `self` argument, the other inputs and its output
error: aborting due to previous error
------------------------------------------
---
test result: FAILED. 12178 passed; 1 failed; 143 ignored; 0 measured; 0 filtered out; finished in 92.34s
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--suite" "ui" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--llvm-version" "13.0.0-rust-1.58.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwp engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always" "--compare-mode" "nll"
Build completed unsuccessfully in 0:16:12

bors · 2021-10-22T10:32:47Z

💔 Test failed - checks-actions

notriddleand others added 30 commits September 30, 2021 23:13

nice_region_error: Include lifetime placeholders in error output
82348ef
As you can see in src/test/ui/traits/self-without-lifetime-constraint.stderr you can get very confusing type names if you don't have this. Fixesrust-lang#87763

Give better error for macro_rules name
729ff2d

Ensure that pushing empty path works as before
1bb399c
Fixes: rust-lang#89658

Don't mark for loop head span with desugaring
bd1a1e4

Use more lowered spans in for loop
a697aa6

Fix clippy with for loop span change
ffdd5a0

Update E0637 description to mention & w/o an explicit lifetime name
4333091

rustc_ast: Turn MutVisitor::token_visiting_enabled into a constant
d2470e7
It's a visitor property rather than something that needs to be determined at runtime

Reject closures in patterns
c97cf7f

Add a regression test for issue-83479
21d02bf

Increase ROOT_ENTRY_LIMIT to 1331
396a4f4

Change Duration::from_secs_* underflow error
fe060bf
Now explicitly says negative value.

Trait objects
6469fba

Return pos impl trait
a81e489

Wfness
83a1834

Inference
8f23779

add fixme
7a8bd2d

Ordering
c75d8cb

*dust dust*
e7a9e82

Verify that only NeedsNonConstDrop expects promoteds
74c6636

Add test for issuerust-lang#78561
ab44e46

triagebot: Treat I-*nominated like I-nominated
d50832b
rustbot doesn't allow unauthenticated users to set `I-nominated`; apply the same permissions to the new `I-*nominated` labels.

Clarify undefined behaviour for binary heap, btree and hashset
04c1ec5
Previously, it wasn't clear whether "This could include" was referring to logic errors, or undefined behaviour. Tweak wording to clarify this sentence does not relate to UB.

Stabilize feature saturating_div for rust 1.58
0dba9d0

Rollup merge ofrust-lang#89257- aDotInTheVoid:macro-error-2, r=este…
1585730
…bank Give better error for `macro_rules name` follow up to rust-lang#89221 r? `@estebank` `@rustbot` modify labels: +A-diagnostics +A-parser

Rollup merge ofrust-lang#89665- seanyoung:push-empty, r=m-ou-se
0d70763
Ensure that pushing empty path works as before on verbatim paths Fixes: rust-lang#89658 Signed-off-by: Sean Young <sean@mess.org>

JohnTitor added 10 commits October 22, 2021 16:21

Rollup merge ofrust-lang#89944- mbartlett21:patch-2, r=Mark-Simulacrum
5256761
Change `Duration::[try_]from_secs_{f32, f64}` underflow error The error message now says that it was a negative value. Fixesrust-lang#89913.

Rollup merge ofrust-lang#89991- petrochenkov:visitok2, r=jackh726
05e0281
rustc_ast: Turn `MutVisitor::token_visiting_enabled` into a constant It's a visitor property rather than something that needs to be determined at runtime

Rollup merge ofrust-lang#90028- tmiasko:structural-match-closure, r…
a93e7e0
…=spastorino Reject closures in patterns Fixesrust-lang#90013.

Rollup merge ofrust-lang#90078- JohnTitor:test-83479, r=Mark-Simula…
7bcc6be
…crum Add a regression test for issue-83479 Add a regression test for rust-lang#83479 (comment), but not close the issue, see rust-lang#83479 (comment).

Rollup merge ofrust-lang#90115- samlich:test-issue-78561, r=oli-obk
c24e75a
Add test for issue rust-lang#78561 Adds test for and closesrust-lang#78561 which previously crashed compiler.

Rollup merge ofrust-lang#90129- joshtriplett:triagebot-nominated, r…
1fbce5c
…=Mark-Simulacrum triagebot: Treat `I-*nominated` like `I-nominated` rustbot doesn't allow unauthenticated users to set `I-nominated`; apply the same permissions to the new `I-*nominated` labels.

rustbot added the rollup A PR which is a rollup label Oct 22, 2021

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 22, 2021

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 Oct 22, 2021

JohnTitor mentioned this pull request Oct 22, 2021
nice_region_error: Include lifetime placeholders in error output #89416
Merged

JohnTitor closed this Oct 22, 2021

JohnTitor deleted the rollup-k1382y9 branch October 22, 2021 10:42

Vic23M approved these changes Feb 12, 2022
View reviewed changes

Navigation Menu

Uh oh!

Uh oh!

Rollup of 15 pull requests - #90159

Rollup of 15 pull requests#90159
JohnTitor wants to merge 40 commits into
rust-lang:masterfrom
JohnTitor:rollup-k1382y9

JohnTitor commented Oct 22, 2021

Uh oh!

JohnTitor commented Oct 22, 2021

Uh oh!

bors commented Oct 22, 2021

Uh oh!

bors commented Oct 22, 2021

Uh oh!

rust-log-analyzer commented Oct 22, 2021

Uh oh!

bors commented Oct 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Uh oh!

Uh oh!

Conversation

JohnTitor commented Oct 22, 2021

Uh oh!

JohnTitor commented Oct 22, 2021

Uh oh!

bors commented Oct 22, 2021

Uh oh!

bors commented Oct 22, 2021

Uh oh!

rust-log-analyzer commented Oct 22, 2021

Uh oh!

bors commented Oct 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants