diff --git a/CHANGELOG.md b/CHANGELOG.md index 698ee215..b605e23c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +- [#345] Update dev-dependency `serial_test` - [#344] Replace `pub(crate)` with `pub` - [#343] Mark `v0.3.4` as released in `CHANGELOG.md` +[#345]: https://github.com/knurling-rs/probe-run/pull/345 [#344]: https://github.com/knurling-rs/probe-run/pull/344 [#343]: https://github.com/knurling-rs/probe-run/pull/343 diff --git a/Cargo.lock b/Cargo.lock index 623ebdf9..da1b4330 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,6 +196,18 @@ dependencies = [ "syn", ] +[[package]] +name = "dashmap" +version = "5.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "parking_lot_core", +] + [[package]] name = "defmt-decoder" version = "0.3.3" @@ -831,12 +843,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - [[package]] name = "ryu" version = "1.0.11" @@ -912,26 +918,25 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19dbfb999a147cedbfe82f042eb9555f5b0fa4ef95ee4570b74349103d9c9f4" +checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" dependencies = [ + "dashmap", "lazy_static", - "log", "parking_lot", "serial_test_derive", ] [[package]] name = "serial_test_derive" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9e2050b2be1d681f8f1c1a528bcfe4e00afa2d8995f713974f5333288659f2" +checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "rustversion", "syn", ] diff --git a/Cargo.toml b/Cargo.toml index e20d93ad..e92bf2e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,4 +37,4 @@ os_pipe = "1.0" pretty_assertions = "1" rstest = { version = "0.15", default-features = false } nix = "0.24" -serial_test = "0.7" +serial_test = { version = "0.9", default-features = false } diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs index 137a7fc3..5d690352 100644 --- a/src/backtrace/mod.rs +++ b/src/backtrace/mod.rs @@ -87,7 +87,7 @@ pub fn print( } /// Target program outcome -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, PartialEq)] pub enum Outcome { HardFault, Ok, diff --git a/src/dep/cratesio.rs b/src/dep/cratesio.rs index 668ad99e..0c345b75 100644 --- a/src/dep/cratesio.rs +++ b/src/dep/cratesio.rs @@ -2,7 +2,7 @@ use std::path::{self, Component, Path as StdPath, PathBuf}; use colored::Colorize as _; -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub struct Path<'p> { registry_prefix: PathBuf, crate_name_version: &'p str, diff --git a/src/dep/mod.rs b/src/dep/mod.rs index 27354417..563ff689 100644 --- a/src/dep/mod.rs +++ b/src/dep/mod.rs @@ -10,7 +10,7 @@ mod rust_repo; mod rust_std; mod rustc; -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum Path<'p> { Cratesio(cratesio::Path<'p>), /// Path into `rust-std` component diff --git a/src/dep/rust_repo.rs b/src/dep/rust_repo.rs index 1e09c27a..d6bb8611 100644 --- a/src/dep/rust_repo.rs +++ b/src/dep/rust_repo.rs @@ -3,7 +3,7 @@ use std::path::{self, Path as StdPath}; use colored::Colorize as _; /// Representation of a rust-lang/rust repo path -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum Path<'p> { One52(One52Path<'p>), Verbatim(&'p StdPath), @@ -34,7 +34,7 @@ impl<'p> Path<'p> { } /// rust-lang/repo path format as of 1.52 e.g. "library/core/src/panic.rs" -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub struct One52Path<'p> { pub library: &'p str, pub crate_name: &'p str, diff --git a/src/dep/rust_std.rs b/src/dep/rust_std.rs index ea9c86c8..e920e1f1 100644 --- a/src/dep/rust_std.rs +++ b/src/dep/rust_std.rs @@ -8,7 +8,7 @@ use super::rust_repo; mod toolchain; -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub struct Path<'p> { rustup_prefix: PathBuf, toolchain: Toolchain<'p>, diff --git a/src/dep/rust_std/toolchain.rs b/src/dep/rust_std/toolchain.rs index 8b3d1374..2d127679 100644 --- a/src/dep/rust_std/toolchain.rs +++ b/src/dep/rust_std/toolchain.rs @@ -2,7 +2,7 @@ use std::borrow::Cow; use colored::Colorize; -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum Toolchain<'p> { One52(One52<'p>), Verbatim(&'p str), @@ -32,7 +32,7 @@ impl<'p> Toolchain<'p> { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub struct One52<'p> { pub channel: Channel<'p>, pub host: &'p str, @@ -113,7 +113,7 @@ impl<'p> One52<'p> { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum Channel<'p> { Beta, Nightly { date: Option<&'p str> }, diff --git a/src/dep/rustc.rs b/src/dep/rustc.rs index 245efb2f..52d0ea5b 100644 --- a/src/dep/rustc.rs +++ b/src/dep/rustc.rs @@ -4,7 +4,7 @@ use colored::Colorize; use super::rust_repo; -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub struct Path<'p> { rustc_prefix: PathBuf, rust_repo_path: rust_repo::Path<'p>,