Skip to content

Commit

Permalink
bump few deps
Browse files Browse the repository at this point in the history
cargo_metadata, thorin-dwp

bump windows

bump regex and bstr
  • Loading branch information
klensy committed Sep 26, 2024
1 parent 76ed7a1 commit f60cffd
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 92 deletions.
123 changes: 39 additions & 84 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,12 @@ dependencies = [

[[package]]
name = "bstr"
version = "1.6.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
"regex-automata 0.3.9",
"regex-automata 0.4.7",
"serde",
]

Expand Down Expand Up @@ -349,7 +349,7 @@ dependencies = [
name = "cargo-miri"
version = "0.1.0"
dependencies = [
"cargo_metadata 0.18.1",
"cargo_metadata",
"directories",
"rustc-build-sysroot",
"rustc_tools_util",
Expand All @@ -367,20 +367,6 @@ dependencies = [
"serde",
]

[[package]]
name = "cargo_metadata"
version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
dependencies = [
"camino",
"cargo-platform",
"semver",
"serde",
"serde_json",
"thiserror",
]

[[package]]
name = "cargo_metadata"
version = "0.18.1"
Expand Down Expand Up @@ -527,7 +513,7 @@ name = "clippy"
version = "0.1.83"
dependencies = [
"anstream",
"cargo_metadata 0.18.1",
"cargo_metadata",
"clippy_config",
"clippy_lints",
"clippy_utils",
Expand Down Expand Up @@ -579,7 +565,7 @@ name = "clippy_lints"
version = "0.1.83"
dependencies = [
"arrayvec",
"cargo_metadata 0.18.1",
"cargo_metadata",
"clippy_config",
"clippy_utils",
"declare_clippy_lint",
Expand Down Expand Up @@ -712,7 +698,7 @@ dependencies = [
"tracing-subscriber",
"unified-diff",
"walkdir",
"windows 0.52.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -960,17 +946,6 @@ dependencies = [
"syn 2.0.75",
]

[[package]]
name = "derive_more"
version = "0.99.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.75",
]

[[package]]
name = "derive_setters"
version = "0.1.6"
Expand Down Expand Up @@ -1387,7 +1362,7 @@ name = "generate-copyright"
version = "0.1.0"
dependencies = [
"anyhow",
"cargo_metadata 0.18.1",
"cargo_metadata",
"rinja",
"serde",
"serde_json",
Expand Down Expand Up @@ -1436,6 +1411,12 @@ name = "gimli"
version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"

[[package]]
name = "gimli"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2e1d97fbe9722ba9bbd0c97051c2956e726562b61f86a25a4360398a40edfc9"
dependencies = [
"fallible-iterator",
"indexmap",
Expand Down Expand Up @@ -2434,12 +2415,7 @@ version = "0.32.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
dependencies = [
"crc32fast",
"flate2",
"hashbrown",
"indexmap",
"memchr",
"ruzstd 0.5.0",
]

[[package]]
Expand All @@ -2453,7 +2429,7 @@ dependencies = [
"hashbrown",
"indexmap",
"memchr",
"ruzstd 0.7.0",
"ruzstd",
"wasmparser",
]

Expand Down Expand Up @@ -2981,13 +2957,14 @@ dependencies = [

[[package]]
name = "regex"
version = "1.8.4"
version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax 0.7.5",
"regex-automata 0.4.7",
"regex-syntax 0.8.4",
]

[[package]]
Expand All @@ -3010,9 +2987,14 @@ dependencies = [

[[package]]
name = "regex-automata"
version = "0.3.9"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax 0.8.4",
]

[[package]]
name = "regex-lite"
Expand All @@ -3026,12 +3008,6 @@ version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

[[package]]
name = "regex-syntax"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"

[[package]]
name = "regex-syntax"
version = "0.8.4"
Expand Down Expand Up @@ -3459,7 +3435,7 @@ dependencies = [
"thorin-dwp",
"tracing",
"wasm-encoder",
"windows 0.52.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -3516,7 +3492,7 @@ dependencies = [
"tempfile",
"thin-vec",
"tracing",
"windows 0.52.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -3578,7 +3554,7 @@ dependencies = [
"shlex",
"time",
"tracing",
"windows 0.52.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -3629,7 +3605,7 @@ dependencies = [
"termcolor",
"termize",
"tracing",
"windows 0.52.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -4352,7 +4328,7 @@ dependencies = [
"smallvec",
"termize",
"tracing",
"windows 0.52.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -4635,7 +4611,7 @@ dependencies = [
"annotate-snippets 0.9.2",
"anyhow",
"bytecount",
"cargo_metadata 0.18.1",
"cargo_metadata",
"clap",
"clap-cargo",
"diff",
Expand Down Expand Up @@ -4676,17 +4652,6 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"

[[package]]
name = "ruzstd"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
dependencies = [
"byteorder",
"derive_more",
"twox-hash",
]

[[package]]
name = "ruzstd"
version = "0.7.0"
Expand Down Expand Up @@ -5066,7 +5031,7 @@ checksum = "d4115055da5f572fff541dd0c4e61b0262977f453cc9fe04be83aba25a89bdab"
dependencies = [
"core-foundation-sys",
"libc",
"windows 0.57.0",
"windows",
]

[[package]]
Expand Down Expand Up @@ -5193,13 +5158,13 @@ dependencies = [

[[package]]
name = "thorin-dwp"
version = "0.7.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4db52ee8fec06e119b692ef3dd2c4cf621a99204c1b8c47407870ed050305b9b"
checksum = "813ba76597db32dc4f6992fd8bf8f394715b88d352fd97401da67dab6283b4c6"
dependencies = [
"gimli 0.28.1",
"gimli 0.30.0",
"hashbrown",
"object 0.32.2",
"object 0.36.4",
"tracing",
]

Expand Down Expand Up @@ -5227,7 +5192,7 @@ name = "tidy"
version = "0.1.0"
dependencies = [
"build_helper",
"cargo_metadata 0.15.4",
"cargo_metadata",
"fluent-syntax",
"ignore",
"miropt-test-tools",
Expand Down Expand Up @@ -5495,7 +5460,7 @@ dependencies = [
"anyhow",
"bstr",
"cargo-platform",
"cargo_metadata 0.18.1",
"cargo_metadata",
"color-eyre",
"colored",
"comma",
Expand Down Expand Up @@ -5898,16 +5863,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

[[package]]
name = "windows"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
"windows-core 0.52.0",
"windows-targets 0.52.6",
]

[[package]]
name = "windows"
version = "0.57.0"
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_codegen_ssa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ serde_json = "1.0.59"
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
tempfile = "3.2"
thin-vec = "0.2.12"
thorin-dwp = "0.7"
thorin-dwp = "0.8"
tracing = "0.1"
wasm-encoder = "0.216.0"
# tidy-alphabetical-end
Expand All @@ -55,5 +55,5 @@ default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]

[target.'cfg(windows)'.dependencies.windows]
version = "0.52.0"
version = "0.57.0"
features = ["Win32_Globalization"]
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tracing = "0.1"
version = "0.12"

[target.'cfg(windows)'.dependencies.windows]
version = "0.52.0"
version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_Storage_FileSystem",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_driver_impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ libc = "0.2"
# tidy-alphabetical-end

[target.'cfg(windows)'.dependencies.windows]
version = "0.52.0"
version = "0.57.0"
features = [
"Win32_System_Diagnostics_Debug",
]
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_errors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ tracing = "0.1"
# tidy-alphabetical-end

[target.'cfg(windows)'.dependencies.windows]
version = "0.52.0"
version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_Security",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_session/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ libc = "0.2"
# tidy-alphabetical-end

[target.'cfg(windows)'.dependencies.windows]
version = "0.52.0"
version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_System_LibraryLoader",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ libc = "0.2"
miow = "0.6"

[target.'cfg(windows)'.dependencies.windows]
version = "0.52.0"
version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_System_Diagnostics_Debug",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ autobins = false

[dependencies]
build_helper = { path = "../build_helper" }
cargo_metadata = "0.15"
cargo_metadata = "0.18"
regex = "1"
miropt-test-tools = { path = "../miropt-test-tools" }
walkdir = "2"
Expand Down

0 comments on commit f60cffd

Please sign in to comment.