diff --git a/src/archives/mod.rs b/src/archives/mod.rs index f118420..6a27da9 100644 --- a/src/archives/mod.rs +++ b/src/archives/mod.rs @@ -16,7 +16,7 @@ pub trait Archive<'a> { /// func: iterator value, max size, file name, file contents fn for_each( &mut self, - func: &mut FnMut(usize, Option, PathBuf, &mut Read) -> Result<(), String>, + func: &mut dyn FnMut(usize, Option, PathBuf, &mut dyn Read) -> Result<(), String>, ) -> Result<(), String>; } @@ -27,7 +27,7 @@ struct ZipArchive<'a> { impl<'a> Archive<'a> for ZipArchive<'a> { fn for_each( &mut self, - func: &mut FnMut(usize, Option, PathBuf, &mut Read) -> Result<(), String>, + func: &mut dyn FnMut(usize, Option, PathBuf, &mut dyn Read) -> Result<(), String>, ) -> Result<(), String> { let max = self.archive.len(); @@ -49,13 +49,13 @@ impl<'a> Archive<'a> for ZipArchive<'a> { } struct TarArchive<'a> { - archive: UpstreamTarArchive>, + archive: UpstreamTarArchive>, } impl<'a> Archive<'a> for TarArchive<'a> { fn for_each( &mut self, - func: &mut FnMut(usize, Option, PathBuf, &mut Read) -> Result<(), String>, + func: &mut dyn FnMut(usize, Option, PathBuf, &mut dyn Read) -> Result<(), String>, ) -> Result<(), String> { let entries = self .archive @@ -83,7 +83,7 @@ impl<'a> Archive<'a> for TarArchive<'a> { } /// Reads the named archive with an archive implementation. -pub fn read_archive<'a>(name: &str, data: &'a [u8]) -> Result + 'a>, String> { +pub fn read_archive<'a>(name: &str, data: &'a [u8]) -> Result + 'a>, String> { if name.ends_with(".zip") { // Decompress a .zip file let archive = UpstreamZipArchive::new(Cursor::new(data)) @@ -98,7 +98,7 @@ pub fn read_archive<'a>(name: &str, data: &'a [u8]) -> Result + .read_to_end(&mut decompressed_data) .map_err(|x| format!("Failed to decompress data: {:?}", x))?; - let decompressed_contents: Box = Box::new(Cursor::new(decompressed_data)); + let decompressed_contents: Box = Box::new(Cursor::new(decompressed_data)); let tar = UpstreamTarArchive::new(decompressed_contents); diff --git a/src/frontend/rest/services/mod.rs b/src/frontend/rest/services/mod.rs index 72943fb..c7ce3b8 100644 --- a/src/frontend/rest/services/mod.rs +++ b/src/frontend/rest/services/mod.rs @@ -41,7 +41,7 @@ pub type Response = hyper::server::Response; pub type Error = hyper::Error; /// The return type used by function calls to the web server. -pub type Future = Box>; +pub type Future = Box>; /// If advanced functionality is not needed, return a default instant future. pub fn default_future(response: Response) -> Future { diff --git a/src/sources/mod.rs b/src/sources/mod.rs index 08e6a71..345ffa6 100644 --- a/src/sources/mod.rs +++ b/src/sources/mod.rs @@ -9,7 +9,7 @@ pub mod github; use self::types::ReleaseSource; /// Returns a ReleaseSource by a name, if possible -pub fn get_by_name(name: &str) -> Option> { +pub fn get_by_name(name: &str) -> Option> { match name { "github" => Some(Box::new(github::GithubReleases::new())), _ => None, diff --git a/src/tasks/download_pkg.rs b/src/tasks/download_pkg.rs index 8c9f322..0817dc4 100644 --- a/src/tasks/download_pkg.rs +++ b/src/tasks/download_pkg.rs @@ -25,7 +25,7 @@ impl Task for DownloadPackageTask { &mut self, mut input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 1); diff --git a/src/tasks/ensure_only_instance.rs b/src/tasks/ensure_only_instance.rs index a9c34f1..00936db 100644 --- a/src/tasks/ensure_only_instance.rs +++ b/src/tasks/ensure_only_instance.rs @@ -19,7 +19,7 @@ impl Task for EnsureOnlyInstanceTask { &mut self, input: Vec, context: &mut InstallerFramework, - _messenger: &Fn(&TaskMessage), + _messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0); diff --git a/src/tasks/install.rs b/src/tasks/install.rs index 47562f7..ca5146a 100644 --- a/src/tasks/install.rs +++ b/src/tasks/install.rs @@ -26,7 +26,7 @@ impl Task for InstallTask { &mut self, _: Vec, _: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { messenger(&TaskMessage::DisplayMessage("Wrapping up...", 0.0)); Ok(TaskParamType::None) diff --git a/src/tasks/install_dir.rs b/src/tasks/install_dir.rs index d5d8f93..681d57a 100644 --- a/src/tasks/install_dir.rs +++ b/src/tasks/install_dir.rs @@ -21,7 +21,7 @@ impl Task for VerifyInstallDirTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0); messenger(&TaskMessage::DisplayMessage( diff --git a/src/tasks/install_global_shortcut.rs b/src/tasks/install_global_shortcut.rs index 64ffe8e..26013e4 100644 --- a/src/tasks/install_global_shortcut.rs +++ b/src/tasks/install_global_shortcut.rs @@ -20,7 +20,7 @@ impl Task for InstallGlobalShortcutsTask { &mut self, _: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { messenger(&TaskMessage::DisplayMessage( "Generating global shortcut...", diff --git a/src/tasks/install_pkg.rs b/src/tasks/install_pkg.rs index 9f42d21..c2f2750 100644 --- a/src/tasks/install_pkg.rs +++ b/src/tasks/install_pkg.rs @@ -34,7 +34,7 @@ impl Task for InstallPackageTask { &mut self, mut input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { messenger(&TaskMessage::DisplayMessage( &format!("Installing package {:?}...", self.name), diff --git a/src/tasks/install_shortcuts.rs b/src/tasks/install_shortcuts.rs index c2f03e6..e9c3986 100644 --- a/src/tasks/install_shortcuts.rs +++ b/src/tasks/install_shortcuts.rs @@ -22,7 +22,7 @@ impl Task for InstallShortcutsTask { &mut self, _: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { messenger(&TaskMessage::DisplayMessage( &format!("Generating shortcuts for package {:?}...", self.name), diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs index 294809e..ed6154b 100644 --- a/src/tasks/mod.rs +++ b/src/tasks/mod.rs @@ -49,12 +49,12 @@ pub enum TaskOrdering { /// A dependency of a task with various properties. pub struct TaskDependency { ordering: TaskOrdering, - task: Box, + task: Box, } impl TaskDependency { /// Builds a new dependency from the specified task. - pub fn build(ordering: TaskOrdering, task: Box) -> TaskDependency { + pub fn build(ordering: TaskOrdering, task: Box) -> TaskDependency { TaskDependency { ordering, task } } } @@ -74,7 +74,7 @@ pub trait Task { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result; /// Returns a vector containing all dependencies that need to be executed @@ -87,7 +87,7 @@ pub trait Task { /// The dependency tree allows for smart iteration on a Task struct. pub struct DependencyTree { - task: Box, + task: Box, dependencies: Vec<(TaskOrdering, DependencyTree)>, } @@ -120,7 +120,7 @@ impl DependencyTree { pub fn execute( &mut self, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { let total_tasks = (self.dependencies.len() + 1) as f64; @@ -206,7 +206,7 @@ impl DependencyTree { } /// Builds a new pipeline from the specified task, iterating on dependencies. - pub fn build(task: Box) -> DependencyTree { + pub fn build(task: Box) -> DependencyTree { let dependencies = task .dependencies() .into_iter() diff --git a/src/tasks/resolver.rs b/src/tasks/resolver.rs index b94cf09..8c4cb88 100644 --- a/src/tasks/resolver.rs +++ b/src/tasks/resolver.rs @@ -24,7 +24,7 @@ impl Task for ResolvePackageTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0); let mut metadata: Option = None; diff --git a/src/tasks/save_database.rs b/src/tasks/save_database.rs index ef23137..b216786 100644 --- a/src/tasks/save_database.rs +++ b/src/tasks/save_database.rs @@ -14,7 +14,7 @@ impl Task for SaveDatabaseTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0); messenger(&TaskMessage::DisplayMessage( diff --git a/src/tasks/save_executable.rs b/src/tasks/save_executable.rs index 6401b07..24e3360 100644 --- a/src/tasks/save_executable.rs +++ b/src/tasks/save_executable.rs @@ -23,7 +23,7 @@ impl Task for SaveExecutableTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0); messenger(&TaskMessage::DisplayMessage( diff --git a/src/tasks/uninstall.rs b/src/tasks/uninstall.rs index 5e166bf..e716e94 100644 --- a/src/tasks/uninstall.rs +++ b/src/tasks/uninstall.rs @@ -19,7 +19,7 @@ impl Task for UninstallTask { &mut self, _: Vec, _: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { messenger(&TaskMessage::DisplayMessage("Wrapping up...", 0.0)); Ok(TaskParamType::None) diff --git a/src/tasks/uninstall_global_shortcut.rs b/src/tasks/uninstall_global_shortcut.rs index d5d4733..5edd620 100644 --- a/src/tasks/uninstall_global_shortcut.rs +++ b/src/tasks/uninstall_global_shortcut.rs @@ -18,7 +18,7 @@ impl Task for UninstallGlobalShortcutsTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0); diff --git a/src/tasks/uninstall_pkg.rs b/src/tasks/uninstall_pkg.rs index 391df0c..6d0c937 100644 --- a/src/tasks/uninstall_pkg.rs +++ b/src/tasks/uninstall_pkg.rs @@ -27,7 +27,7 @@ impl Task for UninstallPackageTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 1); diff --git a/src/tasks/uninstall_shortcuts.rs b/src/tasks/uninstall_shortcuts.rs index 4dfe70c..b9dff68 100644 --- a/src/tasks/uninstall_shortcuts.rs +++ b/src/tasks/uninstall_shortcuts.rs @@ -24,7 +24,7 @@ impl Task for UninstallShortcutsTask { &mut self, input: Vec, context: &mut InstallerFramework, - messenger: &Fn(&TaskMessage), + messenger: &dyn Fn(&TaskMessage), ) -> Result { assert_eq!(input.len(), 0);