Skip to content

Commit

Permalink
Update cargo_toml to 0.19.2 (#2551)
Browse files Browse the repository at this point in the history
Fixed: #2348, #2536, #2433, #2434

Co-authored-by: UebelAndre <[email protected]>
  • Loading branch information
jrandolf and UebelAndre authored Mar 19, 2024
1 parent e431afb commit 5c6a402
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 23 deletions.
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ use_repo(
"cui__cargo-lock-9.0.0",
"cui__cargo-platform-0.1.4",
"cui__cargo_metadata-0.18.1",
"cui__cargo_toml-0.17.1",
"cui__cargo_toml-0.19.2",
"cui__cfg-expr-0.15.5",
"cui__clap-4.3.11",
"cui__crates-index-2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions crate_universe/3rdparty/crates/defs.bzl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crate_universe/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 6 additions & 9 deletions crate_universe/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
[workspace]
members = [
"tools/cross_installer",
"tools/urls_generator",
]
members = ["tools/cross_installer", "tools/urls_generator"]
exclude = ["test_data"]

[package]
name = "cargo-bazel"
version = "0.11.0"
authors = [
"Andre Brisco - [email protected]",
]
authors = ["Andre Brisco - [email protected]"]
categories = ["development-tools"]
description = "A collection of tools which use Cargo to generate build targets for Bazel"
edition = "2021"
Expand All @@ -28,12 +23,14 @@ default = ["cargo"]
anyhow = "1.0.75"
camino = "1.1.6"
cargo_metadata = "0.18.1"
cargo_toml = "0.17.1"
cargo_toml = "0.19.2"
cargo-lock = "9.0.0"
cargo-platform = "0.1.4"
cfg-expr = "0.15.5"
clap = { version = "4.3.11", features = ["derive", "env"] }
crates-index = { version = "2.2.0", default-features = false, features = ["git"] }
crates-index = { version = "2.2.0", default-features = false, features = [
"git",
] }
hex = "0.4.3"
indoc = "2.0.4"
itertools = "0.12.0"
Expand Down
2 changes: 1 addition & 1 deletion crate_universe/src/lockfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ mod test {
);

assert_eq!(
Digest("10a1921f3122042d6c513392992e4b3982d0ed8985fdc2dee965c466f8cb00a4".to_owned()),
Digest("0d217eec46c3d5a00b142db59994eaa226b630418f70e6b54e8ecc66f7d549da".to_owned()),
digest,
);
}
Expand Down
2 changes: 1 addition & 1 deletion crate_universe/src/splicing/splicer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ impl<'a> SplicerKind<'a> {
for (name, details) in direct_packages_manifest.iter() {
manifest.dependencies.insert(
name.clone(),
cargo_toml::Dependency::Detailed(details.clone()),
cargo_toml::Dependency::Detailed(Box::new(details.clone())),
);
}

Expand Down

0 comments on commit 5c6a402

Please sign in to comment.