From 8ddfd41fa65eb1b949099d1211cfa84760a26822 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Thu, 26 Dec 2019 19:10:50 -0600 Subject: [PATCH] wtf. --- .github/workflows/rust.yml | 14 -------------- Cargo.lock | 2 +- src/dir.rs | 4 ++-- src/main.rs | 6 +++--- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/rust.yml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml deleted file mode 100644 index 21851f7..0000000 --- a/.github/workflows/rust.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Rust - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Build - run: cargo build --verbose - - name: Run tests - run: cargo test --verbose diff --git a/Cargo.lock b/Cargo.lock index 57c268d..7666da6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "garbage" -version = "0.1.2" +version = "0.1.3" dependencies = [ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/dir.rs b/src/dir.rs index cf91992..fc8d837 100644 --- a/src/dir.rs +++ b/src/dir.rs @@ -3,8 +3,8 @@ use std::path::{Path, PathBuf}; use walkdir::{DirEntry, WalkDir}; -use crate::errors::Error; -use crate::info::TrashInfo; +use crate::Error; +use crate::TrashInfo; use crate::XDG; #[derive(Clone, Debug)] diff --git a/src/main.rs b/src/main.rs index 917bd17..d032551 100644 --- a/src/main.rs +++ b/src/main.rs @@ -37,9 +37,9 @@ enum Command { #[structopt(long = "recursive", short = "r")] recursive: bool, - /// -f to stay compatible with GNU rm + /// Suppress prompts/messages #[structopt(long = "force", short = "f")] - _force: bool, + force: bool, }, #[structopt(name = "restore")] @@ -74,7 +74,7 @@ fn main() -> Result<(), Error> { } } Command::Put { - paths, recursive, .. + paths, recursive, force } => { ops::put(paths, recursive); }