Skip to content

[beta] Cargo 1.68.0 backports #107504

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 1, 2023
Merged

[beta] Cargo 1.68.0 backports #107504

merged 1 commit into from
Feb 1, 2023

Conversation

weihanglo
Copy link
Member

1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c 2023-01-20 14:39:28 +0000 to 2023-01-30 22:07:51 +0000

r? @ehuss

@weihanglo
[beta] Update cargo
cf9aafe 
1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c
2023-01-20 14:39:28 +0000 to 2023-01-30 22:07:51 +0000

- [beta-1.68] Backport fixes of split-debuginfo detection (rust-lang/cargo#11649)
@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@ehuss
Copy link
Contributor

ehuss commented Jan 31, 2023

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Jan 31, 2023

📌 Commit cf9aafe has been approved by ehuss

It is now in the queue for this repository.

@bors 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 Jan 31, 2023
@bors
Copy link
Collaborator

bors commented Feb 1, 2023

⌛ Testing commit cf9aafe with merge 5b6fa41156dd822540724f78b82264d79695b52f...

@bors
Copy link
Collaborator

bors commented Feb 1, 2023

⌛ Testing commit cf9aafe with merge 6a0d435ec63336cb0b4c46feaddb817f77294f93...

@bors
Copy link
Collaborator

bors commented Feb 1, 2023

💔 Test failed - checks-actions

@bors 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 Feb 1, 2023
@ehuss
Copy link
Contributor

ehuss commented Feb 1, 2023

@bors retry

tests/rustdoc/primitive/no_std.rs failed with "Invalid Input" creating a directory in runtest.rs. I've never seen that before, so I'm not sure what could cause that.

@bors 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 Feb 1, 2023
@bors
Copy link
Collaborator

bors commented Feb 1, 2023

⌛ Testing commit cf9aafe with merge c719a826a815b2f6a9951c80e524928eec9e703e...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      OS Loader Version: 540.120.3~22
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMohprOSzKH+
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 12
hw.byteorder: 1234
---
test [rustdoc] tests/rustdoc/whitespace-after-where-clause.rs ... ok

failures:

---- [rustdoc] tests/rustdoc/primitive/no_std.rs stdout ----
thread '[rustdoc] tests/rustdoc/primitive/no_std.rs' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 22, kind: InvalidInput, message: "Invalid argument" }', src/tools/compiletest/src/runtest.rs:131:43
Some tests failed in compiletest suite=rustdoc mode=rustdoc host=x86_64-apple-darwin target=x86_64-apple-darwin


failures:

@bors
Copy link
Collaborator

bors commented Feb 1, 2023

⌛ Testing commit cf9aafe with merge 10b73bf...

@bors
Copy link
Collaborator

bors commented Feb 1, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 10b73bf to beta...

1 similar comment
@bors
Copy link
Collaborator

bors commented Feb 1, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 10b73bf to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 1, 2023
@bors bors merged commit 10b73bf into rust-lang:beta Feb 1, 2023
@rustbot rustbot added this to the 1.68.0 milestone Feb 1, 2023
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@the8472 the8472 mentioned this pull request Mar 18, 2023
Merged
@ehuss ehuss mentioned this pull request Mar 20, 2023
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
5 participants
@weihanglo @rustbot @ehuss @bors @rust-log-analyzer