[beta] Prepare Rust 1.70.0 #110414

pietroalbini · 2023-04-16T14:35:11Z

This PR replaces the version placeholders, and changes the channel to beta.

r? @ghost
cc @rust-lang/release

rustbot · 2023-04-16T14:35:17Z

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

pietroalbini · 2023-04-16T14:35:27Z

@bors r+ p=500 rollup=never

bors · 2023-04-16T14:35:29Z

📌 Commit a27ea2b has been approved by pietroalbini

It is now in the queue for this repository.

bors · 2023-04-16T17:47:27Z

⌛ Testing commit a27ea2b with merge 462f00525e8c26359bcfe189e5e17b987c61e2e1...

bors · 2023-04-16T18:25:02Z

💔 Test failed - checks-actions

ehuss · 2023-04-16T18:56:25Z

The error is likely caused by #109044.

pietroalbini · 2023-04-17T09:19:15Z

Added three commits to fix the test failure, I'll open a PR to land them on master later today.

The error is likely caused by #109044.

Indeed it was! There's a reason why it failed just on the wasm32 builder though: compiletest passes RUSTC_BOOTSTRAP=1 to all tests, even on beta and stable, so the test continued to work. On WASM though std::env::var is not implemented though, so the nightly check returned false just on that builder. Groan.

I'd like a review of the last three commits.

Mark-Simulacrum

r=me

Mark-Simulacrum · 2023-04-18T09:51:53Z

tests/ui/feature-gates/test-listing-format-json.rs

+// run-flags: --list --format json -Zunstable-options
+// run-fail
+// check-run-results
+// ignore-nightly


Are we checking this on the stable builder today? Or does that not run tests - I forget.

It should be running the full tests, so yes it should be executed in theory.

pietroalbini · 2023-04-18T09:53:28Z

@bors r=Mark-Simulacrum p=500 rollup=never

bors · 2023-04-18T09:53:30Z

📌 Commit 988610a has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2023-04-18T10:46:50Z

⌛ Testing commit 988610a with merge c6aa13da433d9afa2a1d5c7275ee311ba6e2b894...

rust-log-analyzer · 2023-04-18T11:42:57Z

The job x86_64-gnu-llvm-15 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/stage2/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/usr/lib/llvm-15/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 fuzzercli 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 objcopy 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 windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" LLVM_FILECHECK="/usr/lib/llvm-15/bin/FileCheck" NODE="/usr/bin/node" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" RUST_BUILD_STAGE="stage2-x86_64-unknown-linux-gnu" RUST_DEMANGLER="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/rust-demangler" S="/checkout" TARGET="x86_64-unknown-linux-gnu" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/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/stage2/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/stage2/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-18T11:43:20Z

💔 Test failed - checks-actions

pietroalbini · 2023-04-18T12:10:27Z

@bors retry

bors · 2023-04-18T13:50:13Z

⌛ Testing commit 988610a with merge e9d48e9d574fb30e8017a824a0534006a5f9364a...

ehuss · 2023-04-18T15:11:01Z

BTW, I marked #110361 as beta-nominated to avoid the error that happened above.

bors · 2023-04-18T18:05:14Z

💥 Test timed out

rust-log-analyzer · 2023-04-18T18:37:17Z

The job dist-x86_64-apple-alt failed! Check out the build log: (web) (plain)

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

  process didn't exit successfully: `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/release/build/libnghttp2-sys-501a42d5d1e0b9a6/build-script-build` (exit status: 1)
  --- stdout
  TARGET = Some("x86_64-apple-darwin")
  OPT_LEVEL = Some("3")
  HOST = Some("x86_64-apple-darwin")
  cargo:rerun-if-env-changed=CC_x86_64-apple-darwin
  CC_x86_64-apple-darwin = None
  cargo:rerun-if-env-changed=CC_x86_64_apple_darwin
  CC_x86_64_apple_darwin = Some("sccache /Users/runner/work/rust/rust/clang+llvm-14.0.5-x86_64-apple-darwin/bin/clang")
  cargo:rerun-if-env-changed=CFLAGS_x86_64-apple-darwin
  CFLAGS_x86_64-apple-darwin = None
  cargo:rerun-if-env-changed=CFLAGS_x86_64_apple_darwin
  CFLAGS_x86_64_apple_darwin = Some("-ffunction-sections -fdata-sections -fPIC --target=x86_64-apple-darwin -stdlib=libc++ -fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/e9d48e9d574fb30e8017a824a0534006a5f9364a")
  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
  DEBUG = Some("false")
  DEBUG = Some("false")
  running: "sccache" "/Users/runner/work/rust/rust/clang+llvm-14.0.5-x86_64-apple-darwin/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/e9d48e9d574fb30e8017a824a0534006a5f9364a" "-I" "nghttp2/lib/includes" "-I" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-2511d6699e96c0f1/out/i/include" "-DNGHTTP2_STATICLIB" "-DHAVE_NETINET_IN" "-DHAVE_ARPA_INET_H" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-2511d6699e96c0f1/out/i/lib/nghttp2/lib/nghttp2_buf.o" "-c" "nghttp2/lib/nghttp2_buf.c"
  cargo:warning=sccache: error: Timed out waiting for server startup

  --- stderr



  error occurred: Command "sccache" "/Users/runner/work/rust/rust/clang+llvm-14.0.5-x86_64-apple-darwin/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/e9d48e9d574fb30e8017a824a0534006a5f9364a" "-I" "nghttp2/lib/includes" "-I" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-2511d6699e96c0f1/out/i/include" "-DNGHTTP2_STATICLIB" "-DHAVE_NETINET_IN" "-DHAVE_ARPA_INET_H" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-2511d6699e96c0f1/out/i/lib/nghttp2/lib/nghttp2_buf.o" "-c" "nghttp2/lib/nghttp2_buf.c" with args "clang" did not execute successfully (status code exit status: 2).

warning: build failed, waiting for other jobs to finish...
[RUSTC-TIMING] annotate_snippets test:false 329.803
[RUSTC-TIMING] diff test:false 153.393
---
[RUSTC-TIMING] term test:false 510.823
[RUSTC-TIMING] toml test:false 579.727
[TIMING] tool::ToolBuild { compiler: Compiler { stage: 1, host: x86_64-apple-darwin }, target: x86_64-apple-darwin, tool: "rustfmt", path: "src/tools/rustfmt", mode: ToolRustc, is_optional_tool: true, source_type: InTree, extra_features: [], allow_features: "" } -- 581.176
[TIMING] tool::Rustfmt { compiler: Compiler { stage: 1, host: x86_64-apple-darwin }, target: x86_64-apple-darwin, extra_features: [] } -- 0.001
thread 'main' panicked at 'rustfmt expected to build - essential tool', dist.rs:1306:14
Build completed unsuccessfully in 4:37:15

pietroalbini · 2023-04-19T09:22:55Z

@bors retry

bors · 2023-04-19T10:39:39Z

⌛ Testing commit 988610a with merge 1b7dd22...

bors · 2023-04-19T13:03:29Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 1b7dd22 to beta...

…sts, r=Mark-Simulacrum Update tests for libtest `--format json` This PR makes the test work on beta and stable, and adds a test ensuring the option is not available on beta and stable. Backported these commits from rust-lang#110414.

pietroalbini added 2 commits April 16, 2023 16:33

replace version placeholders

8df5419

bump the channel to beta

a27ea2b

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

This comment has been minimized.

Sign in to view

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

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 17, 2023

pietroalbini added 3 commits April 17, 2023 11:16

treat the dev channel as nightly in compiletest

58cfc1c

add support for // unset-exec-env in compiletest

86dfb0d

update tests for the test harness's json formatting

988610a

pietroalbini force-pushed the pa-1.70.0-beta branch from 03d4377 to 988610a Compare April 17, 2023 09:16

pietroalbini assigned Mark-Simulacrum Apr 18, 2023

Mark-Simulacrum approved these changes Apr 18, 2023

View reviewed changes

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 18, 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 18, 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 18, 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 18, 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 19, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2023

bors merged commit 1b7dd22 into rust-lang:beta Apr 19, 2023

rustbot added this to the 1.70.0 milestone Apr 19, 2023

pietroalbini deleted the pa-1.70.0-beta branch April 19, 2023 13:03

pietroalbini mentioned this pull request Apr 21, 2023

Update tests for libtest --format json #110644

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[beta] Prepare Rust 1.70.0 #110414

[beta] Prepare Rust 1.70.0 #110414

pietroalbini commented Apr 16, 2023

rustbot commented Apr 16, 2023

pietroalbini commented Apr 16, 2023

bors commented Apr 16, 2023

bors commented Apr 16, 2023

This comment has been minimized.

bors commented Apr 16, 2023

ehuss commented Apr 16, 2023

pietroalbini commented Apr 17, 2023

Mark-Simulacrum left a comment

Mark-Simulacrum Apr 18, 2023

pietroalbini Apr 18, 2023

pietroalbini commented Apr 18, 2023

bors commented Apr 18, 2023

bors commented Apr 18, 2023

rust-log-analyzer commented Apr 18, 2023

bors commented Apr 18, 2023

pietroalbini commented Apr 18, 2023

bors commented Apr 18, 2023

ehuss commented Apr 18, 2023

bors commented Apr 18, 2023

rust-log-analyzer commented Apr 18, 2023

pietroalbini commented Apr 19, 2023

bors commented Apr 19, 2023

bors commented Apr 19, 2023

[beta] Prepare Rust 1.70.0 #110414

[beta] Prepare Rust 1.70.0 #110414

Conversation

pietroalbini commented Apr 16, 2023

rustbot commented Apr 16, 2023

pietroalbini commented Apr 16, 2023

bors commented Apr 16, 2023

bors commented Apr 16, 2023

This comment has been minimized.

bors commented Apr 16, 2023

ehuss commented Apr 16, 2023

pietroalbini commented Apr 17, 2023

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

Mark-Simulacrum Apr 18, 2023

Choose a reason for hiding this comment

pietroalbini Apr 18, 2023

Choose a reason for hiding this comment

pietroalbini commented Apr 18, 2023

bors commented Apr 18, 2023

bors commented Apr 18, 2023

rust-log-analyzer commented Apr 18, 2023

bors commented Apr 18, 2023

pietroalbini commented Apr 18, 2023

bors commented Apr 18, 2023

ehuss commented Apr 18, 2023

bors commented Apr 18, 2023

rust-log-analyzer commented Apr 18, 2023

pietroalbini commented Apr 19, 2023

bors commented Apr 19, 2023

bors commented Apr 19, 2023