Update miette v7, pubgrub and small Cargo.toml cleanup (#2610)

I was going through the output of `cargo tree --duplicate -p uv`, not
much success except these small cleanups.
This commit is contained in:
konsti 2024-03-22 11:42:48 +01:00 committed by GitHub
parent 375b33ff0c
commit 48bd02b8a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 37 additions and 74 deletions

93
Cargo.lock generated
View file

@ -283,7 +283,7 @@ checksum = "7dce2f189800bafe8322ef3a4d361ee7373bfc2f8fe052afda404230166dc45f"
dependencies = [ dependencies = [
"camino", "camino",
"image", "image",
"miette 7.2.0", "miette",
"mime", "mime",
"serde", "serde",
"serde_json", "serde_json",
@ -298,7 +298,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4de46920588aef95658797996130bacd542436aee090084646521260a74bda7d" checksum = "4de46920588aef95658797996130bacd542436aee090084646521260a74bda7d"
dependencies = [ dependencies = [
"miette 7.2.0", "miette",
"thiserror", "thiserror",
"tracing", "tracing",
] ]
@ -313,7 +313,7 @@ dependencies = [
"axoprocess", "axoprocess",
"camino", "camino",
"homedir", "homedir",
"miette 7.2.0", "miette",
"reqwest", "reqwest",
"serde", "serde",
"temp-dir", "temp-dir",
@ -1422,7 +1422,7 @@ dependencies = [
"futures-sink", "futures-sink",
"futures-util", "futures-util",
"http 0.2.12", "http 0.2.12",
"indexmap 2.2.5", "indexmap",
"slab", "slab",
"tokio", "tokio",
"tokio-util", "tokio-util",
@ -1441,7 +1441,7 @@ dependencies = [
"futures-sink", "futures-sink",
"futures-util", "futures-util",
"http 1.1.0", "http 1.1.0",
"indexmap 2.2.5", "indexmap",
"slab", "slab",
"tokio", "tokio",
"tokio-util", "tokio-util",
@ -1754,16 +1754,6 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"
[[package]]
name = "indexmap"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
]
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.2.5" version = "2.2.5"
@ -2129,14 +2119,15 @@ dependencies = [
[[package]] [[package]]
name = "miette" name = "miette"
version = "6.0.1" version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "337e1043bbc086dac9d9674983bef52ac991ce150e09b5b8e35c5a73dd83f66c" checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"backtrace-ext", "backtrace-ext",
"miette-derive 6.0.1", "cfg-if",
"owo-colors 3.5.0", "miette-derive",
"owo-colors",
"supports-color", "supports-color",
"supports-hyperlinks", "supports-hyperlinks",
"supports-unicode", "supports-unicode",
@ -2146,29 +2137,6 @@ dependencies = [
"unicode-width", "unicode-width",
] ]
[[package]]
name = "miette"
version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
dependencies = [
"cfg-if",
"miette-derive 7.2.0",
"thiserror",
"unicode-width",
]
[[package]]
name = "miette-derive"
version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e622f2a0dd84cbca79bc6c3c33f4fd7dc69faf992216516aacc1d136102800"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.52",
]
[[package]] [[package]]
name = "miette-derive" name = "miette-derive"
version = "7.2.0" version = "7.2.0"
@ -2398,12 +2366,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owo-colors"
version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]] [[package]]
name = "owo-colors" name = "owo-colors"
version = "4.0.0" version = "4.0.0"
@ -2527,7 +2489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [ dependencies = [
"fixedbitset", "fixedbitset",
"indexmap 2.2.5", "indexmap",
] ]
[[package]] [[package]]
@ -2660,12 +2622,13 @@ dependencies = [
[[package]] [[package]]
name = "priority-queue" name = "priority-queue"
version = "1.4.0" version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" checksum = "509354d8a769e8d0b567d6821b84495c60213162761a732d68ce87c964bd347f"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"indexmap 1.9.3", "equivalent",
"indexmap",
] ]
[[package]] [[package]]
@ -2700,9 +2663,9 @@ dependencies = [
[[package]] [[package]]
name = "pubgrub" name = "pubgrub"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/astral-sh/pubgrub?rev=addbaf184891d66a2dfd93d241a66d13bfe5de86#addbaf184891d66a2dfd93d241a66d13bfe5de86" source = "git+https://github.com/astral-sh/pubgrub?rev=e981e4dfe315582e84e2fd724832fb0e0c50b7aa#e981e4dfe315582e84e2fd724832fb0e0c50b7aa"
dependencies = [ dependencies = [
"indexmap 2.2.5", "indexmap",
"log", "log",
"priority-queue", "priority-queue",
"rustc-hash", "rustc-hash",
@ -2807,7 +2770,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898" checksum = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898"
dependencies = [ dependencies = [
"indexmap 2.2.5", "indexmap",
"pep440_rs", "pep440_rs",
"pep508_rs", "pep508_rs",
"serde", "serde",
@ -4034,7 +3997,7 @@ version = "0.22.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd"
dependencies = [ dependencies = [
"indexmap 2.2.5", "indexmap",
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
@ -4337,9 +4300,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.7.0" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
[[package]] [[package]]
name = "uv" name = "uv"
@ -4364,9 +4327,9 @@ dependencies = [
"insta", "insta",
"install-wheel-rs", "install-wheel-rs",
"itertools 0.12.1", "itertools 0.12.1",
"miette 6.0.1", "miette",
"mimalloc", "mimalloc",
"owo-colors 4.0.0", "owo-colors",
"pep508_rs", "pep508_rs",
"platform-tags", "platform-tags",
"predicates", "predicates",
@ -4544,7 +4507,7 @@ dependencies = [
"install-wheel-rs", "install-wheel-rs",
"itertools 0.12.1", "itertools 0.12.1",
"mimalloc", "mimalloc",
"owo-colors 4.0.0", "owo-colors",
"pep440_rs", "pep440_rs",
"pep508_rs", "pep508_rs",
"petgraph", "petgraph",
@ -4777,7 +4740,7 @@ dependencies = [
"distribution-types", "distribution-types",
"fs-err", "fs-err",
"futures", "futures",
"indexmap 2.2.5", "indexmap",
"pep508_rs", "pep508_rs",
"pypi-types", "pypi-types",
"pyproject-toml", "pyproject-toml",
@ -4810,12 +4773,12 @@ dependencies = [
"distribution-types", "distribution-types",
"either", "either",
"futures", "futures",
"indexmap 2.2.5", "indexmap",
"insta", "insta",
"itertools 0.12.1", "itertools 0.12.1",
"once-map", "once-map",
"once_cell", "once_cell",
"owo-colors 4.0.0", "owo-colors",
"pep440_rs", "pep440_rs",
"pep508_rs", "pep508_rs",
"petgraph", "petgraph",
@ -4884,7 +4847,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"anstream", "anstream",
"once_cell", "once_cell",
"owo-colors 4.0.0", "owo-colors",
"rustc-hash", "rustc-hash",
] ]

View file

@ -93,14 +93,14 @@ indoc = { version = "2.0.4" }
itertools = { version = "0.12.1" } itertools = { version = "0.12.1" }
junction = { version = "1.0.0" } junction = { version = "1.0.0" }
mailparse = { version = "0.14.0" } mailparse = { version = "0.14.0" }
miette = { version = "6.0.0" } miette = { version = "7.2.0" }
nanoid = { version = "0.4.0" } nanoid = { version = "0.4.0" }
once_cell = { version = "1.19.0" } once_cell = { version = "1.19.0" }
owo-colors = { version = "4.0.0" } owo-colors = { version = "4.0.0" }
pathdiff = { version = "0.2.1" } pathdiff = { version = "0.2.1" }
petgraph = { version = "0.6.4" } petgraph = { version = "0.6.4" }
platform-info = { version = "2.0.2" } platform-info = { version = "2.0.2" }
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "addbaf184891d66a2dfd93d241a66d13bfe5de86" } pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "e981e4dfe315582e84e2fd724832fb0e0c50b7aa" }
pyo3 = { version = "0.20.3" } pyo3 = { version = "0.20.3" }
pyo3-log = { version = "0.9.0" } pyo3-log = { version = "0.9.0" }
pyproject-toml = { version = "0.10.0" } pyproject-toml = { version = "0.10.0" }

View file

@ -20,7 +20,7 @@ pep440_rs = { workspace = true }
platform-tags = { workspace = true } platform-tags = { workspace = true }
uv-normalize = { workspace = true } uv-normalize = { workspace = true }
rkyv = { workspace = true, features = ["strict", "validation"], optional = true } rkyv = { workspace = true, optional = true }
serde = { workspace = true, optional = true } serde = { workspace = true, optional = true }
thiserror = { workspace = true } thiserror = { workspace = true }
url = { workspace = true } url = { workspace = true }

View file

@ -27,7 +27,7 @@ anyhow = { workspace = true }
fs-err = { workspace = true } fs-err = { workspace = true }
itertools = { workspace = true } itertools = { workspace = true }
once_cell = { workspace = true } once_cell = { workspace = true }
rkyv = { workspace = true, features = ["strict", "validation"] } rkyv = { workspace = true }
rustc-hash = { workspace = true } rustc-hash = { workspace = true }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true } serde_json = { workspace = true }

View file

@ -21,7 +21,7 @@ once_cell = { workspace = true }
pubgrub = { workspace = true, optional = true } pubgrub = { workspace = true, optional = true }
pyo3 = { workspace = true, optional = true, features = ["extension-module", "abi3-py37"] } pyo3 = { workspace = true, optional = true, features = ["extension-module", "abi3-py37"] }
serde = { workspace = true, features = ["derive"], optional = true } serde = { workspace = true, features = ["derive"], optional = true }
rkyv = { workspace = true, features = ["strict", "validation"], optional = true } rkyv = { workspace = true, optional = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
unicode-width = { workspace = true } unicode-width = { workspace = true }
unscanny = { workspace = true } unscanny = { workspace = true }

View file

@ -21,7 +21,7 @@ chrono = { workspace = true, features = ["serde"] }
mailparse = { workspace = true } mailparse = { workspace = true }
once_cell = { workspace = true } once_cell = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
rkyv = { workspace = true, features = ["strict", "validation"] } rkyv = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
thiserror = { workspace = true } thiserror = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }

View file

@ -31,7 +31,7 @@ http = { workspace = true }
reqwest = { workspace = true } reqwest = { workspace = true }
reqwest-middleware = { workspace = true } reqwest-middleware = { workspace = true }
reqwest-retry = { workspace = true } reqwest-retry = { workspace = true }
rkyv = { workspace = true, features = ["strict", "validation"] } rkyv = { workspace = true }
rmp-serde = { workspace = true } rmp-serde = { workspace = true }
rustc-hash = { workspace = true } rustc-hash = { workspace = true }
serde = { workspace = true } serde = { workspace = true }

View file

@ -6,4 +6,4 @@ description = "Normalization for distribution, package and extra anmes"
[dependencies] [dependencies]
serde = { workspace = true, features = ["derive"], optional = true } serde = { workspace = true, features = ["derive"], optional = true }
rkyv = { workspace = true, features = ["strict", "validation"], optional = true } rkyv = { workspace = true, optional = true }

View file

@ -44,7 +44,7 @@ once_cell = { workspace = true }
owo-colors = { workspace = true } owo-colors = { workspace = true }
petgraph = { workspace = true } petgraph = { workspace = true }
pubgrub = { workspace = true } pubgrub = { workspace = true }
rkyv = { workspace = true, features = ["strict", "validation"] } rkyv = { workspace = true }
rustc-hash = { workspace = true } rustc-hash = { workspace = true }
thiserror = { workspace = true } thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros"] } tokio = { workspace = true, features = ["macros"] }