Skip to content

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

A follow-up of #14998

Other dev tools for cargo development are fine keeping v1. They are not shipped to end users.

Before

$ cargo tree --workspace -i thiserror@1.0.63
thiserror v1.0.63
├── cargo_metadata v0.19.0
│   └── capture v0.1.0 (/projects/cargo/benches/capture)
├── gix-lock v15.0.0
│   ├── gix v0.69.1
│   │   └── cargo v0.86.0 (/projects/cargo)
│   │       ├── benchsuite v0.0.0 (/projects/cargo/benches/benchsuite)
│   │       ├── resolver-tests v0.0.0 (/projects/cargo/crates/resolver-tests)
│   │       ├── xtask-bump-check v0.0.0 (/projects/cargo/crates/xtask-bump-check)
│   │       └── xtask-lint-docs v0.1.0 (/projects/cargo/crates/xtask-lint-docs)
│   │   [dev-dependencies]
│   │   └── cargo v0.86.0 (/projects/cargo) (*)
│   ├── gix-index v0.37.0
│   │   ├── gix v0.69.1 (*)
│   │   ├── gix-dir v0.11.0
│   │   │   └── gix v0.69.1 (*)
│   │   └── gix-worktree v0.38.0
│   │       ├── gix v0.69.1 (*)
│   │       └── gix-dir v0.11.0 (*)
│   ├── gix-protocol v0.47.0
│   │   └── gix v0.69.1 (*)
│   ├── gix-ref v0.49.1
│   │   ├── gix v0.69.1 (*)
│   │   ├── gix-config v0.42.0
│   │   │   ├── gix v0.69.1 (*)
│   │   │   └── gix-submodule v0.16.0
│   │   │       └── gix v0.69.1 (*)
│   │   ├── gix-discover v0.37.0
│   │   │   ├── gix v0.69.1 (*)
│   │   │   └── gix-dir v0.11.0 (*)
│   │   └── gix-protocol v0.47.0 (*)
│   └── gix-shallow v0.1.0
│       ├── gix v0.69.1 (*)
│       └── gix-protocol v0.47.0 (*)
├── handlebars v6.2.0
│   └── mdman v0.0.0 (/projects/cargo/crates/mdman)
├── pest v2.7.9
│   ├── handlebars v6.2.0 (*)
│   ├── pest_derive v2.7.9 (proc-macro)
│   │   └── handlebars v6.2.0 (*)
│   ├── pest_generator v2.7.9
│   │   └── pest_derive v2.7.9 (proc-macro) (*)
│   └── pest_meta v2.7.9
│       └── pest_generator v2.7.9 (*)
├── varisat v0.2.2
│   └── resolver-tests v0.0.0 (/projects/cargo/crates/resolver-tests)
├── varisat-checker v0.2.2
│   └── varisat v0.2.2 (*)
└── varisat-dimacs v0.2.2
    ├── varisat v0.2.2 (*)
    └── varisat-checker v0.2.2 (*)

After

$ cargo tree --workspace -i thiserror@1.0.63
thiserror v1.0.63
├── cargo_metadata v0.19.0
│   └── capture v0.1.0 (/projects/cargo/benches/capture)
├── handlebars v6.2.0
│   └── mdman v0.0.0 (/projects/cargo/crates/mdman)
├── pest v2.7.9
│   ├── handlebars v6.2.0 (*)
│   ├── pest_derive v2.7.9 (proc-macro)
│   │   └── handlebars v6.2.0 (*)
│   ├── pest_generator v2.7.9
│   │   └── pest_derive v2.7.9 (proc-macro) (*)
│   └── pest_meta v2.7.9
│       └── pest_generator v2.7.9 (*)
├── varisat v0.2.2
│   └── resolver-tests v0.0.0 (/projects/cargo/crates/resolver-tests)
├── varisat-checker v0.2.2
│   └── varisat v0.2.2 (*)
└── varisat-dimacs v0.2.2
    ├── varisat v0.2.2 (*)
    └── varisat-checker v0.2.2 (*)

How should we test and review this PR?

It has nothing changed but thiserror version.

https://diff.rs/gix-lock/15.0.0/gix-lock/15.0.1/Cargo.toml/

Other dev tools for cargo development are fine keeping v1.
They are not shipped to end users.

Before

```
cargo tree --workspace -i thiserror@1.0.63

thiserror v1.0.63
├── cargo_metadata v0.19.0
│   └── capture v0.1.0 (/projects/cargo/benches/capture)
├── gix-lock v15.0.0
│   ├── gix v0.69.1
│   │   └── cargo v0.86.0 (/projects/cargo)
│   │       ├── benchsuite v0.0.0 (/projects/cargo/benches/benchsuite)
│   │       ├── resolver-tests v0.0.0 (/projects/cargo/crates/resolver-tests)
│   │       ├── xtask-bump-check v0.0.0 (/projects/cargo/crates/xtask-bump-check)
│   │       └── xtask-lint-docs v0.1.0 (/projects/cargo/crates/xtask-lint-docs)
│   │   [dev-dependencies]
│   │   └── cargo v0.86.0 (/projects/cargo) (*)
│   ├── gix-index v0.37.0
│   │   ├── gix v0.69.1 (*)
│   │   ├── gix-dir v0.11.0
│   │   │   └── gix v0.69.1 (*)
│   │   └── gix-worktree v0.38.0
│   │       ├── gix v0.69.1 (*)
│   │       └── gix-dir v0.11.0 (*)
│   ├── gix-protocol v0.47.0
│   │   └── gix v0.69.1 (*)
│   ├── gix-ref v0.49.1
│   │   ├── gix v0.69.1 (*)
│   │   ├── gix-config v0.42.0
│   │   │   ├── gix v0.69.1 (*)
│   │   │   └── gix-submodule v0.16.0
│   │   │       └── gix v0.69.1 (*)
│   │   ├── gix-discover v0.37.0
│   │   │   ├── gix v0.69.1 (*)
│   │   │   └── gix-dir v0.11.0 (*)
│   │   └── gix-protocol v0.47.0 (*)
│   └── gix-shallow v0.1.0
│       ├── gix v0.69.1 (*)
│       └── gix-protocol v0.47.0 (*)
├── handlebars v6.2.0
│   └── mdman v0.0.0 (/projects/cargo/crates/mdman)
├── pest v2.7.9
│   ├── handlebars v6.2.0 (*)
│   ├── pest_derive v2.7.9 (proc-macro)
│   │   └── handlebars v6.2.0 (*)
│   ├── pest_generator v2.7.9
│   │   └── pest_derive v2.7.9 (proc-macro) (*)
│   └── pest_meta v2.7.9
│       └── pest_generator v2.7.9 (*)
├── varisat v0.2.2
│   └── resolver-tests v0.0.0 (/projects/cargo/crates/resolver-tests)
├── varisat-checker v0.2.2
│   └── varisat v0.2.2 (*)
└── varisat-dimacs v0.2.2
    ├── varisat v0.2.2 (*)
    └── varisat-checker v0.2.2 (*)
```

After

```
cargo tree --workspace -i thiserror@1.0.63
thiserror v1.0.63
├── cargo_metadata v0.19.0
│   └── capture v0.1.0 (/projects/cargo/benches/capture)
├── handlebars v6.2.0
│   └── mdman v0.0.0 (/projects/cargo/crates/mdman)
├── pest v2.7.9
│   ├── handlebars v6.2.0 (*)
│   ├── pest_derive v2.7.9 (proc-macro)
│   │   └── handlebars v6.2.0 (*)
│   ├── pest_generator v2.7.9
│   │   └── pest_derive v2.7.9 (proc-macro) (*)
│   └── pest_meta v2.7.9
│       └── pest_generator v2.7.9 (*)
├── varisat v0.2.2
│   └── resolver-tests v0.0.0 (/projects/cargo/crates/resolver-tests)
├── varisat-checker v0.2.2
│   └── varisat v0.2.2 (*)
└── varisat-dimacs v0.2.2
    ├── varisat v0.2.2 (*)
    └── varisat-checker v0.2.2 (*)
```
@rustbot
Copy link
Collaborator

rustbot commented Jan 3, 2025

r? @epage

rustbot has assigned @epage.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2025
@epage epage enabled auto-merge January 3, 2025 19:44
@epage epage added this pull request to the merge queue Jan 3, 2025
Merged via the queue into rust-lang:master with commit fd78487 Jan 3, 2025
23 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 4, 2025
Update cargo

9 commits in d73d2caf9e41a39daf2a8d6ce60ec80bf354d2a7..fd784878cfa843e3e29a6654ecf564c62fae6735
2024-12-31 20:51:21 +0000 to 2025-01-03 20:06:26 +0000
- chore: bump gix-lock to remove thiserror@1 from `cargo` (rust-lang/cargo#15012)
- refactor(manifest): Clean up field -> env var handling (rust-lang/cargo#15008)
- chore(deps): update rust crate thiserror to v2 (rust-lang/cargo#14998)
- test(git): Clean up shallow fetch tests (rust-lang/cargo#15002)
- fix(schema): Correct and update the JSON Schema (rust-lang/cargo#15000)
- chore(deps): update rust crate itertools to 0.14.0 (rust-lang/cargo#14996)
- fix: env table config can't trigger rebuild with `rerun-if-env-changed`. (rust-lang/cargo#14756)
- chore(deps): update alpine docker tag to v3.21 (rust-lang/cargo#14995)
- fix(package): check dirtiness of symlinks source files (rust-lang/cargo#14981)
@rustbot rustbot added this to the 1.86.0 milestone Jan 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants