Skip to content

Conversation

ifropc
Copy link
Contributor

@ifropc ifropc commented Sep 17, 2024

Follow-up of #14421
Resolving one of the items

cargo install should make --lockfile-path imply --locked

Simply mirrored behavior as if --locked was provided (on creating the workspace)

@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2024

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-workspaces Area: workspaces Command-install S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 17, 2024
@ifropc
Copy link
Contributor Author

ifropc commented Sep 17, 2024

r? @weihanglo

@rustbot rustbot assigned weihanglo and unassigned ehuss Sep 17, 2024
@ifropc ifropc marked this pull request as draft September 18, 2024 19:35
@ifropc ifropc force-pushed the lockfile-path-install branch from 1354647 to 165ae93 Compare September 19, 2024 18:30
@rustbot rustbot added A-cli Area: Command-line interface, option parsing, etc. A-configuration Area: cargo config files and env vars labels Sep 19, 2024
@ifropc ifropc marked this pull request as ready for review September 19, 2024 18:30
- Showcase that install will require --locked and will put lockfile in a
  specific directory
@ifropc ifropc force-pushed the lockfile-path-install branch from 165ae93 to c70ea12 Compare September 20, 2024 01:33
@ifropc ifropc force-pushed the lockfile-path-install branch 2 times, most recently from 4f8bb9f to d09f4e1 Compare September 20, 2024 01:55
@bors
Copy link
Contributor

bors commented Sep 21, 2024

☔ The latest upstream changes (presumably #14280) made this pull request unmergeable. Please resolve the merge conflicts.

@ifropc ifropc force-pushed the lockfile-path-install branch 3 times, most recently from 02c7b5e to 07d1a83 Compare September 24, 2024 07:26
@ifropc ifropc force-pushed the lockfile-path-install branch from 07d1a83 to d964533 Compare September 26, 2024 05:19
@ifropc ifropc force-pushed the lockfile-path-install branch from d964533 to bf37cf7 Compare September 27, 2024 15:27
@weihanglo
Copy link
Member

Ready to merge. Thanks!

I'll track this behavior discrepancy in the tracking issue since people may have different thoughts when stabilization.

@bors r+

@bors
Copy link
Contributor

bors commented Sep 27, 2024

📌 Commit bf37cf7 has been approved by weihanglo

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 Sep 27, 2024
@bors
Copy link
Contributor

bors commented Sep 27, 2024

⌛ Testing commit bf37cf7 with merge 1fad770...

@bors
Copy link
Contributor

bors commented Sep 27, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 1fad770 to master...

@bors bors merged commit 1fad770 into rust-lang:master Sep 27, 2024
22 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 28, 2024
Update cargo

19 commits in eaee77dc1584be45949b75e4c4c9a841605e3a4b..80d82ca22abbee5fb7b51fa1abeb1ae34e99e88a
2024-09-19 21:10:23 +0000 to 2024-09-27 17:56:01 +0000
- Update cc to 1.1.22 (rust-lang/cargo#14607)
- feat: lockfile path implies --locked on cargo install (rust-lang/cargo#14556)
- feat(toml): Add `autolib` (rust-lang/cargo#14591)
- fix: correct error count for `cargo check --message-format json` (rust-lang/cargo#14598)
- test: relax panic output assertion (rust-lang/cargo#14602)
- feat(timings): support dark color scheme in HTML output (rust-lang/cargo#14588)
- feat: add CARGO_MANIFEST_PATH env variable (rust-lang/cargo#14404)
- fix(config): Don't double-warn about `$CARGO_HOME/config` (rust-lang/cargo#14579)
- fix(cargo-rustc): give trailing flags higher precedence on nightly (rust-lang/cargo#14587)
- feat: make lockfile v4 the default (rust-lang/cargo#14595)
- perf: Improve quality of completion performance traces (rust-lang/cargo#14592)
- test: Remove completion tests (rust-lang/cargo#14590)
- feat: Add support for completing `cargo update <TAB>` (rust-lang/cargo#14552)
- test: Migrate remaining with_stdout/with_stderr calls (rust-lang/cargo#14577)
- fix(resolve): Improve multi-MSRV workspaces (rust-lang/cargo#14569)
- chore: Bump MSRV to 1.81 (rust-lang/cargo#14585)
- Add a `--dry-run` flag to the `install` command (rust-lang/cargo#14280)
- fix(resolve): Don't list transitive, incompatible dependencies as available (rust-lang/cargo#14568)
- feat(complete): Upgrade clap_complete (rust-lang/cargo#14573)
@rustbot rustbot added this to the 1.83.0 milestone Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cli Area: Command-line interface, option parsing, etc. A-configuration Area: cargo config files and env vars A-workspaces Area: workspaces Command-install S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants