From 056a49bc50d7e6a341b9d932b951d36f2d60a1ee Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Wed, 22 Aug 2018 10:43:32 +0300 Subject: [PATCH] Fix some stuff for Rust 2018 --- src/main.rs | 12 ++++++------ src/utils.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index 65bb91e1..e866b586 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,16 +34,16 @@ mod terminal; mod utils; mod vim; +use self::config::Config; +use self::git::{Git, Repositories}; +use self::report::{Report, Reporter}; +use self::steps::*; +use self::terminal::Terminal; +use self::utils::PathExt; use clap::{App, Arg}; -use config::Config; use failure::Error; -use git::{Git, Repositories}; -use report::{Report, Reporter}; use std::env; use std::process::exit; -use steps::*; -use terminal::Terminal; -use utils::PathExt; #[derive(Fail, Debug)] #[fail(display = "A step failed")] diff --git a/src/utils.rs b/src/utils.rs index d3acea8c..1a04c434 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -28,7 +28,7 @@ where Self: Sized, { fn if_exists(self) -> Option; - fn is_descendant_of(&self, &Path) -> bool; + fn is_descendant_of(&self, ancestor: &Path) -> bool; } impl PathExt for PathBuf {