diff --git a/Cargo.lock b/Cargo.lock index 47a77e2b..d72b1e9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -549,12 +549,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bincode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6a120d2e16b3e1b4a24bd70f23b12d3e16b81f113364a26935f8db7245452d" - [[package]] name = "bit_field" version = "0.10.3" @@ -931,35 +925,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206" -dependencies = [ - "cookie", - "document-features", - "idna", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1211,15 +1176,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "document-features" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" -dependencies = [ - "litrs", -] - [[package]] name = "dunce" version = "1.0.5" @@ -1723,16 +1679,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "http" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" -dependencies = [ - "bytes", - "itoa", -] - [[package]] name = "httparse" version = "1.10.1" @@ -1760,7 +1706,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcf4dd4c44ae85155502a52c48739c8a48185d1449fff1963cffee63c28a50f0" dependencies = [ - "bincode 1.3.3", + "bincode", "fst", "hyphenation_commons", "pocket-resources", @@ -2073,9 +2019,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.38.1" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c19a05435c21ac299d71b6a9c13db3e3f47c520517d58990a462a1397a61db" +checksum = "f1d20bef17f513b9b3004532233187769cd072d790971f4e4da0e346eb6401e8" dependencies = [ "cc", "pkg-config", @@ -2094,12 +2040,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" -[[package]] -name = "litrs" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" - [[package]] name = "llvm-sys" version = "221.0.1" @@ -2190,7 +2130,7 @@ dependencies = [ "nom", "rand 0.10.2", "rangemap", - "sha2", + "sha2 0.11.0", "stringprep", "thiserror", "weezl 0.2.1", @@ -3142,9 +3082,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.40.1" +version = "0.40.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11438310b19e3109b6446c33d1ed5e889428cf2e278407bc7896bc4aaea43323" +checksum = "23f2a97da3e3873c73cb2a2e71b35c40ff95e0b1eefa8d72d8499a6928c3b5b3" dependencies = [ "bitflags 2.13.0", "fallible-iterator", @@ -3361,6 +3301,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.11.0" @@ -3572,7 +3523,7 @@ dependencies = [ name = "techscript_bytecode" version = "2.0.0" dependencies = [ - "bincode 3.0.0", + "bincode", "serde", "techscript_ast", "techscript_common", @@ -3590,7 +3541,7 @@ name = "techscript_cli" version = "2.0.0" dependencies = [ "anyhow", - "bincode 3.0.0", + "bincode", "clap", "clap_complete", "colored", @@ -3795,7 +3746,7 @@ dependencies = [ "hex", "serde", "serde_json", - "sha2", + "sha2 0.11.0", "toml 1.1.3+spec-1.1.0", "zip 2.4.2", ] @@ -3864,7 +3815,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2", + "sha2 0.10.9", "tar", "techscript_runtime", "tiny_http", @@ -3888,7 +3839,7 @@ dependencies = [ name = "techscript_vm" version = "2.0.0" dependencies = [ - "bincode 3.0.0", + "bincode", "indexmap", "serde", "techscript_ast", @@ -3965,7 +3916,6 @@ dependencies = [ "powerfmt", "serde_core", "time-core", - "time-macros", ] [[package]] @@ -3974,16 +3924,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" -[[package]] -name = "time-macros" -version = "0.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tiny_http" version = "0.12.0" @@ -4317,34 +4257,20 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "3.3.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0" +checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ "base64 0.22.1", - "cookie_store", "flate2", "log", - "percent-encoding", + "once_cell", "rustls", "rustls-pki-types", "serde", "serde_json", - "ureq-proto", - "utf8-zero", - "webpki-roots", -] - -[[package]] -name = "ureq-proto" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c" -dependencies = [ - "base64 0.22.1", - "http", - "httparse", - "log", + "url", + "webpki-roots 0.26.11", ] [[package]] @@ -4360,12 +4286,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "utf8-zero" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -4483,6 +4403,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "webpki-roots" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.8", +] + [[package]] name = "webpki-roots" version = "1.0.8" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 0d71508d..34b0bc40 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -37,10 +37,10 @@ anyhow = { workspace = true } rustyline = { workspace = true } toml = { workspace = true } indexmap = { workspace = true } -bincode = "3.0" +bincode = "1.3" dirs = "6.0" num_cpus = "1.15" -ureq = { version = "3.3.0" } +ureq = { version = "2.9.0" } [build-dependencies] winres = "0.1.12" diff --git a/compiler/bytecode/Cargo.toml b/compiler/bytecode/Cargo.toml index c6ca4918..660d5ab1 100644 --- a/compiler/bytecode/Cargo.toml +++ b/compiler/bytecode/Cargo.toml @@ -10,7 +10,7 @@ techscript_syntax = { path = "../syntax" } techscript_ast = { path = "../ast" } techscript_ir = { path = "../ir" } serde = { workspace = true } -bincode = "3.0" +bincode = "1.3" [dev-dependencies] techscript_errors = { path = "../errors" } @@ -19,4 +19,4 @@ techscript_parser = { path = "../parser" } techscript_semantic = { path = "../semantic" } techscript_optimizer = { path = "../optimizer" } serde = { workspace = true } -bincode = "3.0" +bincode = "1.3" diff --git a/runtime/vm/Cargo.toml b/runtime/vm/Cargo.toml index b83f0c59..7368988f 100644 --- a/runtime/vm/Cargo.toml +++ b/runtime/vm/Cargo.toml @@ -14,7 +14,7 @@ techscript_runtime = { path = "../runtime" } techscript_builtins = { path = "../builtins" } techscript_stdlib = { path = "../../stdlib" } serde = { workspace = true } -bincode = "3.0" +bincode = "1.3" thiserror = { workspace = true } indexmap = "2.0" diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 4234622d..fff5a03f 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -9,12 +9,12 @@ techscript_runtime = { path = "../runtime/runtime" } serde_json = { workspace = true } serde = { workspace = true } indexmap = { version = "2", features = ["serde"] } -ureq = { version = "3.3", features = ["json"] } +ureq = { version = "2.9", features = ["json"] } toml = { workspace = true } rusqlite = { version = "0.40", features = ["bundled"] } md5 = "0.8" -sha2 = "0.11" -sha-1 = "0.10" +sha2 = "0.10" +sha-1 = "0.10.1" aes-gcm = "0.11" bcrypt = "0.19" zip = "2.1" diff --git a/tools/package-manager/Cargo.toml b/tools/package-manager/Cargo.toml index fab45c1e..b891de41 100644 --- a/tools/package-manager/Cargo.toml +++ b/tools/package-manager/Cargo.toml @@ -9,4 +9,4 @@ serde = { workspace = true } serde_json = { workspace = true } toml = "1.1" anyhow = { workspace = true } -ureq = { version = "3.3" } +ureq = { version = "2.9" } diff --git a/tools/packager/src/main.rs b/tools/packager/src/main.rs index 2dfbb216..9829b307 100644 --- a/tools/packager/src/main.rs +++ b/tools/packager/src/main.rs @@ -328,7 +328,8 @@ fn package_vsix(root_dir: &Path, dest_vsix: &Path, version: &str) -> anyhow::Res let file = File::create(dest_vsix)?; let mut zip = ZipWriter::new(file); - let options = FileOptions::default().compression_method(zip::CompressionMethod::Deflated); + let options: FileOptions<()> = + FileOptions::default().compression_method(zip::CompressionMethod::Deflated); zip.start_file("[Content_Types].xml", options)?; let content_types = r#" @@ -403,7 +404,8 @@ fn package_vsix(root_dir: &Path, dest_vsix: &Path, version: &str) -> anyhow::Res fn zip_release_folder(release_dir: &Path, dst_zip: &Path) -> anyhow::Result<()> { let file = File::create(dst_zip)?; let mut zip = ZipWriter::new(file); - let options = FileOptions::default().compression_method(zip::CompressionMethod::Deflated); + let options: FileOptions<()> = + FileOptions::default().compression_method(zip::CompressionMethod::Deflated); let folders = ["docs", "examples", "tools", "runtime"]; for folder in &folders { @@ -440,7 +442,8 @@ fn zip_release_folder(release_dir: &Path, dst_zip: &Path) -> anyhow::Result<()> fn zip_sub_directory(src_dir: &Path, dst_zip: &Path) -> anyhow::Result<()> { let file = File::create(dst_zip)?; let mut zip = ZipWriter::new(file); - let options = FileOptions::default().compression_method(zip::CompressionMethod::Deflated); + let options: FileOptions<()> = + FileOptions::default().compression_method(zip::CompressionMethod::Deflated); let files = walk_dir(src_dir)?; for file_path in files {