From 2df8d8a2680f13e3a18167f78fab9b58cc581b47 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 1 Feb 2021 19:01:09 -0600 Subject: [PATCH 1/4] chore: Pass along improvements --- Cargo.toml | 5 ++ README.md | 9 --- azure-pipelines.yml | 189 +++++++++++++++++++++++++++++++++++++++----- committed.toml | 4 +- release.toml | 7 +- src/lib.rs | 5 -- 6 files changed, 181 insertions(+), 38 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 485e2b2..41beff4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,11 @@ categories = ["development-tools::testing"] keywords = ["filesystem", "test", "assert", "fixture"] edition = "2018" +[badges] +azure-devops = { project = "assert-rs", pipeline = "assert_fs" } +codecov = { repository = "assert-rs/assert_fs" } +maintenance = { status = "passively-maintained" } + [dependencies] tempfile = "3.0" globwalk = "0.8" diff --git a/README.md b/README.md index 4fcae0c..f6916fc 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,6 @@ - Setting up files for your tests to consume - Asserting on files produced by your tests -## Install - -Add to your `Cargo.toml`: - -```toml -[dependencies] -assert_fs = "1.0.0" -``` - ## Example Here is a trivial example: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 94b089c..b1e13a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,31 +1,178 @@ +trigger: + branches: + include: ['master'] + tags: + include: ['v*'] +pr: + branches: + include: + - master + paths: + exclude: + - "*.md" + - "docs/*" + - "LICENSE-*" schedules: - cron: "6 6 6 * *" displayName: Monthly Build branches: include: - master +variables: + minrust: 1.44.0 + codecov_token: $(CODECOV_TOKEN_SECRET) + windows_vm: vs2017-win2016 + mac_vm: macos-10.14 + linux_vm: ubuntu-16.04 -jobs: -- template: default.yml@templates - parameters: - minrust: 1.34.0 - codecov_token: $(CODECOV_TOKEN_SECRET) -- job: "Committed" - displayName: Lint History - pool: - vmImage: 'ubuntu-16.04' - steps: - - checkout: self - - template: v1/azdo-step.yml@gh-install - parameters: - git: crate-ci/committed - target: 'x86_64-unknown-linux-gnu' - to: $(Build.StagingDirectory)/tools - - script: | - echo "This project uses Conventional style, see https://www.conventionalcommits.org" - $(Build.StagingDirectory)/tools/committed HEAD~..HEAD^2 --no-merge-commit -vv - displayName: Committed - condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest')) +stages: +- stage: check + displayName: Compilation Check + jobs: + - job: cargo_check + displayName: cargo check + pool: + vmImage: ${{ variables.linux_vm }} + steps: + - template: install-rust.yml@templates + parameters: + rust: stable + - script: cargo check --workspace --all-targets + displayName: Default features + - script: cargo check --workspace --all-targets --no-default-features + displayName: No-default features + - script: cargo check --workspace --all-targets --all-features + displayName: All features +- stage: test + displayName: Test + jobs: + - job: test + displayName: Test + strategy: + matrix: + windows: + imageName: ${{ variables.windows_vm }} + target: 'x86_64-pc-windows-msvc' + channel: stable + mac: + imageName: ${{ variables.mac_vm }} + target: 'x86_64-apple-darwin' + channel: stable + linux: + imageName: ${{ variables.linux_vm }} + target: 'x86_64-unknown-linux-gnu' + channel: stable + # Check for upcoming platform-specific compiler breakages + windows_beta: + imageName: ${{ variables.windows_vm }} + target: 'x86_64-pc-windows-msvc' + channel: beta + mac_beta: + imageName: ${{ variables.mac_vm }} + target: 'x86_64-apple-darwin' + channel: beta + linux_beta: + imageName: ${{ variables.linux_vm }} + target: 'x86_64-unknown-linux-gnu' + channel: beta + # Check for compiler breakages + linux_nightly: + imageName: ${{ variables.linux_vm }} + target: 'x86_64-unknown-linux-gnu' + channel: nightly + continueOnError: $[ne(variables.rust, 'stable')] + pool: + vmImage: $(imageName) + steps: + - template: install-rust.yml@templates + parameters: + rust: $(channel) + targets: ["$(TARGET)"] + - script: cargo test --target $(TARGET) --workspace + displayName: cargo test + - script: cargo doc --target $(TARGET) --workspace --no-deps + displayName: cargo doc + - job: msrv + displayName: "${{ format('Minimum supported Rust version: {0}', variables.minrust) }}" + dependsOn: [] + pool: + vmImage: ${{ variables.linux_vm }} + steps: + - template: install-rust.yml@templates + parameters: + rust: ${{ variables.minrust }} + - script: cargo check --all --bins --examples --tests + displayName: cargo check +- stage: style + displayName: Style checks + dependsOn: [] + jobs: + - job: "Committed" + displayName: Linting commit history + pool: + vmImage: ${{ variables.linux_vm }} + steps: + - checkout: self + - template: v1/azdo-step.yml@gh-install + parameters: + git: crate-ci/committed + target: 'x86_64-unknown-linux-gnu' + to: $(Build.StagingDirectory)/tools + - script: | + echo "Linting commits:" + git log --graph --oneline HEAD~..HEAD^2 + echo "Against 'committed.toml':" + $(Build.StagingDirectory)/tools/committed --dump-config - + echo "" + echo "If this fails, don't sweat it. We're trying to encourage clear communication and not hinder contributions." + echo "If it is a reasonable issue and you lack time or feel uncomfortable fixing it yourself," + echo "let us know and we can mentor or fix it." + $(Build.StagingDirectory)/tools/committed HEAD~..HEAD^2 --no-merge-commit -vv + displayName: Lint commit history + condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest')) + - job: style + displayName: Style checking + pool: + vmImage: ${{ variables.linux_vm }} + steps: + - template: install-rust.yml@templates + parameters: + rust: stable + components: + - rustfmt + - script: cargo fmt --all -- --check + displayName: rustfmt + - job: lint + displayName: Linting + strategy: + matrix: + current: + channel: ${{ variables.minrust }} + next: + channel: stable + continueOnError: $[eq(variables.channel, 'stable')] + pool: + vmImage: ${{ variables.linux_vm }} + steps: + - template: install-rust.yml@templates + parameters: + rust: $(channel) + components: + - clippy + - script: cargo check --workspace --all-targets --all-features + displayName: Warnings + env: + RUSTFLAGS: "-D warnings" + - script: cargo clippy --workspace --all-features --all-targets -- -D warnings + displayName: clippy +- ${{ if ne('', variables.codecov_token) }}: + - stage: coverage + displayName: Code coverage + dependsOn: test + jobs: + - template: coverage.yml@templates + parameters: + token: ${{ variables.codecov_token }} resources: repositories: diff --git a/committed.toml b/committed.toml index 96d8787..08815cf 100644 --- a/committed.toml +++ b/committed.toml @@ -1 +1,3 @@ -style="Conventional" +style="conventional" +ignore_author_re="dependabot" +merge_commit = false diff --git a/release.toml b/release.toml index 9946ba5..4b584b5 100644 --- a/release.toml +++ b/release.toml @@ -3,6 +3,9 @@ no-dev-version = true tag-message = "{{tag_name}}" tag-name = "{{prefix}}v{{version}}" pre-release-replacements = [ - {file="README.md", search="assert_fs = .*", replace="assert_fs = \"{{version}}\""}, - {file="src/lib.rs", search="assert_fs = .*", replace="assert_fs = \"{{version}}\""}, + {file="CHANGELOG.md", search="Unreleased", replace="{{version}}", min=1}, + {file="CHANGELOG.md", search="\\.\\.\\.HEAD", replace="...{{tag_name}}", exactly=1}, + {file="CHANGELOG.md", search="ReleaseDate", replace="{{date}}", min=1}, + {file="CHANGELOG.md", search="", replace="\n## [Unreleased] - ReleaseDate\n", exactly=1}, + {file="CHANGELOG.md", search="", replace="\n[Unreleased]: https://github.com/assert-rs/predicates-rs/compare/{{tag_name}}...HEAD", exactly=1}, ] diff --git a/src/lib.rs b/src/lib.rs index 695c7a8..0fd2442 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,11 +4,6 @@ //! - Setting up files for your tests to consume //! - Asserting on files produced by your tests //! -//! ```toml -//! [dependencies] -//! assert_fs = "1.0.0" -//! ``` -//! //! ## Overview //! //! Setting up a fixture From 6a6f06838b6960f71ca736775e707939674d439d Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 1 Feb 2021 19:01:29 -0600 Subject: [PATCH 2/4] docs: Run intraconv --- src/assert.rs | 35 +++++++++-------------------------- src/fixture/child.rs | 4 ---- src/fixture/dir.rs | 16 ++++------------ src/fixture/file.rs | 16 ++++------------ src/fixture/tools.rs | 11 ----------- src/lib.rs | 16 +++++++--------- 6 files changed, 24 insertions(+), 74 deletions(-) diff --git a/src/assert.rs b/src/assert.rs index 935763b..2adc6f0 100644 --- a/src/assert.rs +++ b/src/assert.rs @@ -20,7 +20,6 @@ //! temp.close().unwrap(); //! ``` //! -//! [`PathAssert`]: trait.PathAssert.html use std::fmt; use std::path; @@ -61,9 +60,7 @@ use crate::fixture; /// temp.close().unwrap(); /// ``` /// -/// [`TempDir`]: ../struct.TempDir.html -/// [`predicates`]: https://docs.rs/predicates -/// [`IntoPathPredicate`]: trait.IntoPathPredicate.html +/// [`TempDir`]: super::TempDir pub trait PathAssert { /// Assert the state of files within [`TempDir`]. /// @@ -96,9 +93,7 @@ pub trait PathAssert { /// temp.close().unwrap(); /// ``` /// - /// [`TempDir`]: ../struct.TempDir.html - /// [`predicates`]: https://docs.rs/predicates - /// [`IntoPathPredicate`]: trait.IntoPathPredicate.html + /// [`TempDir`]: super::TempDir fn assert(&self, pred: I) -> &Self where I: IntoPathPredicate

, @@ -149,7 +144,7 @@ where } } -/// Used by [`PathAssert`] to convert Self into the needed [`Predicate`]. +/// Used by [`PathAssert`] to convert Self into the needed [`predicates_core::Predicate`]. /// /// # Examples /// @@ -167,9 +162,6 @@ where /// /// temp.close().unwrap(); /// ``` -/// -/// [`PathAssert`]: trait.PathAssert.html -/// [`Predicate`]: https://docs.rs/predicates-core/0.9.0/predicates_core/trait.Predicate.html pub trait IntoPathPredicate

where P: predicates_core::Predicate, @@ -192,8 +184,8 @@ where } } -// Keep `predicates` concrete Predicates out of our public API. -/// [Predicate] used by [`IntoPathPredicate`] for bytes. +/// Keep `predicates` concrete Predicates out of our public API. +/// [predicates_core::Predicate] used by [`IntoPathPredicate`] for bytes. /// /// # Example /// @@ -210,9 +202,6 @@ where /// /// temp.close().unwrap(); /// ``` -/// -/// [`IntoPathPredicate`]: trait.IntoPathPredicate.html -/// [Predicate]: https://docs.rs/predicates-core/1.0.0/predicates_core/trait.Predicate.html #[derive(Debug)] pub struct BytesContentPathPredicate( predicates::path::FileContentPredicate>, @@ -268,8 +257,8 @@ impl IntoPathPredicate for &'static [u8] { } } -// Keep `predicates` concrete Predicates out of our public API. -/// [Predicate] used by `IntoPathPredicate` for `str`. +/// Keep `predicates` concrete Predicates out of our public API. +/// [predicates_core::Predicate] used by `IntoPathPredicate` for `str`. /// /// # Example /// @@ -286,9 +275,6 @@ impl IntoPathPredicate for &'static [u8] { /// /// temp.close().unwrap(); /// ``` -/// -/// [`IntoPathPredicate`]: trait.IntoPathPredicate.html -/// [Predicate]: https://docs.rs/predicates-core/1.0.0/predicates_core/trait.Predicate.html #[derive(Debug, Clone)] pub struct StrContentPathPredicate( predicates::path::FileContentPredicate< @@ -362,8 +348,8 @@ impl<'s> IntoPathPredicate for &'s String { } } -// Keep `predicates` concrete Predicates out of our public API. -/// [Predicate] used by `IntoPathPredicate` for `str` predicates. +/// Keep `predicates` concrete Predicates out of our public API. +/// [predicates_core::Predicate] used by `IntoPathPredicate` for `str` predicates. /// /// # Example /// @@ -381,9 +367,6 @@ impl<'s> IntoPathPredicate for &'s String { /// /// temp.close().unwrap(); /// ``` -/// -/// [`IntoPathPredicate`]: trait.IntoPathPredicate.html -/// [Predicate]: https://docs.rs/predicates-core/1.0.0/predicates_core/trait.Predicate.html #[derive(Debug, Clone)] pub struct StrPathPredicate>( predicates::path::FileContentPredicate>, diff --git a/src/fixture/child.rs b/src/fixture/child.rs index f231545..c103a0a 100644 --- a/src/fixture/child.rs +++ b/src/fixture/child.rs @@ -13,8 +13,6 @@ use std::path; /// temp.close().unwrap(); /// ``` /// -/// [`TempDir`]: struct.TempDir.html -/// [`ChildPath`]: struct.ChildPath.html pub trait PathChild { /// Access a path within the temp directory. /// @@ -70,7 +68,6 @@ impl PathChild for ChildPath { /// temp.close().unwrap(); /// ``` /// -/// [`TempDir`]: struct.TempDir.html pub struct ChildPath { path: path::PathBuf, } @@ -80,7 +77,6 @@ impl ChildPath { /// /// See trait implementations or [`PathChild`] for more details. /// - /// [`PathChild`]: trait.PathChild.html pub fn new

(path: P) -> Self where P: Into, diff --git a/src/fixture/dir.rs b/src/fixture/dir.rs index 984a0bc..cc6d98b 100644 --- a/src/fixture/dir.rs +++ b/src/fixture/dir.rs @@ -49,16 +49,9 @@ use super::errors::*; /// tmp_dir.close().unwrap(); /// ``` /// -/// [`File`]: http://doc.rust-lang.org/std/fs/struct.File.html -/// [`Path`]: http://doc.rust-lang.org/std/path/struct.Path.html -/// [`ReadDir`]: http://doc.rust-lang.org/std/fs/struct.ReadDir.html -/// [`TempDir::close()`]: struct.TempDir.html#method.close -/// [`TempDir::new()`]: struct.TempDir.html#method.new -/// [`TempDir::path()`]: struct.TempDir.html#method.path -/// [`TempDir`]: struct.TempDir.html -/// [`std::env::temp_dir()`]: https://doc.rust-lang.org/std/env/fn.temp_dir.html -/// [`std::fs`]: http://doc.rust-lang.org/std/fs/index.html -/// [`std::process::exit()`]: http://doc.rust-lang.org/std/process/fn.exit.html +/// [`File`]: std::fs::File +/// [`Path`]: std::path::Path +/// [`ReadDir`]: std::fs::ReadDir pub struct TempDir { temp: Inner, } @@ -145,7 +138,7 @@ impl TempDir { /// Accesses the [`Path`] to the temporary directory. /// - /// [`Path`]: http://doc.rust-lang.org/std/path/struct.Path.html + /// [`Path`]: std::path::Path /// /// # Examples /// @@ -179,7 +172,6 @@ impl TempDir { /// as well as from deleting the temporary directory itself. These errors /// may be platform specific. /// - /// [`std::io::Error`]: http://doc.rust-lang.org/std/io/struct.Error.html /// /// # Examples /// diff --git a/src/fixture/file.rs b/src/fixture/file.rs index 1ef9e5d..3509d9f 100644 --- a/src/fixture/file.rs +++ b/src/fixture/file.rs @@ -49,16 +49,9 @@ use super::errors::*; /// tmp_file.close().unwrap(); /// ``` /// -/// [`File`]: http://doc.rust-lang.org/std/fs/struct.File.html -/// [`Path`]: http://doc.rust-lang.org/std/path/struct.Path.html -/// [`ReadDir`]: http://doc.rust-lang.org/std/fs/struct.ReadDir.html -/// [`NamedTempFile::close()`]: struct.NamedTempFile.html#method.close -/// [`NamedTempFile::new()`]: struct.NamedTempFile.html#method.new -/// [`NamedTempFile::path()`]: struct.NamedTempFile.html#method.path -/// [`NamedTempFile`]: struct.NamedTempFile.html -/// [`std::env::temp_dir()`]: https://doc.rust-lang.org/std/env/fn.temp_dir.html -/// [`std::fs`]: http://doc.rust-lang.org/std/fs/index.html -/// [`std::process::exit()`]: http://doc.rust-lang.org/std/process/fn.exit.html +/// [`File`]: std::fs::File +/// [`Path`]: std::path::Path +/// [`ReadDir`]: std::fs::ReadDir pub struct NamedTempFile { temp: Inner, path: path::PathBuf, @@ -151,7 +144,7 @@ impl NamedTempFile { /// Accesses the [`Path`] to the temporary file. /// - /// [`Path`]: http://doc.rust-lang.org/std/path/struct.Path.html + /// [`Path`]: std::path::Path /// /// # Examples /// @@ -180,7 +173,6 @@ impl NamedTempFile { /// This function may return a variety of [`std::io::Error`]s that result from deleting the /// temporary file and parent directory, These errors may be platform specific. /// - /// [`std::io::Error`]: http://doc.rust-lang.org/std/io/struct.Error.html /// /// # Examples /// diff --git a/src/fixture/tools.rs b/src/fixture/tools.rs index 7a19a0f..4e665f7 100644 --- a/src/fixture/tools.rs +++ b/src/fixture/tools.rs @@ -13,7 +13,6 @@ use super::TempDir; /// Create empty directories at [`ChildPath`]. /// -/// [`ChildPath`]: struct.ChildPath.html pub trait PathCreateDir { /// Create an empty file at [`ChildPath`]. /// @@ -27,7 +26,6 @@ pub trait PathCreateDir { /// temp.close().unwrap(); /// ``` /// - /// [`ChildPath`]: struct.ChildPath.html fn create_dir_all(&self) -> Result<(), FixtureError>; } @@ -39,7 +37,6 @@ impl PathCreateDir for ChildPath { /// Create empty files at [`ChildPath`]. /// -/// [`ChildPath`]: struct.ChildPath.html pub trait FileTouch { /// Create an empty file at [`ChildPath`]. /// @@ -53,7 +50,6 @@ pub trait FileTouch { /// temp.close().unwrap(); /// ``` /// - /// [`ChildPath`]: struct.ChildPath.html fn touch(&self) -> Result<(), FixtureError>; } @@ -71,7 +67,6 @@ impl FileTouch for NamedTempFile { /// Write a binary file at [`ChildPath`]. /// -/// [`ChildPath`]: struct.ChildPath.html pub trait FileWriteBin { /// Write a binary file at [`ChildPath`]. /// @@ -88,7 +83,6 @@ pub trait FileWriteBin { /// temp.close().unwrap(); /// ``` /// - /// [`ChildPath`]: struct.ChildPath.html fn write_binary(&self, data: &[u8]) -> Result<(), FixtureError>; } @@ -106,7 +100,6 @@ impl FileWriteBin for NamedTempFile { /// Write a text file at [`ChildPath`]. /// -/// [`ChildPath`]: struct.ChildPath.html pub trait FileWriteStr { /// Write a text file at [`ChildPath`]. /// @@ -123,7 +116,6 @@ pub trait FileWriteStr { /// temp.close().unwrap(); /// ``` /// - /// [`ChildPath`]: struct.ChildPath.html fn write_str(&self, data: &str) -> Result<(), FixtureError>; } @@ -141,7 +133,6 @@ impl FileWriteStr for NamedTempFile { /// Write (copy) a file to [`ChildPath`]. /// -/// [`ChildPath`]: struct.ChildPath.html pub trait FileWriteFile { /// Write (copy) a file to [`ChildPath`]. /// @@ -159,7 +150,6 @@ pub trait FileWriteFile { /// temp.close().unwrap(); /// ``` /// - /// [`ChildPath`]: struct.ChildPath.html fn write_file(&self, data: &path::Path) -> Result<(), FixtureError>; } @@ -177,7 +167,6 @@ impl FileWriteFile for NamedTempFile { /// Copy files into [`TempDir`]. /// -/// [`TempDir`]: struct.TempDir.html pub trait PathCopy { /// Copy files and directories into the current path from the `source` according to the glob /// `patterns`. diff --git a/src/lib.rs b/src/lib.rs index 0fd2442..6313a87 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -37,15 +37,13 @@ //! temp.close().unwrap(); //! ``` //! -//! [`TempDir`]: struct.TempDir.html -//! [`NamedTempFile`]: struct.NamedTempFile.html -//! [`ChildPath`]: fixture/struct.ChildPath.html -//! [`FileTouch`]: fixture/trait.FileTouch.html -//! [`FileWriteBin`]: fixture/trait.FileWriteBin.html -//! [`FileWriteStr`]: fixture/trait.FileWriteStr.html -//! [`FileWriteFile`]: fixture/trait.FileWriteFile.html -//! [`PathCopy`]: fixture/trait.PathCopy.html -//! [`PathAssert`]: assert/trait.PathAssert.html +//! [`ChildPath`]: fixture::ChildPath +//! [`FileTouch`]: fixture::FileTouch +//! [`FileWriteBin`]: fixture::FileWriteBin +//! [`FileWriteStr`]: fixture::FileWriteStr +//! [`FileWriteFile`]: fixture::FileWriteFile +//! [`PathCopy`]: fixture::PathCopy +//! [`PathAssert`]: assert::PathAssert //! [dir-diff]: https://crates.io/crates/dir-diff #![warn(missing_docs)] From 9b95af80ab36f3e0b7dc533fcf3cf6e32621ae65 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 1 Feb 2021 19:06:08 -0600 Subject: [PATCH 3/4] docs: Switch to keepachangelog --- CHANGELOG.md | 54 ++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5e3100..4affcdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,17 @@ - -## 1.0.0 (2020-03-26) +# Change Log +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/) +and this project adheres to [Semantic Versioning](http://semver.org/). + + +## [Unreleased] - ReleaseDate + +## 1.0.0 - 2020-03-26 Stable release! - -## 0.13.1 (2019-12-01) +## 0.13.1 - 2019-12-01 #### Features @@ -13,8 +20,7 @@ Stable release! - -## 0.13.0 (2019-11-29) +## 0.13.0 - 2019-11-29 #### Breaking Changes @@ -29,8 +35,7 @@ Stable release! - -## 0.11.3 (2019-01-29) +## 0.11.3 - 2019-01-29 #### Features @@ -39,8 +44,7 @@ Stable release! - -## 0.11.2 (2019-01-29) +## 0.11.2 - 2019-01-29 #### Features @@ -49,8 +53,7 @@ Stable release! - -## 0.11.1 (2019-01-29) +## 0.11.1 - 2019-01-29 #### Features @@ -59,8 +62,7 @@ Stable release! - -## 0.11.0 (2019-01-29) +## 0.11.0 - 2019-01-29 #### Breaking Changes @@ -80,8 +82,7 @@ Stable release! - -## 0.10.1 (2019-01-07) +## 0.10.1 - 2019-01-07 #### Bug Fixes @@ -90,8 +91,7 @@ Stable release! - -## 0.10.0 (2018-10-26) +## 0.10.0 - 2018-10-26 #### Breaking Changes @@ -109,8 +109,7 @@ Stable release! - -## 0.9.0 (2018-08-02) +## 0.9.0 - 2018-08-02 #### Breaking Changes @@ -137,8 +136,7 @@ Stable release! - -## 0.3.0 (2018-06-27) +## 0.3.0 - 2018-06-27 #### Features @@ -161,15 +159,13 @@ Stable release! - -## 0.2.1 (2018-06-13) +## 0.2.1 - 2018-06-13 * Documentation updates - -## 0.2.0 (2018-05-30) +## 0.2.0 - 2018-05-30 #### Bug Fixes @@ -183,8 +179,7 @@ Stable release! * Update version of `predicates-rs` to v0.5.0. - -## 0.1.1 (2018-05-28) +## 0.1.1 - 2018-05-28 #### Features @@ -192,4 +187,5 @@ Stable release! * Add a prelude ([43539abf](https://github.com/assert-rs/assert_fs/commit/43539abff3e3ee879b763f5049817ca7d8609fed)) - + +[Unreleased]: https://github.com/assert-rs/predicates-rs/compare/v1.0.0...HEAD From 26e924a16c9b1c3595db0e9aabe84c062407e238 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 1 Feb 2021 19:17:53 -0600 Subject: [PATCH 4/4] style: Resolve clippy --- src/assert.rs | 2 -- src/fixture/dir.rs | 2 -- src/fixture/file.rs | 2 -- src/fixture/tools.rs | 2 -- tests/assert.rs | 2 -- 5 files changed, 10 deletions(-) diff --git a/src/assert.rs b/src/assert.rs index 2adc6f0..cd4fac7 100644 --- a/src/assert.rs +++ b/src/assert.rs @@ -24,10 +24,8 @@ use std::fmt; use std::path; -use predicates; use predicates::path::PredicateFileContentExt; use predicates::str::PredicateStrExt; -use predicates_core; use predicates_tree::CaseTreeExt; use crate::fixture; diff --git a/src/fixture/dir.rs b/src/fixture/dir.rs index cc6d98b..492b4a1 100644 --- a/src/fixture/dir.rs +++ b/src/fixture/dir.rs @@ -1,7 +1,5 @@ use std::path; -use tempfile; - use super::errors::*; /// A directory in the filesystem that is automatically deleted when diff --git a/src/fixture/file.rs b/src/fixture/file.rs index 3509d9f..3fb1e41 100644 --- a/src/fixture/file.rs +++ b/src/fixture/file.rs @@ -1,8 +1,6 @@ use std::ffi; use std::path; -use tempfile; - use super::errors::*; /// A potential file in the filesystem that is automatically deleted when diff --git a/src/fixture/tools.rs b/src/fixture/tools.rs index 4e665f7..72dcb7b 100644 --- a/src/fixture/tools.rs +++ b/src/fixture/tools.rs @@ -4,8 +4,6 @@ use std::fs; use std::io::Write; use std::path; -use globwalk; - use super::errors::*; use super::ChildPath; use super::NamedTempFile; diff --git a/tests/assert.rs b/tests/assert.rs index dfa121c..887383a 100644 --- a/tests/assert.rs +++ b/tests/assert.rs @@ -1,5 +1,3 @@ -use assert_fs; - use assert_fs::prelude::*; use predicates::prelude::*;