Take type defaults into account in suggestions to reorder generic parameters #80519

max-heller · 2020-12-30T16:47:14Z

rust-highfive · 2020-12-30T16:47:16Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @davidtwco (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

max-heller · 2020-12-30T16:49:59Z

r? @varkor

rust-log-analyzer · 2020-12-30T17:06:28Z

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

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

........................................................................................ii.i........ 1300/11228
.....i.............................................................................................. 1400/11228
.................................................................................................... 1500/11228
.................................................................................................... 1600/11228
...............F.FF...F..F.......................................................................... 1700/11228
.................................................................................................... 1900/11228
.................................................................................................... 2000/11228
.................................................................................................... 2100/11228
.................................................................................................... 2200/11228
---
.................................................................................................... 9000/11228
.................................................................................................... 9100/11228
.................................................................................................... 9200/11228
...............i......i............................................................................. 9300/11228
......................................................iiiiii..iiiiii.i.............................. 9400/11228
.................................................................................................... 9600/11228
.................................................................................................... 9700/11228
.................................................................................................... 9800/11228
.................................................................................................... 9900/11228
---
diff of stderr:

2   --> $DIR/complex-unord-param.rs:8:41
3    |
4 LL | struct NestedArrays<'a, const N: usize, A: 'a, const M: usize, T:'a =u32> {
-    |                    ---------------------^----------------------^--------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, A: 'a, T: 'a, const N: usize, const M: usize>`
+    |                    ---------------------^----------------------^--------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, A: 'a, T = u32: 'a, const N: usize, const M: usize>`
7 error: aborting due to previous error
8 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/complex-unord-param.min/complex-unord-param.min.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/defaults/complex-unord-param.rs`

error in revision `min`: 1 errors occurred comparing output.
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/defaults/complex-unord-param.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "min" "--error-format" "json" "-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/const-generics/defaults/complex-unord-param.min" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/complex-unord-param.min/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: type parameters must be declared prior to const parameters
  --> /checkout/src/test/ui/const-generics/defaults/complex-unord-param.rs:8:41
   |
LL | struct NestedArrays<'a, const N: usize, A: 'a, const M: usize, T:'a =u32> {
   |                    ---------------------^----------------------^--------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, A: 'a, T = u32: 'a, const N: usize, const M: usize>`
error: aborting due to previous error


------------------------------------------
------------------------------------------


---- [ui] ui/const-generics/defaults/intermixed-lifetime.rs#min stdout ----
diff of stderr:

2   --> $DIR/intermixed-lifetime.rs:6:28
3    |
4 LL | struct Foo<const N: usize, 'a, T = u32>(&'a (), T);
-    |           -----------------^^---------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, const N: usize>`
+    |           -----------------^^---------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
7 error: type parameters must be declared prior to const parameters
8   --> $DIR/intermixed-lifetime.rs:6:32

9    |
9    |
10 LL | struct Foo<const N: usize, 'a, T = u32>(&'a (), T);
-    |           ---------------------^------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, const N: usize>`
+    |           ---------------------^------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
12 
13 error: lifetime parameters must be declared prior to const parameters

15    |
15    |
16 LL | struct Bar<const N: usize, T = u32, 'a>(&'a (), T);
-    |           --------------------------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, const N: usize>`
+    |           --------------------------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
19 error: type parameters must be declared prior to const parameters
20   --> $DIR/intermixed-lifetime.rs:10:28

21    |
21    |
22 LL | struct Bar<const N: usize, T = u32, 'a>(&'a (), T);
-    |           -----------------^----------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, const N: usize>`
+    |           -----------------^----------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
25 error: aborting due to 4 previous errors
26 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/intermixed-lifetime.min/intermixed-lifetime.min.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/defaults/intermixed-lifetime.rs`

error in revision `min`: 1 errors occurred comparing output.
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/defaults/intermixed-lifetime.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "min" "--error-format" "json" "-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/const-generics/defaults/intermixed-lifetime.min" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/intermixed-lifetime.min/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: lifetime parameters must be declared prior to const parameters
   |
   |
LL | struct Foo<const N: usize, 'a, T = u32>(&'a (), T);
   |           -----------------^^---------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
error: type parameters must be declared prior to const parameters
  --> /checkout/src/test/ui/const-generics/defaults/intermixed-lifetime.rs:6:32
   |
   |
LL | struct Foo<const N: usize, 'a, T = u32>(&'a (), T);
   |           ---------------------^------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`

error: lifetime parameters must be declared prior to const parameters
   |
   |
LL | struct Bar<const N: usize, T = u32, 'a>(&'a (), T);
   |           --------------------------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
error: type parameters must be declared prior to const parameters
  --> /checkout/src/test/ui/const-generics/defaults/intermixed-lifetime.rs:10:28
   |
   |
LL | struct Bar<const N: usize, T = u32, 'a>(&'a (), T);
   |           -----------------^----------- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
error: aborting due to 4 previous errors
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu


---
diff of stderr:

2   --> $DIR/intermixed-lifetime.rs:6:28
3    |
4 LL | struct Foo<const N: usize, 'a, T = u32>(&'a (), T);
-    |           -----------------^^---------- help: reorder the parameters: lifetimes, then consts and types: `<'a, const N: usize, T>`
+    |           -----------------^^---------- help: reorder the parameters: lifetimes, then consts and types: `<'a, const N: usize, T = u32>`
6 
7 error: lifetime parameters must be declared prior to type parameters

9    |
9    |
10 LL | struct Bar<const N: usize, T = u32, 'a>(&'a (), T);
-    |           --------------------------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, const N: usize, T>`
+    |           --------------------------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, const N: usize, T = u32>`
13 error: aborting due to 2 previous errors
14 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/intermixed-lifetime.full/intermixed-lifetime.full.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/defaults/intermixed-lifetime.rs`

error in revision `full`: 1 errors occurred comparing output.
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/defaults/intermixed-lifetime.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "full" "--error-format" "json" "-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/const-generics/defaults/intermixed-lifetime.full" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/intermixed-lifetime.full/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: lifetime parameters must be declared prior to const parameters
   |
   |
LL | struct Foo<const N: usize, 'a, T = u32>(&'a (), T);
   |           -----------------^^---------- help: reorder the parameters: lifetimes, then consts and types: `<'a, const N: usize, T = u32>`

error: lifetime parameters must be declared prior to type parameters
   |
   |
LL | struct Bar<const N: usize, T = u32, 'a>(&'a (), T);
   |           --------------------------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, const N: usize, T = u32>`
error: aborting due to 2 previous errors


------------------------------------------
------------------------------------------


---- [ui] ui/const-generics/defaults/needs-feature.rs#min stdout ----
diff of stderr:

2   --> $DIR/needs-feature.rs:9:26
3    |
4 LL | struct A<const N: usize, T=u32>(T);
-    |         -----------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<T, const N: usize>`
+    |         -----------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<T = u32, const N: usize>`
7 error: aborting due to previous error
8 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/needs-feature.min/needs-feature.min.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/defaults/needs-feature.rs`

error in revision `min`: 1 errors occurred comparing output.
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/defaults/needs-feature.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "min" "--error-format" "json" "-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/const-generics/defaults/needs-feature.min" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/needs-feature.min/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: type parameters must be declared prior to const parameters
  --> /checkout/src/test/ui/const-generics/defaults/needs-feature.rs:9:26
   |
LL | struct A<const N: usize, T=u32>(T);
   |         -----------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<T = u32, const N: usize>`
error: aborting due to previous error


------------------------------------------
------------------------------------------


---- [ui] ui/const-generics/defaults/simple-defaults.rs#min stdout ----
diff of stderr:

2   --> $DIR/simple-defaults.rs:8:40
3    |
4 LL | struct FixedOutput<'a, const N: usize, T=u32> {
-    |                   ---------------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, const N: usize>`
+    |                   ---------------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
7 error: aborting due to previous error
8 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/simple-defaults.min/simple-defaults.min.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/defaults/simple-defaults.rs`

error in revision `min`: 1 errors occurred comparing output.
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/defaults/simple-defaults.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "min" "--error-format" "json" "-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/const-generics/defaults/simple-defaults.min" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/defaults/simple-defaults.min/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: type parameters must be declared prior to const parameters
  --> /checkout/src/test/ui/const-generics/defaults/simple-defaults.rs:8:40
   |
LL | struct FixedOutput<'a, const N: usize, T=u32> {
   |                   ---------------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = u32, const N: usize>`
error: aborting due to previous error


------------------------------------------
------------------------------------------


---- [ui] ui/issues/issue-80512-param-reordering-with-defaults.rs stdout ----

2   --> $DIR/issue-80512-param-reordering-with-defaults.rs:3:18
3    |
3    |
4 LL | struct S<T = (), 'a>(&'a T);
-    |         ---------^^- help: reorder the parameters: lifetimes, then types: `<'a, T = ()>`
+    |         ---------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = ()>`
7 error: aborting due to previous error
8 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-80512-param-reordering-with-defaults/issue-80512-param-reordering-with-defaults.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args issues/issue-80512-param-reordering-with-defaults.rs`
error: 1 errors occurred comparing output.
status: exit code: 1
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-80512-param-reordering-with-defaults.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-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/issues/issue-80512-param-reordering-with-defaults" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-80512-param-reordering-with-defaults/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: lifetime parameters must be declared prior to type parameters
  --> /checkout/src/test/ui/issues/issue-80512-param-reordering-with-defaults.rs:3:18
   |
LL | struct S<T = (), 'a>(&'a T);
   |         ---------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = ()>`
error: aborting due to previous error


------------------------------------------
---
test result: FAILED. 11137 passed; 6 failed; 85 ignored; 0 measured; 0 filtered out; finished in 140.29s



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" "/usr/lib/llvm-9/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "9.0.0" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils 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 codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto 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 passes perfjitevents powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils 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 windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --exclude src/tools/tidy
Build completed unsuccessfully in 0:16:05

varkor

Thanks, this looks great! Could you squash your commits together? I think it's good to go after addressing the one comment.

compiler/rustc_ast_passes/src/ast_validation.rs

src/test/ui/const-generics/defaults/complex-unord-param.min.stderr

max-heller · 2020-12-30T18:45:24Z

Added a note about/placeholder for handling const generic param defaults if/when they are allowed. If the new commits look ok, I'll squash

varkor

I don't remember why we passed an iterator like that instead of the generic parameters themselves. I imagine it was because the method originally looked quite different, and refactorings since then have made it make less sense. This looks good to me after the couple more comments.

compiler/rustc_ast_passes/src/ast_validation.rs

varkor · 2020-12-30T20:53:56Z

Thanks @max-heller! If you squash your commits, I'll approve once CI passes.

…ameters

max-heller · 2020-12-30T21:03:52Z

Done, thanks for the feedback @varkor!

varkor · 2020-12-30T23:20:00Z

@bors r+ rollup

bors · 2020-12-30T23:20:01Z

📌 Commit 947b279 has been approved by varkor

Take type defaults into account in suggestions to reorder generic parameters Fixes rust-lang#80512

Rollup of 8 pull requests Successful merges: - rust-lang#80323 (Update and improve `rustc_codegen_{llvm,ssa}` docs) - rust-lang#80368 (rustdoc: Render visibilities succinctly) - rust-lang#80514 (Fix broken ./x.py install) - rust-lang#80519 (Take type defaults into account in suggestions to reorder generic parameters) - rust-lang#80526 (Update LLVM) - rust-lang#80532 (remove unnecessary trailing semicolon from bootstrap) - rust-lang#80548 (FIx ICE on wf check for foreign fns) - rust-lang#80551 (support pattern as const parents in type_of) Failed merges: - rust-lang#80547 (In which we start to parse const generics defaults) r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned davidtwco Dec 30, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 30, 2020

rust-highfive assigned varkor and unassigned davidtwco Dec 30, 2020

varkor reviewed Dec 30, 2020

View reviewed changes

compiler/rustc_ast_passes/src/ast_validation.rs Outdated Show resolved Hide resolved

src/test/ui/const-generics/defaults/complex-unord-param.min.stderr Show resolved Hide resolved

max-heller requested a review from varkor December 30, 2020 18:45

varkor reviewed Dec 30, 2020

View reviewed changes

compiler/rustc_ast_passes/src/ast_validation.rs Outdated Show resolved Hide resolved

compiler/rustc_ast_passes/src/ast_validation.rs Outdated Show resolved Hide resolved

compiler/rustc_ast_passes/src/ast_validation.rs Outdated Show resolved Hide resolved

max-heller requested a review from varkor December 30, 2020 20:16

Take type defaults into account in suggestions to reorder generic par…

947b279

…ameters

max-heller force-pushed the issue-80512-fix branch from 714fcd3 to 947b279 Compare December 30, 2020 21:02

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 Dec 30, 2020

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 31, 2020

Rollup merge of rust-lang#80519 - max-heller:issue-80512-fix, r=varkor

41817ae

Take type defaults into account in suggestions to reorder generic parameters Fixes rust-lang#80512

This was referenced Dec 31, 2020

Rollup of 8 pull requests #80544

Closed

Rollup of 8 pull requests #80566

Merged

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 31, 2020

Rollup merge of rust-lang#80519 - max-heller:issue-80512-fix, r=varkor

7a46887

Take type defaults into account in suggestions to reorder generic parameters Fixes rust-lang#80512

GuillaumeGomez mentioned this pull request Dec 31, 2020

Rollup of 5 pull requests #80568

Closed

bors merged commit 1f431f9 into rust-lang:master Jan 1, 2021

rustbot added this to the 1.51.0 milestone Jan 1, 2021

max-heller deleted the issue-80512-fix branch January 1, 2021 03:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Take type defaults into account in suggestions to reorder generic parameters #80519

Take type defaults into account in suggestions to reorder generic parameters #80519

max-heller commented Dec 30, 2020

rust-highfive commented Dec 30, 2020

max-heller commented Dec 30, 2020

rust-log-analyzer commented Dec 30, 2020

varkor left a comment •

edited

Loading

max-heller commented Dec 30, 2020

varkor left a comment

varkor commented Dec 30, 2020

max-heller commented Dec 30, 2020

varkor commented Dec 30, 2020

bors commented Dec 30, 2020

Take type defaults into account in suggestions to reorder generic parameters #80519

Take type defaults into account in suggestions to reorder generic parameters #80519

Conversation

max-heller commented Dec 30, 2020

rust-highfive commented Dec 30, 2020

max-heller commented Dec 30, 2020

rust-log-analyzer commented Dec 30, 2020

varkor left a comment • edited Loading

Choose a reason for hiding this comment

max-heller commented Dec 30, 2020

varkor left a comment

Choose a reason for hiding this comment

varkor commented Dec 30, 2020

max-heller commented Dec 30, 2020

varkor commented Dec 30, 2020

bors commented Dec 30, 2020

varkor left a comment •

edited

Loading