vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge conflicts

Browse source
This commit is contained in:
Antoine Gersant 2025-01-15 23:11:57 -08:00
parent 8ccc9cc2ee
commit d90b51f752
1 changed files with 7 additions and 128 deletions

135
Cargo.lock generated
View file

@ -59,15 +59,6 @@ dependencies = [
"byteorder",
]
[[package]]
name = "arbitrary"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
dependencies = [
"derive_arbitrary",
]
[[package]]
name = "arrayvec"
version = "0.7.4"
@ -334,12 +325,6 @@ dependencies = [
"orion",
]
[[package]]
name = "bumpalo"
version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytecount"
version = "0.6.8"
@ -531,17 +516,6 @@ dependencies = [
"powerfmt",
]
[[package]]
name = "derive_arbitrary"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
]
[[package]]
name = "diff"
version = "0.1.13"
@ -1354,12 +1328,6 @@ dependencies = [
"scopeguard",
]
[[package]]
name = "lockfree-object-pool"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
[[package]]
name = "log"
version = "0.4.22"
@ -1454,7 +1422,7 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f"
dependencies = [
"thiserror 1.0.63",
"thiserror",
]
[[package]]
@ -1509,7 +1477,7 @@ dependencies = [
"semver",
"serde",
"skeptic",
"thiserror 1.0.63",
"thiserror",
]
[[package]]
@ -1533,7 +1501,7 @@ dependencies = [
"native_model_macro",
"serde",
"skeptic",
"thiserror 1.0.63",
"thiserror",
"zerocopy",
]
@ -1839,7 +1807,7 @@ dependencies = [
"serde_json",
"simplelog",
"symphonia",
"thiserror 1.0.63",
"thiserror",
"tinyvec",
"tokio",
"tokio-util",
@ -1851,11 +1819,7 @@ dependencies = [
"ureq",
"utoipa",
"utoipa-axum",
<<<<<<< HEAD
"utoipa-swagger-ui",
=======
"utoipa-scalar",
>>>>>>> 7653e4b (Working utoipa setup)
"winres",
]
@ -2053,7 +2017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9838134a2bfaa8e1f40738fcc972ac799de6e0e06b5157acb95fc2b05a0ea283"
dependencies = [
"lazy_static",
"thiserror 1.0.63",
"thiserror",
]
[[package]]
@ -2085,40 +2049,6 @@ dependencies = [
"smallvec",
]
[[package]]
name = "rust-embed"
version = "8.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
"walkdir",
]
[[package]]
name = "rust-embed-impl"
version = "8.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
"syn 2.0.96",
"walkdir",
]
[[package]]
name = "rust-embed-utils"
version = "8.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
dependencies = [
"sha2",
"walkdir",
]
[[package]]
name = "rust-multipart-rfc7578_2"
version = "0.6.1"
@ -2132,7 +2062,7 @@ dependencies = [
"mime",
"mime_guess",
"rand",
"thiserror 1.0.63",
"thiserror",
]
[[package]]
@ -2694,16 +2624,7 @@ version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl 1.0.63",
]
[[package]]
name = "thiserror"
version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
dependencies = [
"thiserror-impl 2.0.11",
"thiserror-impl",
]
[[package]]
@ -2715,20 +2636,6 @@ dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
<<<<<<< HEAD
]
[[package]]
name = "thiserror-impl"
version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
=======
>>>>>>> 7653e4b (Working utoipa setup)
]
[[package]]
@ -3113,33 +3020,6 @@ dependencies = [
]
[[package]]
<<<<<<< HEAD
name = "utoipa-swagger-ui"
version = "8.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "040cad8bd8de63f3d028e08e5b39be49d68f8a646e99f4aea2e2d4d82c34b21f"
dependencies = [
"axum",
"base64 0.22.1",
"mime_guess",
"regex",
"rust-embed",
"serde",
"serde_json",
"url",
"utoipa",
"utoipa-swagger-ui-vendored",
"zip",
]
[[package]]
name = "utoipa-swagger-ui-vendored"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d"
[[package]]
=======
name = "utoipa-scalar"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@ -3152,7 +3032,6 @@ dependencies = [
]
[[package]]
>>>>>>> 7653e4b (Working utoipa setup)
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"