Rollup of 5 pull requests #83728

Dylan-DPC-zz · 2021-03-31T23:19:24Z

Successful merges:

Add more info for common trait resolution and async/await errors #83689 (Add more info for common trait resolution and async/await errors)
Add a regression test for issue-68830 #83699 (Add a regression test for issue-68830)
Fix documentation of conversion from String to OsString #83700 (Fix documentation of conversion from String to OsString)
Clarify --print target-list is a rustc's option #83711 (Clarify --print target-list is a rustc's option)
Update LLVM with another wasm simd fix #83712 (Update LLVM with another wasm simd fix)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

More links, one more occurrence of “a OsString” Co-authored-by: Yuki Okushi <[email protected]>

Just a small bug fix for opcode numberings, not too major.

…dtwco Add more info for common trait resolution and async/await errors * Suggest `Pin::new`/`Box::new`/`Arc::new`/`Box::pin` in more cases * Point at `impl` and type defs introducing requirements on E0277

Add a regression test for issue-68830 Closes rust-lang#68830

…on_documentation, r=JohnTitor Fix documentation of conversion from String to OsString From [this question on URLO](https://users.rust-lang.org/t/does-converting-a-string-into-a-pathbuf-allocate-new-buffer/57678), I noticed that the documentation of `From<String> for OsString` incorrectly claims to be copying data. ```@rustbot``` modify labels: T-doc, T-libs

…get-error, r=davidtwco Clarify `--print target-list` is a rustc's option Fixes rust-lang#68238

…dates, r=nikic Update LLVM with another wasm simd fix Just a small bug fix for opcode numberings, not too major.

Dylan-DPC-zz · 2021-03-31T23:20:09Z

@bors r+ rollup=never p=5

bors · 2021-03-31T23:20:10Z

📌 Commit f3082a1 has been approved by Dylan-DPC

bors · 2021-03-31T23:48:53Z

⌛ Testing commit f3082a1 with merge 9b206c282f4b090ac15031da4f07238dc2946d93...

rust-log-analyzer · 2021-04-01T00:15:08Z

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)


---- [ui (nll)] ui/kindck/kindck-impl-type-params.rs stdout ----
diff of stderr:

4 LL |     let a = &t as &dyn Gettable<T>;
5    |             ^^ `T` cannot be sent between threads safely
6    |
-    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+ note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+   --> $DIR/kindck-impl-type-params.rs:14:32
+    |
+ LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
+    |                                ^^^^^^^^^^^     ^^^^
8    = note: required for the cast to the object type `dyn Gettable<T>`
9 help: consider restricting type parameter `T`


17 LL |     let a = &t as &dyn Gettable<T>;
18    |             ^^ the trait `Copy` is not implemented for `T`
19    |
-    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+ note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+   --> $DIR/kindck-impl-type-params.rs:14:32
+    |
+ LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
+    |                                ^^^^^^^^^^^     ^^^^
21    = note: required for the cast to the object type `dyn Gettable<T>`
22 help: consider restricting type parameter `T`


30 LL |     let a: &dyn Gettable<T> = &t;
31    |                               ^^ `T` cannot be sent between threads safely
32    |
-    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+ note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+   --> $DIR/kindck-impl-type-params.rs:14:32
+    |
+ LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
+    |                                ^^^^^^^^^^^     ^^^^
34    = note: required for the cast to the object type `dyn Gettable<T>`
35 help: consider restricting type parameter `T`


43 LL |     let a: &dyn Gettable<T> = &t;
44    |                               ^^ the trait `Copy` is not implemented for `T`
45    |
-    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+ note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
+   --> $DIR/kindck-impl-type-params.rs:14:32
+    |
+ LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
+    |                                ^^^^^^^^^^^     ^^^^
47    = note: required for the cast to the object type `dyn Gettable<T>`
48 help: consider restricting type parameter `T`


56 LL |     let a = t as Box<dyn Gettable<String>>;
57    |             ^ the trait `Copy` is not implemented for `String`
58    |
-    = note: required because of the requirements on the impl of `Gettable<String>` for `S<String>`
+ note: required because of the requirements on the impl of `Gettable<String>` for `S<String>`
+   --> $DIR/kindck-impl-type-params.rs:14:32
+    |
+ LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
+    |                                ^^^^^^^^^^^     ^^^^
60    = note: required for the cast to the object type `dyn Gettable<String>`
61 
62 error[E0277]: the trait bound `Foo: Copy` is not satisfied

65 LL |     let a: Box<dyn Gettable<Foo>> = t;
66    |                                     ^ the trait `Copy` is not implemented for `Foo`
67    |
-    = note: required because of the requirements on the impl of `Gettable<Foo>` for `S<Foo>`
+ note: required because of the requirements on the impl of `Gettable<Foo>` for `S<Foo>`
+   --> $DIR/kindck-impl-type-params.rs:14:32
+    |
+ LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
+    |                                ^^^^^^^^^^^     ^^^^
69    = note: required for the cast to the object type `dyn Gettable<Foo>`
71 error: aborting due to 6 previous errors


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/kindck/kindck-impl-type-params.nll/kindck-impl-type-params.nll.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args kindck/kindck-impl-type-params.rs`
error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/kindck/kindck-impl-type-params.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/kindck/kindck-impl-type-params.nll" "-Zborrowck=mir" "-A" "unused" "-Crpath" "-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/kindck/kindck-impl-type-params.nll/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error[E0277]: `T` cannot be sent between threads safely
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:18:13
   |
LL |     let a = &t as &dyn Gettable<T>;
   |             ^^ `T` cannot be sent between threads safely
   |
note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:14:32
   |
LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
   |                                ^^^^^^^^^^^     ^^^^
   = note: required for the cast to the object type `dyn Gettable<T>`
help: consider restricting type parameter `T`
   |
LL | fn f<T: Send>(val: T) {


error[E0277]: the trait bound `T: Copy` is not satisfied
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:18:13
   |
LL |     let a = &t as &dyn Gettable<T>;
   |             ^^ the trait `Copy` is not implemented for `T`
   |
note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:14:32
   |
LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
   |                                ^^^^^^^^^^^     ^^^^
   = note: required for the cast to the object type `dyn Gettable<T>`
help: consider restricting type parameter `T`
   |
LL | fn f<T: Copy>(val: T) {


error[E0277]: `T` cannot be sent between threads safely
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:25:31
   |
LL |     let a: &dyn Gettable<T> = &t;
   |                               ^^ `T` cannot be sent between threads safely
   |
note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:14:32
   |
LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
   |                                ^^^^^^^^^^^     ^^^^
   = note: required for the cast to the object type `dyn Gettable<T>`
help: consider restricting type parameter `T`
   |
LL | fn g<T: Send>(val: T) {


error[E0277]: the trait bound `T: Copy` is not satisfied
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:25:31
   |
LL |     let a: &dyn Gettable<T> = &t;
   |                               ^^ the trait `Copy` is not implemented for `T`
   |
note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:14:32
   |
LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
   |                                ^^^^^^^^^^^     ^^^^
   = note: required for the cast to the object type `dyn Gettable<T>`
help: consider restricting type parameter `T`
   |
LL | fn g<T: Copy>(val: T) {

error[E0277]: the trait bound `String: Copy` is not satisfied
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:38:13
   |
   |
LL |     let a = t as Box<dyn Gettable<String>>;
   |             ^ the trait `Copy` is not implemented for `String`
   |
note: required because of the requirements on the impl of `Gettable<String>` for `S<String>`
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:14:32
   |
LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
   |                                ^^^^^^^^^^^     ^^^^
   = note: required for the cast to the object type `dyn Gettable<String>`

error[E0277]: the trait bound `Foo: Copy` is not satisfied
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:46:37
   |
LL |     let a: Box<dyn Gettable<Foo>> = t;
   |                                     ^ the trait `Copy` is not implemented for `Foo`
   |
note: required because of the requirements on the impl of `Gettable<Foo>` for `S<Foo>`
  --> /checkout/src/test/ui/kindck/kindck-impl-type-params.rs:14:32
   |
LL | impl<T: Send + Copy + 'static> Gettable<T> for S<T> {}
   |                                ^^^^^^^^^^^     ^^^^
   = note: required for the cast to the object type `dyn Gettable<Foo>`
error: aborting due to 6 previous errors

For more information about this error, try `rustc --explain E0277`.


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


---- [ui (nll)] ui/rfc1623.rs stdout ----
diff of stderr:

11    |
12    = help: within `&SomeStruct`, the trait `Sync` is not implemented for `dyn for<'a, 'b> Fn(&'a Foo<'b>) -> &'a Foo<'b>`
13    = note: required because it appears within the type `&dyn for<'a, 'b> Fn(&'a Foo<'b>) -> &'a Foo<'b>`
-    = note: required because it appears within the type `SomeStruct`
+ note: required because it appears within the type `SomeStruct`
+   --> $DIR/rfc1623.rs:11:8
+    |
+ LL | struct SomeStruct<'x, 'y, 'z: 'x> {
+    |        ^^^^^^^^^^
15    = note: required because it appears within the type `&SomeStruct`
16    = note: shared static variables must have a type that implements `Sync`


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/rfc1623.nll/rfc1623.nll.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args rfc1623.rs`
error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/rfc1623.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/rfc1623.nll" "-Zborrowck=mir" "-A" "unused" "-Crpath" "-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/rfc1623.nll/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error[E0277]: `dyn for<'a, 'b> Fn(&'a Foo<'b>) -> &'a Foo<'b>` cannot be shared between threads safely
   |
   |
LL | / static SOME_STRUCT: &SomeStruct = &SomeStruct {
LL | |     foo: &Foo { bools: &[false, true] },
LL | |     bar: &Bar { bools: &[true, true] },
LL | |     f: &id,
LL | |     //~^ ERROR implementation of `FnOnce` is not general enough
LL | | };
   | |__^ `dyn for<'a, 'b> Fn(&'a Foo<'b>) -> &'a Foo<'b>` cannot be shared between threads safely
   |
   = help: within `&SomeStruct`, the trait `Sync` is not implemented for `dyn for<'a, 'b> Fn(&'a Foo<'b>) -> &'a Foo<'b>`
   = note: required because it appears within the type `&dyn for<'a, 'b> Fn(&'a Foo<'b>) -> &'a Foo<'b>`
note: required because it appears within the type `SomeStruct`
   |
   |
LL | struct SomeStruct<'x, 'y, 'z: 'x> {
   |        ^^^^^^^^^^
   = note: required because it appears within the type `&SomeStruct`
   = note: shared static variables must have a type that implements `Sync`
error: higher-ranked subtype error
  --> /checkout/src/test/ui/rfc1623.rs:21:35
   |
   |
LL |   static SOME_STRUCT: &SomeStruct = &SomeStruct {
   |  ___________________________________^
LL | |     foo: &Foo { bools: &[false, true] },
LL | |     bar: &Bar { bools: &[true, true] },
LL | |     f: &id,
LL | |     //~^ ERROR implementation of `FnOnce` is not general enough
LL | | };

error: higher-ranked subtype error
  --> /checkout/src/test/ui/rfc1623.rs:21:35
   |
   |
LL |   static SOME_STRUCT: &SomeStruct = &SomeStruct {
   |  ___________________________________^
LL | |     foo: &Foo { bools: &[false, true] },
LL | |     bar: &Bar { bools: &[true, true] },
LL | |     f: &id,
LL | |     //~^ ERROR implementation of `FnOnce` is not general enough
LL | | };

error: higher-ranked subtype error
  --> /checkout/src/test/ui/rfc1623.rs:21:35
   |
   |
LL |   static SOME_STRUCT: &SomeStruct = &SomeStruct {
   |  ___________________________________^
LL | |     foo: &Foo { bools: &[false, true] },
LL | |     bar: &Bar { bools: &[true, true] },
LL | |     f: &id,
LL | |     //~^ ERROR implementation of `FnOnce` is not general enough
LL | | };

error: higher-ranked subtype error
  --> /checkout/src/test/ui/rfc1623.rs:21:35
   |
   |
LL |   static SOME_STRUCT: &SomeStruct = &SomeStruct {
   |  ___________________________________^
LL | |     foo: &Foo { bools: &[false, true] },
LL | |     bar: &Bar { bools: &[true, true] },
LL | |     f: &id,
LL | |     //~^ ERROR implementation of `FnOnce` is not general enough
LL | | };

error: aborting due to 5 previous errors

For more information about this error, try `rustc --explain E0277`.
---
    [ui (nll)] ui/rfc1623.rs

test result: FAILED. 11603 passed; 2 failed; 124 ignored; 0 measured; 0 filtered out; finished in 107.90s

Some tests failed in compiletest suite=ui compare_mode=Nll mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu


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 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -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" "12.0.0-rust-1.53.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 cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink 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 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 windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" "--compare-mode" "nll"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test
Build completed unsuccessfully in 0:21:14

bors · 2021-04-01T00:17:59Z

💔 Test failed - checks-actions

estebank and others added 15 commits March 30, 2021 10:01

Suggest Pin/Box/Arc for more cases

fd66899

Point at impl and type defs introducing requirements on E0277

7528cc3

Always mention Box::pin when dealing with !Unpin

923c122

Add a regression test for issue-68830

ce66588

Fix documentation of conversion from String to OsString

e7821e5

Add a few missing links, fix a typo

f5e7dbb

Apply suggestions from code review

7509aa1

More links, one more occurrence of “a OsString” Co-authored-by: Yuki Okushi <[email protected]>

Clarify --print target-list is a rustc's option

82c6709

Update LLVM with another wasm simd fix

9acf558

Just a small bug fix for opcode numberings, not too major.

review comments

06b82ab

Rollup merge of rust-lang#83689 - estebank:cool-bears-hot-tip, r=davi…

d79d6b3

…dtwco Add more info for common trait resolution and async/await errors * Suggest `Pin::new`/`Box::new`/`Arc::new`/`Box::pin` in more cases * Point at `impl` and type defs introducing requirements on E0277

Rollup merge of rust-lang#83699 - JohnTitor:issue-68830, r=Dylan-DPC

0bf6861

Add a regression test for issue-68830 Closes rust-lang#68830

Rollup merge of rust-lang#83711 - JohnTitor:more-friendly-unknown-tar…

82ab0cd

…get-error, r=davidtwco Clarify `--print target-list` is a rustc's option Fixes rust-lang#68238

Rollup merge of rust-lang#83712 - alexcrichton:more-wasm-simd-llvm-up…

f3082a1

…dates, r=nikic Update LLVM with another wasm simd fix Just a small bug fix for opcode numberings, not too major.

rustbot added the rollup A PR which is a rollup label Mar 31, 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 Mar 31, 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 Apr 1, 2021

Dylan-DPC-zz mentioned this pull request Apr 1, 2021

Add more info for common trait resolution and async/await errors #83689

Merged

Dylan-DPC-zz closed this Apr 1, 2021

Dylan-DPC-zz deleted the rollup-ue7ye1s branch April 1, 2021 00:41

Rustin170506 mentioned this pull request Apr 1, 2021

give full path of constraint in suggest_constraining_type_param #83673

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #83728

Rollup of 5 pull requests #83728

Dylan-DPC-zz commented Mar 31, 2021

Dylan-DPC-zz commented Mar 31, 2021

bors commented Mar 31, 2021

bors commented Mar 31, 2021

rust-log-analyzer commented Apr 1, 2021

bors commented Apr 1, 2021

Rollup of 5 pull requests #83728

Rollup of 5 pull requests #83728

Conversation

Dylan-DPC-zz commented Mar 31, 2021

Dylan-DPC-zz commented Mar 31, 2021

bors commented Mar 31, 2021

bors commented Mar 31, 2021

rust-log-analyzer commented Apr 1, 2021

bors commented Apr 1, 2021