Ran cargo fmt.

Byron · Apr 15, 2020 · b753689 · b753689
1 parent 29876c7
commit b753689
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 267 deletions.
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1,4 @@
+hard_tabs=true
+use_field_init_shorthand=true
+use_small_heuristics="Max"
+use_try_shorthand=true
diff --git a/src/lib.rs b/src/lib.rs
@@ -18,25 +18,25 @@ mod platform;
 /// Error that might happen during a remove operation.
 #[derive(Debug)]
 pub enum Error {
-    Unknown,
+	Unknown,
 
-    /// Error while canonicalizing path.
-    /// `code` contains a raw os error code if accessible.
-    CanonicalizePath {
-        code: Option<i32>,
-    },
+	/// Error while canonicalizing path.
+	/// `code` contains a raw os error code if accessible.
+	CanonicalizePath {
+		code: Option<i32>,
+	},
 
-    /// Error while performing the remove operation.
-    /// `code` contains a raw os error code if accessible.
-    Remove {
-        code: Option<i32>,
-    },
+	/// Error while performing the remove operation.
+	/// `code` contains a raw os error code if accessible.
+	Remove {
+		code: Option<i32>,
+	},
 }
 
 /// Removes a single file or directory.
-/// 
+///
 /// # Example
-/// 
+///
 /// ```
 /// extern crate trash;
 /// use std::fs::File;
@@ -46,13 +46,13 @@ pub enum Error {
 /// assert!(File::open("remove_me").is_err());
 /// ```
 pub fn remove<T: AsRef<Path>>(path: T) -> Result<(), Error> {
-    platform::remove(path)
+	platform::remove(path)
 }
 
 /// Removes all files/directories specified by the collection of paths provided as an argument.
-/// 
+///
 /// # Example
-/// 
+///
 /// ```
 /// extern crate trash;
 /// use std::fs::File;
@@ -65,13 +65,13 @@ pub fn remove<T: AsRef<Path>>(path: T) -> Result<(), Error> {
 /// ```
 pub fn remove_all<I, T>(paths: I) -> Result<(), Error>
 where
-    I: IntoIterator<Item = T>,
-    T: AsRef<Path>,
+	I: IntoIterator<Item = T>,
+	T: AsRef<Path>,
 {
-    platform::remove_all(paths)
+	platform::remove_all(paths)
 }
 
 /// Returns true if the functions are implemented on the current platform.
 pub fn is_implemented() -> bool {
-    platform::is_implemented()
+	platform::is_implemented()
 }
diff --git a/src/linux.rs b/src/linux.rs
@@ -1,172 +1,168 @@
-
-use std::path::Path;
-use std::ffi::OsString;
 use std::env;
+use std::ffi::OsString;
+use std::path::Path;
 use std::process::Command;
 
 use crate::Error;
 
 static DEFAULT_TRASH: &str = "gio";
 
 pub fn is_implemented() -> bool {
-    true
+	true
 }
 
 /// This is based on the electron library's implementation.
 /// See: https://github.com/electron/electron/blob/34c4c8d5088fa183f56baea28809de6f2a427e02/shell/common/platform_util_linux.cc#L96
 pub fn remove_all<I, T>(paths: I) -> Result<(), Error>
 where
-    I: IntoIterator<Item = T>,
-    T: AsRef<Path>,
+	I: IntoIterator<Item = T>,
+	T: AsRef<Path>,
 {
-    let paths = paths.into_iter();
-    let full_paths = paths
-        .map(|x| x.as_ref().canonicalize())
-        .collect::<Result<Vec<_>, _>>()
-        .map_err(|e| Error::CanonicalizePath {
-            code: e.raw_os_error(),
-        })?;
-
-    let trash = {
-        // Determine desktop environment and set accordingly.
-        let desktop_env = get_desktop_environment();
-        if desktop_env == DesktopEnvironment::Kde4 ||
-            desktop_env == DesktopEnvironment::Kde5 {
-            "kioclient5"
-        } else if desktop_env == DesktopEnvironment::Kde3 {
-            "kioclient"
-        } else {
-            DEFAULT_TRASH
-        }
-    };
-
-    let mut argv = Vec::<OsString>::with_capacity(full_paths.len() + 2);
-
-    if trash == "kioclient5" || trash == "kioclient" {
-        //argv.push(trash.into());
-        argv.push("move".into());
-        for full_path in full_paths.iter() {
-            argv.push(full_path.into());
-        }
-        argv.push("trash:/".into());
-    } else {
-        //argv.push_back(ELECTRON_DEFAULT_TRASH);
-        argv.push("trash".into());
-        for full_path in full_paths.iter() {
-            argv.push(full_path.into());
-        }
-    }
-
-    // Execute command
-    let mut command = Command::new(trash);
-    command.args(argv);
-    let result = command.output().map_err(|e| Error::Remove { code: e.raw_os_error() })?;
-
-    if !result.status.success() {
-        return Err(Error::Remove {
-            code: result.status.code()
-        });
-    }
-
-    Ok(())
+	let paths = paths.into_iter();
+	let full_paths = paths
+		.map(|x| x.as_ref().canonicalize())
+		.collect::<Result<Vec<_>, _>>()
+		.map_err(|e| Error::CanonicalizePath { code: e.raw_os_error() })?;
+
+	let trash = {
+		// Determine desktop environment and set accordingly.
+		let desktop_env = get_desktop_environment();
+		if desktop_env == DesktopEnvironment::Kde4 || desktop_env == DesktopEnvironment::Kde5 {
+			"kioclient5"
+		} else if desktop_env == DesktopEnvironment::Kde3 {
+			"kioclient"
+		} else {
+			DEFAULT_TRASH
+		}
+	};
+
+	let mut argv = Vec::<OsString>::with_capacity(full_paths.len() + 2);
+
+	if trash == "kioclient5" || trash == "kioclient" {
+		//argv.push(trash.into());
+		argv.push("move".into());
+		for full_path in full_paths.iter() {
+			argv.push(full_path.into());
+		}
+		argv.push("trash:/".into());
+	} else {
+		//argv.push_back(ELECTRON_DEFAULT_TRASH);
+		argv.push("trash".into());
+		for full_path in full_paths.iter() {
+			argv.push(full_path.into());
+		}
+	}
+
+	// Execute command
+	let mut command = Command::new(trash);
+	command.args(argv);
+	let result = command.output().map_err(|e| Error::Remove { code: e.raw_os_error() })?;
+
+	if !result.status.success() {
+		return Err(Error::Remove { code: result.status.code() });
+	}
+
+	Ok(())
 }
 
 pub fn remove<T: AsRef<Path>>(path: T) -> Result<(), Error> {
-    remove_all(&[path])
+	remove_all(&[path])
 }
 
 #[derive(PartialEq)]
 enum DesktopEnvironment {
-    Other,
-    Cinnamon,
-    Gnome,
-    // KDE3, KDE4 and KDE5 are sufficiently different that we count
-    // them as different desktop environments here.
-    Kde3,
-    Kde4,
-    Kde5,
-    Pantheon,
-    Unity,
-    Xfce,
+	Other,
+	Cinnamon,
+	Gnome,
+	// KDE3, KDE4 and KDE5 are sufficiently different that we count
+	// them as different desktop environments here.
+	Kde3,
+	Kde4,
+	Kde5,
+	Pantheon,
+	Unity,
+	Xfce,
 }
 
 fn env_has_var(name: &str) -> bool {
-    env::var_os(name).is_some()
+	env::var_os(name).is_some()
 }
 
 /// See: https://chromium.googlesource.com/chromium/src/+/dd407d416fa941c04e33d81f2b1d8cab8196b633/base/nix/xdg_util.cc#57
 fn get_desktop_environment() -> DesktopEnvironment {
-    static KDE_SESSION_ENV_VAR: &str = "KDE_SESSION_VERSION";
-    // XDG_CURRENT_DESKTOP is the newest standard circa 2012.
-    if let Ok(xdg_current_desktop) = env::var("XDG_CURRENT_DESKTOP") {
-        // It could have multiple values separated by colon in priority order.
-        for value in xdg_current_desktop.split(":") {
-            let value = value.trim();
-            if value.len() == 0 { continue; }
-            if value == "Unity" {
-                // gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
-                // DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz
-                if let Ok(desktop_session) = env::var("DESKTOP_SESSION") {
-                    if desktop_session.find("gnome-fallback").is_some() {
-                        return DesktopEnvironment::Gnome;
-                    }
-                }
-                return DesktopEnvironment::Unity;
-            }
-            if value == "GNOME" {
-                return DesktopEnvironment::Gnome;
-            }
-            if value == "X-Cinnamon" {
-                return DesktopEnvironment::Cinnamon;
-            }
-            if value == "KDE" {
-                if let Ok(kde_session) = env::var(KDE_SESSION_ENV_VAR) {
-                    if kde_session == "5" {
-                        return DesktopEnvironment::Kde5;
-                    }
-                }
-                return DesktopEnvironment::Kde4;
-            }
-            if value == "Pantheon" {
-                return DesktopEnvironment::Pantheon;
-            }
-            if value == "XFCE" {
-                return DesktopEnvironment::Xfce;
-            }
-        }
-    }
-
-    // DESKTOP_SESSION was what everyone  used in 2010.
-    if let Ok(desktop_session) = env::var("DESKTOP_SESSION") {
-        if desktop_session == "gnome" || desktop_session == "mate" {
-            return DesktopEnvironment::Gnome;
-        }
-        if desktop_session == "kde4" || desktop_session == "kde-plasma" {
-            return DesktopEnvironment::Kde4;
-        }
-        if desktop_session == "kde" {
-            // This may mean KDE4 on newer systems, so we have to check.
-            if env_has_var(KDE_SESSION_ENV_VAR) {
-                return DesktopEnvironment::Kde4;
-            }
-            return DesktopEnvironment::Kde3;
-        }
-        if desktop_session.find("xfce").is_some() || desktop_session == "xubuntu" {
-            return DesktopEnvironment::Xfce;
-        }
-    }
-
-    // Fall back on some older environment variables.
-    // Useful particularly in the DESKTOP_SESSION=default case.
-    if env_has_var("GNOME_DESKTOP_SESSION_ID") {
-        return DesktopEnvironment::Gnome;
-    }
-    if env_has_var("KDE_FULL_SESSION") {
-        if env_has_var(KDE_SESSION_ENV_VAR) {
-            return DesktopEnvironment::Kde4;
-        }
-        return DesktopEnvironment::Kde3;
-    }
-
-    return DesktopEnvironment::Other;
+	static KDE_SESSION_ENV_VAR: &str = "KDE_SESSION_VERSION";
+	// XDG_CURRENT_DESKTOP is the newest standard circa 2012.
+	if let Ok(xdg_current_desktop) = env::var("XDG_CURRENT_DESKTOP") {
+		// It could have multiple values separated by colon in priority order.
+		for value in xdg_current_desktop.split(":") {
+			let value = value.trim();
+			if value.len() == 0 {
+				continue;
+			}
+			if value == "Unity" {
+				// gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
+				// DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz
+				if let Ok(desktop_session) = env::var("DESKTOP_SESSION") {
+					if desktop_session.find("gnome-fallback").is_some() {
+						return DesktopEnvironment::Gnome;
+					}
+				}
+				return DesktopEnvironment::Unity;
+			}
+			if value == "GNOME" {
+				return DesktopEnvironment::Gnome;
+			}
+			if value == "X-Cinnamon" {
+				return DesktopEnvironment::Cinnamon;
+			}
+			if value == "KDE" {
+				if let Ok(kde_session) = env::var(KDE_SESSION_ENV_VAR) {
+					if kde_session == "5" {
+						return DesktopEnvironment::Kde5;
+					}
+				}
+				return DesktopEnvironment::Kde4;
+			}
+			if value == "Pantheon" {
+				return DesktopEnvironment::Pantheon;
+			}
+			if value == "XFCE" {
+				return DesktopEnvironment::Xfce;
+			}
+		}
+	}
+
+	// DESKTOP_SESSION was what everyone  used in 2010.
+	if let Ok(desktop_session) = env::var("DESKTOP_SESSION") {
+		if desktop_session == "gnome" || desktop_session == "mate" {
+			return DesktopEnvironment::Gnome;
+		}
+		if desktop_session == "kde4" || desktop_session == "kde-plasma" {
+			return DesktopEnvironment::Kde4;
+		}
+		if desktop_session == "kde" {
+			// This may mean KDE4 on newer systems, so we have to check.
+			if env_has_var(KDE_SESSION_ENV_VAR) {
+				return DesktopEnvironment::Kde4;
+			}
+			return DesktopEnvironment::Kde3;
+		}
+		if desktop_session.find("xfce").is_some() || desktop_session == "xubuntu" {
+			return DesktopEnvironment::Xfce;
+		}
+	}
+
+	// Fall back on some older environment variables.
+	// Useful particularly in the DESKTOP_SESSION=default case.
+	if env_has_var("GNOME_DESKTOP_SESSION_ID") {
+		return DesktopEnvironment::Gnome;
+	}
+	if env_has_var("KDE_FULL_SESSION") {
+		if env_has_var(KDE_SESSION_ENV_VAR) {
+			return DesktopEnvironment::Kde4;
+		}
+		return DesktopEnvironment::Kde3;
+	}
+
+	return DesktopEnvironment::Other;
 }