Rollup of 6 pull requests by matthiaskrgr · Pull Request #110363 · rust-lang/rust

matthiaskrgr · 2023-04-15T15:47:56Z

Successful merges:

Add 1.69.0 release notes #110033 (Add 1.69.0 release notes)
fix: skip implied bounds if unconstrained lifetime exists #110272 (fix: skip implied bounds if unconstrained lifetime exists)
Allow everyone to set the beta-nominated label #110307 (Allow everyone to set the beta-nominated label)
Add intra-doc links to size_of_* functions #110347 (Add intra-doc links to size_of_* functions)
Add a UI test for #79605 #110350 (Add a UI test for E0121 hint has duplicated type param with lifetime #79605)
Fix x test rust-installer when cargo is set to a relative path #110356 (Fix x test rust-installer when cargo is set to a relative path)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Co-authored-by: Scott Schafer <scott@scottschafer.dev>

Co-authored-by: Slanterns <slanterns.w@gmail.com>

Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>

Co-authored-by: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>

Co-authored-by: Eric Huss <eric@huss.org>

Co-authored-by: est31 <est31@users.noreply.github.com>

Co-authored-by: Eric Huss <eric@huss.org>

It is allowed both in cargo and clippy's triagebot.toml, and nomination does not automatically mean that the PR will be backported.

Previously, this would give an error because the shell script had a different working directory: ``` test: basic_install $ sh /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh --image-dir=/home/jyn/src/rust/src/tools/rust-installer/test/image1 --work-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/workdir --output-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/outdir /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh: 15: ../rust3/build/host/stage2-tools-bin/cargo: not found TEST FAILED! ```

…lbini Add 1.69.0 release notes cc ```@rust-lang/release``` r? ```@Mark-Simulacrum```

…unds, r=aliemjay fix: skip implied bounds if unconstrained lifetime exists Fixes rust-lang#110161 r? ```@aliemjay```

…ed, r=Mark-Simulacrum Allow everyone to set the beta-nominated label It is allowed both in cargo and clippy's triagebot.toml, and nomination does not automatically mean that the PR will be backported.

Add intra-doc links to size_of_* functions Also some smaller doc improvements.

Add a UI test for rust-lang#79605 rust-lang#79605 was fixed somewhere between December 2020 and now, but it did not have a UI test. This PR adds a UI test for the error.

…anonur Fix `x test rust-installer` when `cargo` is set to a relative path Previously, this would give an error because the shell script had a different working directory: ``` test: basic_install $ sh /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh --image-dir=/home/jyn/src/rust/src/tools/rust-installer/test/image1 --work-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/workdir --output-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/outdir /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh: 15: ../rust3/build/host/stage2-tools-bin/cargo: not found TEST FAILED! ```

matthiaskrgr · 2023-04-15T15:48:12Z

@bors r+ rollup=never p=6

bors · 2023-04-15T15:48:14Z

📌 Commit 71b2bbc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-15T17:25:40Z

⌛ Testing commit 71b2bbc with merge b36738912d2fbf40b1d7ea04b724a63036dd237f...

rust-log-analyzer · 2023-04-15T18:19:14Z

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

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

---- [run-make] tests/run-make/jobserver-error stdout ----

error: make failed
status: exit status: 2
command: cd "/checkout/tests/run-make/jobserver-error" && AR="ar" CC="cc -ffunction-sections -fdata-sections -fPIC -m64" CXX="c++ -ffunction-sections -fdata-sections -fPIC -m64" HOST_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/usr/lib/llvm-14/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca 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 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 lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo 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 perfjitevents 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 ve veasmparser vecodegen vectorize vedesc vedisassembler veinfo webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" LLVM_FILECHECK="/usr/lib/llvm-14/bin/FileCheck" NODE="/usr/bin/node" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustdoc" RUST_BUILD_STAGE="stage1-x86_64-unknown-linux-gnu" RUST_DEMANGLER="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/rust-demangler" S="/checkout" TARGET="x86_64-unknown-linux-gnu" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib" TMPDIR="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error" "make"
--- stdout -------------------------------
bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=3,3" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error:/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error  - 3</dev/null' 2>&1 | diff jobserver.stderr -
1,4d0
< error: failed to acquire jobserver token: early EOF on jobserver pipe
< error: aborting due to previous error
<
------------------------------------------
--- stderr -------------------------------

bors · 2023-04-15T18:19:34Z

💔 Test failed - checks-actions

matthiaskrgr · 2023-04-15T18:20:55Z

@bors retry

bors · 2023-04-15T18:32:56Z

⌛ Testing commit 71b2bbc with merge 4b70ddab99735d104240593b2c74f7c6b3367de7...

rust-log-analyzer · 2023-04-15T19:26:15Z

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

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

---- [run-make] tests/run-make/jobserver-error stdout ----

error: make failed
status: exit status: 2
command: cd "/checkout/tests/run-make/jobserver-error" && AR="ar" CC="cc -ffunction-sections -fdata-sections -fPIC -m64" CXX="c++ -ffunction-sections -fdata-sections -fPIC -m64" HOST_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/usr/lib/llvm-14/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca 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 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 lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo 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 perfjitevents 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 ve veasmparser vecodegen vectorize vedesc vedisassembler veinfo webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" LLVM_FILECHECK="/usr/lib/llvm-14/bin/FileCheck" NODE="/usr/bin/node" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustdoc" RUST_BUILD_STAGE="stage1-x86_64-unknown-linux-gnu" RUST_DEMANGLER="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/rust-demangler" S="/checkout" TARGET="x86_64-unknown-linux-gnu" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib" TMPDIR="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error" "make"
--- stdout -------------------------------
bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=3,3" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error:/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error  - 3</dev/null' 2>&1 | diff jobserver.stderr -
1,4d0
< error: failed to acquire jobserver token: early EOF on jobserver pipe
< error: aborting due to previous error
<
------------------------------------------
--- stderr -------------------------------

bors · 2023-04-15T19:26:38Z

💔 Test failed - checks-actions

cuviper and others added 24 commits April 6, 2023 17:41

Add 1.69.0 release notes

af3bf85

Cargo only suggests fixes for warnings

21f10dd

Co-authored-by: Scott Schafer <scott@scottschafer.dev>

core::net is not stable yet

6b33156

Co-authored-by: Slanterns <slanterns.w@gmail.com>

Rephrase the analysis removal

f6a47f3

Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>

Remove empty "Misc" section

c21b104

Avoid normalization/projection jargon

361b453

Co-authored-by: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>

Apply code formatting

02b3165

Apply suggestions from code review

f9f2516

Co-authored-by: Eric Huss <eric@huss.org>

Apply suggestions from code review

c9358e9

Co-authored-by: est31 <est31@users.noreply.github.com>

Cargo '-C' was reverted

ae60b36

Co-authored-by: Eric Huss <eric@huss.org>

fix: skip implied bounds if unconstrained lifetime exists

ecf2a9b

Update the mingw version note

617648c

Allow everyone to set the beta-nominated label

0aa958b

It is allowed both in cargo and clippy's triagebot.toml, and nomination does not automatically mean that the PR will be backported.

implement review suggestions

b506d96

add UI test for rust-lang#79605

714c276

Add intra-doc links to size_of_* functions

504a47b

Update compiler/rustc_trait_selection/src/traits/outlives_bounds.rs

4c80f58

Rollup merge of rust-lang#110033 - cuviper:relnotes-1.69.0, r=pietroa…

b6abbed

…lbini Add 1.69.0 release notes cc ```@rust-lang/release``` r? ```@Mark-Simulacrum```

Rollup merge of rust-lang#110272 - Ezrashaw:fix-unconned-lt-in-implbo…

d8cae13

…unds, r=aliemjay fix: skip implied bounds if unconstrained lifetime exists Fixes rust-lang#110161 r? ```@aliemjay```

Rollup merge of rust-lang#110307 - est31:beta_nominated_unauthenticat…

21fd48b

…ed, r=Mark-Simulacrum Allow everyone to set the beta-nominated label It is allowed both in cargo and clippy's triagebot.toml, and nomination does not automatically mean that the PR will be backported.

Rollup merge of rust-lang#110347 - est31:size_of_links, r=jyn514

1b4d305

Add intra-doc links to size_of_* functions Also some smaller doc improvements.

Rollup merge of rust-lang#110350 - SparkyPotato:test-79605, r=cjgillot

300a741

Add a UI test for rust-lang#79605 rust-lang#79605 was fixed somewhere between December 2020 and now, but it did not have a UI test. This PR adds a UI test for the error.

rustbot added the rollup A PR which is a rollup label Apr 15, 2023

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 Apr 15, 2023

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 15, 2023

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 Apr 15, 2023

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 15, 2023

matthiaskrgr closed this Apr 16, 2023

matthiaskrgr deleted the rollup-ud71wla branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#110363

Rollup of 6 pull requests#110363
matthiaskrgr wants to merge 24 commits intorust-lang:masterfrom
matthiaskrgr:rollup-ud71wla

matthiaskrgr commented Apr 15, 2023

Uh oh!

matthiaskrgr commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

rust-log-analyzer commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

matthiaskrgr commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

rust-log-analyzer commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

matthiaskrgr commented Apr 15, 2023

Uh oh!

matthiaskrgr commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

rust-log-analyzer commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

matthiaskrgr commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

rust-log-analyzer commented Apr 15, 2023

Uh oh!

bors commented Apr 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants