diff --git a/Cargo.lock b/Cargo.lock index fc1be194bae..6ba4a4d8bcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2253,6 +2253,10 @@ name = "bit-vec" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269" +dependencies = [ + "borsh", + "serde", +] [[package]] name = "bit_field" @@ -2380,6 +2384,30 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c" +[[package]] +name = "borsh" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" +dependencies = [ + "borsh-derive", + "bytes 1.11.1", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 3.0.3", +] + [[package]] name = "breadcrumbs" version = "0.1.0" @@ -3889,6 +3917,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "core_detect" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48" + [[package]] name = "core_maths" version = "0.1.1" @@ -14178,16 +14212,18 @@ dependencies = [ [[package]] name = "proptest" -version = "1.10.0" -source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b#3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0" dependencies = [ - "bit-set 0.8.0", - "bit-vec 0.8.0", + "bit-set 0.11.1", + "bit-vec 0.10.1", "bitflags 2.13.1", + "chacha20", + "core_detect", "num-traits", "proptest-macro", - "rand 0.9.4", - "rand_chacha 0.9.0", + "rand 0.10.2", "rand_xorshift", "regex-syntax", "rusty-fork", @@ -14208,13 +14244,14 @@ dependencies = [ [[package]] name = "proptest-macro" -version = "0.5.0" -source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b#3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e99782ea31698c2206c6887c1220d2f594b291c26cb9ec5b6d7cf175320bc212" dependencies = [ "convert_case 0.11.0", "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.3", ] [[package]] @@ -14697,11 +14734,11 @@ dependencies = [ [[package]] name = "rand_xorshift" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf" dependencies = [ - "rand_core 0.9.3", + "rand_core 0.10.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 770f7d03705..7c28a25849b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -829,7 +829,7 @@ proc-macro2 = "1.0.93" profiling = "1" # replace this with main when #635 is merged pollster = "0.4.0" -proptest = { git = "https://github.com/proptest-rs/proptest", rev = "3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b", features = ["attr-macro"] } +proptest = { version = "1.12.0", features = ["attr-macro"] } proptest-derive = "0.8.0" prost = "0.14" prost-build = { version = "0.14", default-features = false } diff --git a/crates/gpui/src/profiler/hang.rs b/crates/gpui/src/profiler/hang.rs index 827682c50fc..386bd20801f 100644 --- a/crates/gpui/src/profiler/hang.rs +++ b/crates/gpui/src/profiler/hang.rs @@ -658,7 +658,7 @@ mod tests { use std::time::Duration; use proptest::prelude::*; - use rand::prelude::*; + use rand::{Rng as _, rngs::StdRng}; use scheduler::SpawnTime; use crate::{ diff --git a/crates/gpui_macros/src/property_test.rs b/crates/gpui_macros/src/property_test.rs index fe1585cc067..a11c1ea8c59 100644 --- a/crates/gpui_macros/src/property_test.rs +++ b/crates/gpui_macros/src/property_test.rs @@ -107,7 +107,7 @@ impl Args { quote! { #errors #[::gpui::proptest::property_test( - proptest_path = "::gpui::proptest", + proptest_path = ::gpui::proptest, config = #fixed_config, #(#remaining_args,)* )] diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs index 33e4dce4087..7a3978152d2 100644 --- a/crates/project/src/git_store.rs +++ b/crates/project/src/git_store.rs @@ -11488,7 +11488,7 @@ mod tests { use git::repository::{RepoPath, repo_path}; use gpui::proptest::prelude::*; use gpui::{TestAppContext, UpdateGlobal}; - use rand::{SeedableRng, rngs::StdRng}; + use rand::{Rng as _, SeedableRng, rngs::StdRng}; use serde_json::json; use settings::SettingsStore; use std::path::{Path, PathBuf};