Skip to content

[beta-1.97] Update cargo submodule#158630

Merged
rust-bors[bot] merged 1 commit into
rust-lang:betafrom
weihanglo:beta-cargo-backport
Jul 1, 2026
Merged

[beta-1.97] Update cargo submodule#158630
rust-bors[bot] merged 1 commit into
rust-lang:betafrom
weihanglo:beta-cargo-backport

Conversation

@weihanglo

Copy link
Copy Markdown
Member

1 commits in 910306f2a7b889a7ff58fd4a451d3daf356a4cbb..c980f4866141969fab6254a680546a277789d6f0
2026-06-11 13:13:29 -0600 to 2026-06-30 13:45:43 -0700

r? ghost

@rustbot

rustbot commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2026
@rustbot

rustbot commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

@weihanglo

Copy link
Copy Markdown
Member Author

Give it a higher prority as we are going to branch off new nightly

@bors r+ rollup=never p=6

@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit afbfb2f has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 30, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jun 30, 2026
[beta-1.97] Update cargo submodule

1 commits in 910306f2a7b889a7ff58fd4a451d3daf356a4cbb..c980f4866141969fab6254a680546a277789d6f0
2026-06-11 13:13:29 -0600 to 2026-06-30 13:45:43 -0700
- [beta-1.97] chore: upgrade to [email protected] (rust-lang/cargo#17153)

r? ghost
@rust-bors rust-bors Bot 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 30, 2026
@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

💔 Test for c63627f failed: CI. Failed job:

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[TIMING:end] tool::ToolBuild { build_compiler: Compiler { stage: 0, host: aarch64-apple-darwin, forced_compiler: false }, target: aarch64-apple-darwin, tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 65.185
[TIMING:end] tool::Tidy { compiler: Compiler { stage: 0, host: aarch64-apple-darwin, forced_compiler: false }, target: aarch64-apple-darwin } -- 0.003
tidy check

thread 'deps (.)' (180495) panicked at src/tools/tidy/src/deps.rs:649:24:
cmd.exec() failed with `cargo metadata` exited with an error:     Updating crates.io index
error: failed to get `ungrammar` as a dependency of package `xtask v0.1.0 (/Users/runner/work/rust/rust/src/tools/rust-analyzer/xtask)`

Caused by:
  failed to load source for dependency `ungrammar`

Caused by:
  unable to update registry `crates-io`

Caused by:
  download of un/gr/ungrammar failed

Caused by:
  curl failed

Caused by:
---
   4: rust_tidy::main::{closure#1}
   5: std::thread::scoped::scope::<rust_tidy::main::{closure#1}, ()>
   6: rust_tidy::main
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
Command `/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools-bin/rust-tidy --root-path=/Users/runner/work/rust/rust --cargo-path=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage0/bin/cargo --output-dir=/Users/runner/work/rust/rust/build --concurrency=3 --npm-path=/Users/runner/.yarn/bin/yarn --ci=true` failed with exit code 101
Created at: src/bootstrap/src/core/build_steps/tool.rs:1618:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:1417:29

--- BACKTRACE vvv
   0: std::backtrace_rs::backtrace::libunwind::trace
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/../../backtrace/src/backtrace/libunwind.rs:117:9
   1: std::backtrace_rs::backtrace::trace_unsynchronized::<<std::backtrace::Backtrace>::create::{closure#0}>
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/../../backtrace/src/backtrace/mod.rs:66:14
   2: <std::backtrace::Backtrace>::create
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/backtrace.rs:331:13
   3: <bootstrap::utils::exec::DeferredCommand>::finish_process
             at ./src/bootstrap/src/utils/exec.rs:939:17
   4: <bootstrap::utils::exec::DeferredCommand>::wait_for_output::<&bootstrap::utils::exec::ExecutionContext>
             at ./src/bootstrap/src/utils/exec.rs:831:21
   5: <bootstrap::utils::exec::ExecutionContext>::run
             at ./src/bootstrap/src/utils/exec.rs:741:45
   6: <bootstrap::utils::exec::BootstrapCommand>::run::<&bootstrap::core::builder::Builder>
             at ./src/bootstrap/src/utils/exec.rs:339:27
   7: <bootstrap::core::build_steps::test::Tidy as bootstrap::core::builder::Step>::run
             at ./src/bootstrap/src/core/build_steps/test.rs:1417:29
   8: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::test::Tidy>
             at ./src/bootstrap/src/core/builder/mod.rs:1595:36
   9: <bootstrap::core::build_steps::test::Tidy as bootstrap::core::builder::Step>::make_run
             at ./src/bootstrap/src/core/build_steps/test.rs:1339:21
  10: <bootstrap::core::builder::StepDescription>::maybe_run
             at ./src/bootstrap/src/core/builder/mod.rs:476:13
  11: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at ./src/bootstrap/src/core/builder/cli_paths.rs:141:22
  12: <bootstrap::core::builder::Builder>::run_step_descriptions
             at ./src/bootstrap/src/core/builder/mod.rs:1138:9
  13: <bootstrap::core::builder::Builder>::execute_cli
             at ./src/bootstrap/src/core/builder/mod.rs:1117:14
  14: <bootstrap::Build>::build
             at ./src/bootstrap/src/lib.rs:803:25
  15: bootstrap::main
             at ./src/bootstrap/src/bin/main.rs:130:11
  16: <fn() as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/core/src/ops/function.rs:250:5
  17: std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/sys/backtrace.rs:166:18
  18: std::rt::lang_start::<()>::{closure#0}
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/rt.rs:206:18
  19: <&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/core/src/ops/function.rs:287:21
  20: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/panicking.rs:581:40
  21: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe>
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/panicking.rs:544:19
  22: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/panic.rs:359:14
  23: std::rt::lang_start_internal::{closure#0}
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/rt.rs:175:24
  24: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/panicking.rs:581:40
---
             at /rustc/ac68faa20c58cbccd01ee7208bf3b6e93a7d7f96/library/std/src/rt.rs:205:5
  29: _main


Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `--stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin`
Build completed unsuccessfully in 0:01:34
  local time: Tue Jun 30 23:48:28 UTC 2026
  network time: 
##[error]Process completed with exit code 1.

@jhpratt

jhpratt commented Jul 1, 2026

Copy link
Copy Markdown
Member

@bors retry

@rust-bors rust-bors Bot 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 Jul 1, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 1, 2026
@rust-bors

rust-bors Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: weihanglo
Duration: 3h 21m 5s
Pushing b2282dd to beta...

@rust-bors rust-bors Bot merged commit b2282dd into rust-lang:beta Jul 1, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Jul 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants