From fcaa7f06d822fcf8b70b557de902a24a8f9fe2c6 Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 10 Aug 2022 14:41:31 +0200 Subject: [PATCH 1/4] Update dev-dependency `serial_test` to git version --- Cargo.lock | 31 +++++++++++++++++-------------- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 623ebdf9..1c96e622 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,23 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19dbfb999a147cedbfe82f042eb9555f5b0fa4ef95ee4570b74349103d9c9f4" +version = "0.8.0" +source = "git+https://github.com/palfrey/serial_test?branch=optional-async#0fb75d622b156a34163e8085532f91ed2ef05bad" dependencies = [ + "dashmap", "lazy_static", - "log", "parking_lot", "serial_test_derive", ] [[package]] name = "serial_test_derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9e2050b2be1d681f8f1c1a528bcfe4e00afa2d8995f713974f5333288659f2" +version = "0.8.0" +source = "git+https://github.com/palfrey/serial_test?branch=optional-async#0fb75d622b156a34163e8085532f91ed2ef05bad" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "rustversion", "syn", ] diff --git a/Cargo.toml b/Cargo.toml index e20d93ad..159491b6 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.8", default-features = false, git = "https://github.com/palfrey/serial_test", branch = "optional-async" } From 1c1fd568b262d7b62eb36e272afb085027d14eaa Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 10 Aug 2022 16:38:54 +0200 Subject: [PATCH 2/4] Update `CHANGELOG.md` --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) 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 From 8aafe8b0e06551a5b9c849dc316bd80d923cee42 Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 10 Aug 2022 16:45:10 +0200 Subject: [PATCH 3/4] Switch to main branch, since the PR got merged. --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c96e622..d7b5faa1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "serial_test" version = "0.8.0" -source = "git+https://github.com/palfrey/serial_test?branch=optional-async#0fb75d622b156a34163e8085532f91ed2ef05bad" +source = "git+https://github.com/palfrey/serial_test#1b008677a558df324dfadaa275a2c13906558888" dependencies = [ "dashmap", "lazy_static", @@ -930,7 +930,7 @@ dependencies = [ [[package]] name = "serial_test_derive" version = "0.8.0" -source = "git+https://github.com/palfrey/serial_test?branch=optional-async#0fb75d622b156a34163e8085532f91ed2ef05bad" +source = "git+https://github.com/palfrey/serial_test#1b008677a558df324dfadaa275a2c13906558888" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 159491b6..d135e54d 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 = { version = "0.8", default-features = false, git = "https://github.com/palfrey/serial_test", branch = "optional-async" } +serial_test = { version = "0.8", default-features = false, git = "https://github.com/palfrey/serial_test" } From 9afa475eeb62005cc5af815dcf5c39ff6418e4e8 Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Fri, 12 Aug 2022 15:09:00 +0200 Subject: [PATCH 4/4] Update dev-dependency `serial_test` to `0.9` --- Cargo.lock | 10 ++++++---- Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7b5faa1..da1b4330 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -918,8 +918,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.8.0" -source = "git+https://github.com/palfrey/serial_test#1b008677a558df324dfadaa275a2c13906558888" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" dependencies = [ "dashmap", "lazy_static", @@ -929,8 +930,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.8.0" -source = "git+https://github.com/palfrey/serial_test#1b008677a558df324dfadaa275a2c13906558888" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index d135e54d..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 = { version = "0.8", default-features = false, git = "https://github.com/palfrey/serial_test" } +serial_test = { version = "0.9", default-features = false }