Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix(build-std): parse as comma-separated list #15065

Merged
merged 2 commits into from
Jan 16, 2025
Merged

fix(build-std): parse as comma-separated list #15065

merged 2 commits into from
Jan 16, 2025

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Restore to the behavior prior to 30d11ce
Also extend build-std-features to support comma-separated list.

Fixes #15064

How should we test and review this PR?

A test has been added.

@weihanglo weihanglo added the Z-build-std Nightly: build-std label Jan 14, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2025

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 14, 2025
epage
epage approved these changes Jan 14, 2025
View reviewed changes
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

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

Thanks!

@epage epage enabled auto-merge January 14, 2025 21:54
@weihanglo
Copy link
Member Author

CI failed with no reason. Perhaps GitHub was unstable?

Testing resolve_ws/cargo
    Updating `local-snapshot` index

thread 'main' panicked at benches/benchsuite/benches/resolve.rs:47:6:
called `Result::unwrap()` on an `Err` value: no matching package named `clap` found
location searched: `local-snapshot` index (which is replacing registry `crates-io`)
required by package `cargo v0.58.0 (/home/runner/work/cargo/cargo/target/tmp/bench/workspaces/cargo)`
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Anyway, rerunning tests.

@weihanglo
Copy link
Member Author

Also failed in #15065: https://github.com/rust-lang/cargo/actions/runs/12779900907/job/35625296866. May not be flaky 🤔.

@weihanglo
Copy link
Member Author

But #15062 has passed…

@weihanglo
Copy link
Member Author

I don't understand the CI failure. I can reproduce it locally though. The commit we're using is still available: https://github.com/rust-lang/crates.io-index-archive/commits/85f7bfd61ea4fee08ec68c468762e886b2aebec6. And the latest rerun seems working…

@weihanglo
Copy link
Member Author

It failed on both macOS and Linux. Some observations:

  • GitHub ubuntu-latest has just bumped to 24.04
  • On Ubuntu 24.04 the version of Git CLI is 2.47.1.
  • macOS-latest hasn't changed for a month. The latest change to git was made one month ago.
  • It can be reproduced locally with Git 2.47.0 on Mac OS 15.2.0.
  • rust-1.83.0 branch and rust-1.80.0 also failed locally on Mac OS 15.2.0

@weihanglo weihanglo mentioned this pull request Jan 15, 2025
Merged
@weihanglo
Copy link
Member Author

Still under investigation. See https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/bench.20git.20failures.

@weihanglo @ehuss
test: verify how build-std flag be deserialized now
ffe841c 
It doesn't parse as comma-separated list.
It did before rust-lang#14899
@weihanglo @ehuss
fix(build-std): parse as comma-separated list
93c764d 
Restore to the behavior prior to 30d11ce
Also extend `build-std-features` to support comma-separated list.
@ehuss ehuss force-pushed the build-std-comma-separated branch from e566723 to 93c764d Compare January 15, 2025 23:09
@epage epage added this pull request to the merge queue Jan 15, 2025
Merged via the queue into rust-lang:master with commit 149aa21 Jan 16, 2025
21 checks passed
@weihanglo weihanglo mentioned this pull request Jan 18, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
@bors
Auto merge of rust-lang#135667 - weihanglo:update-cargo, r=weihanglo
2e5064d 
Update cargo

13 commits in 088d496082726091024f1689c124a0c3dccbd775..045bf21b36a2e1f3ed85e38278d1c3cc4305e134
2025-01-10 20:10:21 +0000 to 2025-01-17 14:59:36 +0000
- created a function for user defined aliases (rust-lang/cargo#15076)
- took the functionality of the third party subcommand from the list_commands function (rust-lang/cargo#15075)
- fix: wrong concat and field name (rust-lang/cargo#15074)
- fix(publish): Report all unpublishable packages  (rust-lang/cargo#15070)
- docs(cargo-clippy): correct typo (rust-lang/cargo#15072)
- docs(cargo-package): alwasy include the lockfile (rust-lang/cargo#15067)
- docs(ref): Deprecate 'package.authors'  (rust-lang/cargo#15068)
- fix(build-std): parse as comma-separated list (rust-lang/cargo#15065)
- Fix benchsuite issue with newer versions of git (rust-lang/cargo#15069)
- Document that cargo automatically registers variables used in env! macro to trigger rebuilds (rust-lang/cargo#15062)
- perf(cargo-package): match certain path prefix with pathspec (rust-lang/cargo#14997)
- Clarify note in example (rust-lang/cargo#15054)
- chore(deps): update msrv (3 versions) to v1.82 (rust-lang/cargo#15050)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
@bors
Auto merge of rust-lang#135667 - weihanglo:update-cargo, r=weihanglo
efc2576 
Update cargo

13 commits in 088d496082726091024f1689c124a0c3dccbd775..045bf21b36a2e1f3ed85e38278d1c3cc4305e134
2025-01-10 20:10:21 +0000 to 2025-01-17 14:59:36 +0000
- created a function for user defined aliases (rust-lang/cargo#15076)
- took the functionality of the third party subcommand from the list_commands function (rust-lang/cargo#15075)
- fix: wrong concat and field name (rust-lang/cargo#15074)
- fix(publish): Report all unpublishable packages  (rust-lang/cargo#15070)
- docs(cargo-clippy): correct typo (rust-lang/cargo#15072)
- docs(cargo-package): alwasy include the lockfile (rust-lang/cargo#15067)
- docs(ref): Deprecate 'package.authors'  (rust-lang/cargo#15068)
- fix(build-std): parse as comma-separated list (rust-lang/cargo#15065)
- Fix benchsuite issue with newer versions of git (rust-lang/cargo#15069)
- Document that cargo automatically registers variables used in env! macro to trigger rebuilds (rust-lang/cargo#15062)
- perf(cargo-package): match certain path prefix with pathspec (rust-lang/cargo#14997)
- Clarify note in example (rust-lang/cargo#15054)
- chore(deps): update msrv (3 versions) to v1.82 (rust-lang/cargo#15050)
@rustbot rustbot added this to the 1.86.0 milestone Jan 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epage epage epage approved these changes

Assignees

@ehuss ehuss

Labels
A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. Z-build-std Nightly: build-std
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

CARGO_UNSTABLE_BUILD_STD doesn't support multiple crates anymore
4 participants
@weihanglo @rustbot @epage @ehuss