Skip to content

Rollup of 10 pull requests - #86373

Closed
GuillaumeGomez wants to merge 26 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-1vwe1h6
Closed

Rollup of 10 pull requests#86373
GuillaumeGomez wants to merge 26 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-1vwe1h6

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Tor Hovlandand others added 26 commits May 12, 2021 18:51
The "read more" sentence formatted "object safety" as inline code
instead of providing a link to more information. This PR adds a link
to the Reference about this matter, as well as the page regarding trait
objects.
…d Vec
To remind people like me who forget about it and send PRs to make them different, and to (probably) get a test failure if the code is changed to no longer uphold it.
Added the --temps-dir option
Fixesrust-lang#10971.
The new `--temps-dir` option puts intermediate files in a user-specified directory. This provides a fix for the issue where parallel invocations of rustc would overwrite each other's intermediate files.
No files are kept in the intermediate directory unless `-C save-temps=yes`.
If additional files are specifically requested using `--emit asm,llvm-bc,llvm-ir,obj,metadata,link,dep-info,mir`, these will be put in the output directory rather than the intermediate directory.
This is a backward-compatible change, i.e. if `--temps-dir` is not specified, the behavior is the same as before.
Fix span calculation in format strings
This pull request fixesrust-lang#86085. The ICE described there is due to an error in the span calculation inside format strings, if the format string is the result of a macro invocation:
```rust
fn main() {
format!(concat!("abc}"));
}
```
currently produces:
```
error: invalid format string: unmatched `}` found
--> test.rs:2:17
|
2 | format!(concat!("abc}"));
| ^ unmatched `}` in format string
```
which is obviously incorrect. This happens because the span of the entire `concat!()` is combined with the _relative_ location of the unmatched `` `}` `` in the _result_ of the macro invocation (i.e. 4).
In rust-lang#86085, this has led to a span that starts or ends in the middle of a multibyte character, but the root cause was the same. This pull request fixes the problem.
…nytm
Mention the `Borrow` guarantee on the `Hash` implementations for Arrays and `Vec`
To remind people like me who forget about it and send PRs to make them different, and to (probably) get a test failure if the code is changed to no longer uphold it.
…d, r=kennytm
Link reference in `dyn` keyword documentation
The "read more" sentence formatted "object safety" as inline code
instead of providing a link to more information. This PR adds a link
to the Reference about this matter, as well as the page regarding trait
objects.
---
We could also put these links in the very first line (instead of the link to the
Book) and in the first paragraph which mentions the "object safe" requirement.
Personally, I think it's good to keep the link to the Book up-front as it's more
accessible than the Reference.
…s, r=petrochenkov
Mention rust-lang#79078 on compatibility notes of 1.52
Closesrust-lang#85854
r? `@petrochenkov`
Do not emit invalid suggestions on multiple mutable borrow errors
Fixesrust-lang#85581
…_predicates, r=oli-obk
Remove `projection_ty_from_predicates`
Fixesrust-lang#86350
r? `@oli-obk`
Remove invalid suggestions for assoc consts on placeholder type error
Fixesrust-lang#82158
This also moves some tests to typeck.
r? `@estebank`
… r=jsha
Add missing backslashes to prevent unwanted backlines in rustdoc HTML
Just adding some forgotten backslashes.
r? `@jsha`
@rustbotrustbot added the rollup A PR which is a rollup label Jun 16, 2021
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=10 rollup=never

@bors

bors commented Jun 16, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit fb4fb21 has been approved by GuillaumeGomez

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 16, 2021
@bors

bors commented Jun 16, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fb4fb21 with merge 7f7e9b0a58eb76307a0120f1b6b3ac2e12cdd50d...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
status: exit code: 2
command: "make"
stdout:
------------------------------------------
make[1]: Entering directory '/d/a/rust/rust/src/test/run-make/issue-10971-temps-dir'
touch /d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/lib.rs
D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2\bin\rustc.exe --crate-type=lib --temps-dir=/d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/temp1 --out-dir=/d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir /d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/lib.rs \
& D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2\bin\rustc.exe --crate-type=cdylib --temps-dir=/d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/temp2 --out-dir=/d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir /d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/lib.rs
make[1]: Leaving directory '/d/a/rust/rust/src/test/run-make/issue-10971-temps-dir'
------------------------------------------
stderr:
------------------------------------------
------------------------------------------
/bin/sh: line 1: D:arustrustbuildx86_64-pc-windows-msvcstage2binrustc.exe: command not found
/bin/sh: line 2: D:arustrustbuildx86_64-pc-windows-msvcstage2binrustc.exe: command not found
make[1]: *** [Makefile:6: all] Error 127
------------------------------------------
failures:
[run-make] run-make\issue-10971-temps-dir
test result: FAILED. 13 passed; 1 failed; 16 ignored; 0 measured; 0 filtered out; finished in 2.95s
command did not execute successfully: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--rustdoc-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustdoc.exe" "--src-base" "D:\\a\\rust\\rust\\src/test\\run-make" "--build-base" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\run-make" "--stage-id" "stage2-x86_64-pc-windows-msvc" "--suite" "run-make" "--mode" "run-make" "--target" "x86_64-pc-windows-msvc" "--host" "x86_64-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--npm" "C:\\Program Files\\nodejs\\npm" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Lnative=D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Lnative=D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.5\\x64\\python3.exe" "--lldb-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.5\\x64\\python3.exe" "--gdb" "C:\\msys64\\usr\\bin\\gdb" "--llvm-version" "12.0.1-rust-1.55.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 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" "--llvm-bin-dir" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin" "--cc" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.29.30037\\bin\\HostX64\\x64\\cl.exe" "--cxx" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.29.30037\\bin\\HostX64\\x64\\cl.exe" "--cflags" "-nologo -MT -Brepro" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"
failed to run: D:\a\rust\rust\build\bootstrap\debug\bootstrap test --stage 2 --exclude src/test/ui --exclude src/tools/linkchecker
Build completed unsuccessfully in 0:47:03
Build completed unsuccessfully in 0:47:03
make: *** [Makefile:72: ci-subset-1] Error 1

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Nothing changed bootstrap or the CI scripts, guess it's a spurious failure...

@bors: retry

@bors

bors commented Jun 16, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fb4fb21 with merge f9951b4d30aca30e8700582fd06ccd79d5f587bf...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
status: exit code: 2
command: "make"
stdout:
------------------------------------------
make[1]: Entering directory '/d/a/rust/rust/src/test/run-make/issue-10971-temps-dir'
touch /d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/lib.rs
D:\a\rust\rust\build\i686-pc-windows-msvc\stage2\bin\rustc.exe --crate-type=lib --temps-dir=/d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/temp1 --out-dir=/d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir /d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/lib.rs \
& D:\a\rust\rust\build\i686-pc-windows-msvc\stage2\bin\rustc.exe --crate-type=cdylib --temps-dir=/d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/temp2 --out-dir=/d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir /d/a/rust/rust/build/i686-pc-windows-msvc/test/run-make/issue-10971-temps-dir/issue-10971-temps-dir/lib.rs
make[1]: Leaving directory '/d/a/rust/rust/src/test/run-make/issue-10971-temps-dir'
------------------------------------------
stderr:
------------------------------------------
------------------------------------------
/bin/sh: line 1: D:arustrustbuildi686-pc-windows-msvcstage2binrustc.exe: command not found
/bin/sh: line 2: D:arustrustbuildi686-pc-windows-msvcstage2binrustc.exe: command not found
make[1]: *** [Makefile:6: all] Error 127
------------------------------------------
failures:
[run-make] run-make\issue-10971-temps-dir
test result: FAILED. 13 passed; 1 failed; 16 ignored; 0 measured; 0 filtered out; finished in 2.87s
command did not execute successfully: "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--rustdoc-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustdoc.exe" "--src-base" "D:\\a\\rust\\rust\\src/test\\run-make" "--build-base" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make" "--stage-id" "stage2-i686-pc-windows-msvc" "--suite" "run-make" "--mode" "run-make" "--target" "i686-pc-windows-msvc" "--host" "i686-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--npm" "C:\\Program Files\\nodejs\\npm" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.5\\x64\\python3.exe" "--lldb-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.5\\x64\\python3.exe" "--gdb" "C:\\msys64\\usr\\bin\\gdb" "--llvm-version" "12.0.1-rust-1.55.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 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" "--llvm-bin-dir" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\llvm\\build\\bin" "--cc" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.29.30037\\bin\\HostX64\\x86\\cl.exe" "--cxx" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.29.30037\\bin\\HostX64\\x86\\cl.exe" "--cflags" "-nologo -MT -Brepro" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"
failed to run: D:\a\rust\rust\build\bootstrap\debug\bootstrap test --stage 2 --exclude src/test/ui --exclude src/tools/linkchecker
Build completed unsuccessfully in 0:44:27
Build completed unsuccessfully in 0:44:27
make: *** [Makefile:72: ci-subset-1] Error 1

@bors

bors commented Jun 16, 2021

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Jun 16, 2021
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

There is something very wrong here but no idea what... Let's close and see if other PRs hit the same issue...

@GuillaumeGomez
GuillaumeGomez deleted the rollup-1vwe1h6 branch June 16, 2021 20:03
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@GuillaumeGomez@bors@rust-log-analyzer@rustbot@FabianWolff@amorison@scottmcm@JohnTitor@snoyberg