Skip to content

Update cargo#114027

Merged
bors merged 2 commits into
rust-lang:masterfrom
arlosi:update-cargo
Jul 25, 2023
Merged

Update cargo#114027
bors merged 2 commits into
rust-lang:masterfrom
arlosi:update-cargo

Conversation

@arlosi

@arlosi arlosi commented Jul 24, 2023

Copy link
Copy Markdown
Contributor

8 commits in 1b15556767f4b78a64e868eedf4073c423f02b93..7ac9416d82cd4fc5e707c9ec3574d22dff6466e5
2023-07-18 14:44:47 +0000 to 2023-07-24 14:29:38 +0000

Since rust-lang/cargo#12334 makes built-in credential providers part of the cargo binary, it's no longer needed to build them in bootstrap.

@rustbot

rustbot commented Jul 24, 2023

Copy link
Copy Markdown
Collaborator

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

@rustbot

rustbot commented Jul 24, 2023

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 24, 2023
@rustbot

rustbot commented Jul 24, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/cargo

cc @ehuss

@albertlarsan68 albertlarsan68 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me on the bootstrap changes

@ehuss

ehuss commented Jul 24, 2023

Copy link
Copy Markdown
Contributor

Thanks!

I think the lines at

rust/src/bootstrap/dist.rs

Lines 1088 to 1093 in fc8a3e3

for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
let dirent = dirent.expect("read dir entry");
if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
tarball.add_file(&dirent.path(), "libexec", 0o755);
}
}
also need to be removed. It's not critical since it would not generate an error or cause problems since it just skips over the entries, but it would become dead code after this change.

since they are now built-in to the Cargo binary
@ehuss

ehuss commented Jul 25, 2023

Copy link
Copy Markdown
Contributor

Thanks!

@bors r+ p=1

@bors

bors commented Jul 25, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit ecfac68 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 Jul 25, 2023
@ehuss

ehuss commented Jul 25, 2023

Copy link
Copy Markdown
Contributor

cc @weihanglo Just verifying you saw this.

@bors

bors commented Jul 25, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ecfac68 with merge 864bdf7...

@bors

bors commented Jul 25, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 864bdf7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 25, 2023
@bors bors merged commit 864bdf7 into rust-lang:master Jul 25, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 25, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (864bdf7): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.0% [1.0%, 1.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 651.189s -> 651.472s (0.04%)

tamird added a commit to aya-rs/aya that referenced this pull request Aug 22, 2023
tamird added a commit to aya-rs/aya that referenced this pull request Aug 23, 2023
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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants