fix lints

Author: amodm

src/common.rs

@@ -1,4 +1,4 @@
-use super::{BrowserOptions, Error, ErrorKind, Result};
+use super::{BrowserOptions, Error, Result};
 use log::debug;
 use std::process::{Command, Stdio};
 
@@ -80,10 +80,7 @@ pub(crate) fn run_command(
             if status.success() {
                 Ok(())
             } else {
-                Err(Error::new(
-                    ErrorKind::Other,
-                    "command present but exited unsuccessfully",
-                ))
+                Err(Error::other("command present but exited unsuccessfully"))
             }
         })
     }

src/ios.rs

@@ -3,7 +3,7 @@ use std::ffi::c_void;
 use objc2::{class, msg_send, rc::Retained, Encode, Encoding, MainThreadMarker};
 use objc2_foundation::{NSDictionary, NSObject, NSString, NSURL};
 
-use crate::{Browser, BrowserOptions, Error, ErrorKind, Result, TargetType};
+use crate::{Browser, BrowserOptions, Error, Result, TargetType};
 
 /// Returns `UIApplication`
 #[allow(non_snake_case)]
@@ -50,24 +50,20 @@ pub(super) fn open_browser_internal(
         return Ok(());
     }
 
-    let mtm = MainThreadMarker::new().ok_or(Error::new(
-        ErrorKind::Other,
+    let mtm = MainThreadMarker::new().ok_or(Error::other(
         "UIApplication must be retrieved on the main thread",
     ))?;
 
-    let app = sharedApplication(mtm).ok_or(Error::new(
-        ErrorKind::Other,
+    let app = sharedApplication(mtm).ok_or(Error::other(
         "UIApplication is NULL, perhaps UIApplicationMain has not been executed?",
     ))?;
 
     // Create ns string class from our string
     let url_string = NSString::from_str(url);
     // Create NSURL object with given string
     #[allow(unused_unsafe)] // fix lint for now, eventually remove unsafe
-    let url_object = unsafe { NSURL::URLWithString(&url_string) }.ok_or(Error::new(
-        ErrorKind::Other,
-        "Failed creating NSURL; is the URL valid?",
-    ))?;
+    let url_object = unsafe { NSURL::URLWithString(&url_string) }
+        .ok_or(Error::other("Failed creating NSURL; is the URL valid?"))?;
     // empty options dictionary
     let options = NSDictionary::new();
 

src/macos.rs

@@ -48,10 +48,10 @@ pub(super) fn open_browser_internal(
             ))
         }
     }
-    .ok_or_else(|| Error::new(ErrorKind::Other, "failed to create CFURL"))?;
+    .ok_or_else(|| Error::other("failed to create CFURL"))?;
 
-    let cf_url = create_cf_url(target.as_ref())
-        .ok_or_else(|| Error::new(ErrorKind::Other, "failed to create CFURL"))?;
+    let cf_url =
+        create_cf_url(target.as_ref()).ok_or_else(|| Error::other("failed to create CFURL"))?;
 
     let urls_v = [cf_url];
     let urls_arr = CFArray::<CFURL>::from_CFTypes(&urls_v);
@@ -78,10 +78,7 @@ pub(super) fn open_browser_internal(
                 Err(Error::new(ErrorKind::NotFound, "browser not found"))
             }
         } else {
-            Err(Error::new(
-                ErrorKind::Other,
-                "unable to convert app url to path",
-            ))
+            Err(Error::other("unable to convert app url to path"))
         };
     }
 

src/unix.rs

@@ -313,7 +313,7 @@ fn try_xdg(options: &BrowserOptions, url: &str) -> Result<()> {
     }
 
     if config_found {
-        Err(Error::new(ErrorKind::Other, "xdg-open failed"))
+        Err(Error::other("xdg-open failed"))
     } else {
         Err(Error::new(ErrorKind::NotFound, "no valid xdg config found"))
     }
@@ -764,7 +764,7 @@ mod wsl {
 
     /// Gets the WSL distro name
     fn get_wsl_distro_name(wc: &WindowsConfig) -> Result<String> {
-        let err_fn = || Error::new(ErrorKind::Other, "unable to determine wsl distro name");
+        let err_fn = || Error::other("unable to determine wsl distro name");
 
         // mostly we should be able to get it from the WSL_DISTRO_NAME env var
         if let Ok(wsl_hostname) = std::env::var("WSL_DISTRO_NAME") {

src/wasm.rs

@@ -1,4 +1,4 @@
-use crate::{Browser, BrowserOptions, Error, ErrorKind, Result, TargetType};
+use crate::{Browser, BrowserOptions, Error, Result, TargetType};
 
 /// Deal with opening a URL in wasm. This implementation ignores the browser attribute
 /// and always opens URLs in the same browser where wasm vm is running.
@@ -15,7 +15,7 @@ pub(super) fn open_browser_internal(
         if web_sys::window().is_some() {
             return Ok(());
         } else {
-            return Err(Error::new(ErrorKind::Other, "no browser window available"));
+            return Err(Error::other("no browser window available"));
         }
     }
 
@@ -26,15 +26,15 @@ pub(super) fn open_browser_internal(
                 Some(_) => Ok(()),
                 None => {
                     wasm_console_log(POPUP_ERR_MSG, options);
-                    Err(Error::new(ErrorKind::Other, POPUP_ERR_MSG))
+                    Err(Error::other(POPUP_ERR_MSG))
                 }
             },
             Err(_) => {
                 wasm_console_log("window error while opening url", options);
-                Err(Error::new(ErrorKind::Other, "error opening url"))
+                Err(Error::other("error opening url"))
             }
         },
-        None => Err(Error::new(ErrorKind::Other, "no browser window available")),
+        None => Err(Error::other("no browser window available")),
     }
 }
 

src/windows.rs

@@ -51,18 +51,14 @@ pub(super) fn open_browser_internal(
                     &mut line_len,
                 ) != 0
                 {
-                    return Err(Error::new(
-                        ErrorKind::Other,
-                        "failed to get default browser",
-                    ));
+                    return Err(Error::other("failed to get default browser"));
                 }
 
                 use std::os::windows::ffi::OsStringExt;
                 std::ffi::OsString::from_wide(&cmdline_u16[..(line_len - 1) as usize])
                     .into_string()
                     .map_err(|_err| {
-                        Error::new(
-                            ErrorKind::Other,
+                        Error::other(
                             "The default web browser command contains invalid unicode characters",
                         )
                     })?