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.

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

Update dependencies #847

Merged
merged 2 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 164 additions & 73 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cargo-dylint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dylint_internal = { version = "=2.4.0", path = "../internal" }

[dev-dependencies]
assert_cmd = "2.0"
cargo_metadata = "0.17"
cargo_metadata = "0.18"
ctor = "0.2"
glob = "0.3"
log = "0.4"
Expand Down
59 changes: 59 additions & 0 deletions cargo-dylint/tests/supply_chain.json
Original file line number Diff line number Diff line change
Expand Up @@ -1584,6 +1584,15 @@
"name": "Sebastian Thiel"
}
],
"gix-commitgraph": [
{
"avatar": "https://avatars.githubusercontent.com/u/63622?v=4",
"id": 980,
"kind": "user",
"login": "Byron",
"name": "Sebastian Thiel"
}
],
"gix-config": [
{
"avatar": "https://avatars.githubusercontent.com/u/63622?v=4",
Expand Down Expand Up @@ -1719,6 +1728,15 @@
"name": "Sebastian Thiel"
}
],
"gix-negotiate": [
{
"avatar": "https://avatars.githubusercontent.com/u/63622?v=4",
"id": 980,
"kind": "user",
"login": "Byron",
"name": "Sebastian Thiel"
}
],
"gix-object": [
{
"avatar": "https://avatars.githubusercontent.com/u/63622?v=4",
Expand Down Expand Up @@ -1818,6 +1836,15 @@
"name": "Sebastian Thiel"
}
],
"gix-revwalk": [
{
"avatar": "https://avatars.githubusercontent.com/u/63622?v=4",
"id": 980,
"kind": "user",
"login": "Byron",
"name": "Sebastian Thiel"
}
],
"gix-sec": [
{
"avatar": "https://avatars.githubusercontent.com/u/63622?v=4",
Expand Down Expand Up @@ -2994,6 +3021,29 @@
"name": "Sebastian Thiel"
}
],
"pulldown-cmark": [
{
"avatar": "https://avatars.githubusercontent.com/u/1255413?v=4",
"id": 822,
"kind": "user",
"login": "marcusklaas",
"name": "Marcus Klaas de Vries"
},
{
"avatar": "https://avatars.githubusercontent.com/u/242367?v=4",
"id": 1968,
"kind": "user",
"login": "raphlinus",
"name": "Raph Levien"
},
{
"avatar": "https://avatars.githubusercontent.com/u/4211771?v=4",
"id": 27114,
"kind": "user",
"login": "Martin1887",
"name": "Martín Pozo"
}
],
"quote": [
{
"avatar": "https://avatars.githubusercontent.com/u/1940490?v=4",
Expand Down Expand Up @@ -3936,6 +3986,15 @@
"name": "Paho Lurie-Gregg"
}
],
"unicase": [
{
"avatar": "https://avatars.githubusercontent.com/u/51479?v=4",
"id": 359,
"kind": "user",
"login": "seanmonstar",
"name": "Sean McArthur"
}
],
"unicode-bidi": [
{
"avatar": "https://avatars.githubusercontent.com/u/2566135?v=4",
Expand Down
2 changes: 1 addition & 1 deletion dylint-link/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = "https://github.com/trailofbits/dylint"
anyhow = "1.0"
env_logger = "0.10"
if_chain = "1.0"
toml_edit = "0.19"
toml_edit = "0.20"

dylint_internal = { version = "=2.4.0", path = "../internal", features = ["cargo"] }

Expand Down
6 changes: 3 additions & 3 deletions dylint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ rust-version = "1.68"
ansi_term = "0.12"
anyhow = "1.0"
# smoelius: The `cargo` dependency should be kept in sync with dylint/src/toml.rs.
cargo = { version = "0.72", optional = true }
cargo = { version = "0.73", optional = true }
cargo-platform = { version = "0.1", optional = true }
cargo-util = { version = "0.2", optional = true }
cargo_metadata = "0.17"
cargo_metadata = "0.18"
dirs = "5.0"
glob = { version = "0.3", optional = true }
heck = "0.4"
Expand All @@ -27,7 +27,7 @@ semver = "1.0"
serde = "1.0"
serde_json = "1.0"
tempfile = "3.8"
toml = { version = "0.7", optional = true }
toml = { version = "0.8", optional = true }
walkdir = "2.4"

dylint_internal = { version = "=2.4.0", path = "../internal", features = ["git", "packaging", "rustup", "sed"] }
Expand Down
3 changes: 2 additions & 1 deletion dylint/src/toml.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// smoelius: This file is essentially the dependency specific portions of
// https://github.com/rust-lang/cargo/blob/master/src/cargo/util/toml/mod.rs (version 0.72.1) with
// https://github.com/rust-lang/cargo/blob/master/src/cargo/util/toml/mod.rs (version 0.73.1) with
// adjustments to make some things public.
// smoelius: I experimented with creating a reduced Cargo crate that included just this module and
// the things it depends upon. Such a crate could reduce build times and incur less of a maintenance
Expand Down Expand Up @@ -62,6 +62,7 @@ impl<'a, 'b> Context<'a, 'b> {
}

use std::collections::{BTreeMap, BTreeSet, HashMap};
use std::ffi::OsStr;
use std::fmt::{self, Display, Write};
use std::marker::PhantomData;
use std::path::{Path, PathBuf};
Expand Down
4 changes: 2 additions & 2 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ publish = false

[dev-dependencies]
cargo-util = "0.2"
cargo_metadata = "0.17"
toml_edit = "0.19"
cargo_metadata = "0.18"
toml_edit = "0.20"
walkdir = "2.4"

dylint_internal = { version = "=2.4.0", path = "../internal", features = ["clippy_utils", "examples"] }
16 changes: 8 additions & 8 deletions examples/general/Cargo.lock

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

2 changes: 1 addition & 1 deletion examples/general/crate_wide_allow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dylint_linting = { path = "../../../utils/linting" }

[target.'cfg(not(no_dev_dependencies))'.dev-dependencies]
assert_cmd = "2.0"
cargo_metadata = "0.17"
cargo_metadata = "0.18"

dylint_internal = { path = "../../../internal" }
dylint_testing = { path = "../../../utils/testing" }
Expand Down
16 changes: 8 additions & 8 deletions examples/restriction/assert_eq_arg_misordering/Cargo.lock

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

47 changes: 11 additions & 36 deletions examples/restriction/collapsible_unwrap/Cargo.lock

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

2 changes: 1 addition & 1 deletion examples/restriction/collapsible_unwrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if_chain = "1.0"
dylint_linting = { path = "../../../utils/linting" }

[dev-dependencies]
toml = "0.7"
toml = "0.8"

dylint_testing = { path = "../../../utils/testing" }

Expand Down
Loading