Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Merge #345
Browse files Browse the repository at this point in the history
345: Update dev-dependency `serial_test` r=Urhengulas a=Urhengulas

Blocked on palfrey/serial_test#73 getting released in `serial_test 0.9`.

Co-authored-by: Urhengulas <johann.hemmann@code.berlin>
  • Loading branch information
bors[bot] and Urhengulas committed Aug 12, 2022
2 parents 743243c + d1b96df commit b22f2ed
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 23 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -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

Expand Down
29 changes: 17 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion src/backtrace/mod.rs
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/dep/cratesio.rs
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/dep/mod.rs
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/dep/rust_repo.rs
Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/dep/rust_std.rs
Expand Up @@ -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>,
Expand Down
6 changes: 3 additions & 3 deletions src/dep/rust_std/toolchain.rs
Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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> },
Expand Down
2 changes: 1 addition & 1 deletion src/dep/rustc.rs
Expand Up @@ -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>,
Expand Down

0 comments on commit b22f2ed

Please sign in to comment.