From ce37627f6d6071e14f4810801ed2aa066da8f785 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 6 Apr 2021 13:30:37 +0200 Subject: [PATCH] url: more regressed clippy suppressions Regressed in 6fd1e87de6ef948a19ee5502711517888f66bb60. --- url/src/lib.rs | 18 +++++++++--------- url/src/quirks.rs | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/url/src/lib.rs b/url/src/lib.rs index b3425c764..fc77bd03e 100644 --- a/url/src/lib.rs +++ b/url/src/lib.rs @@ -1434,7 +1434,7 @@ impl Url { /// Return an object with methods to manipulate this URL’s path segments. /// /// Return `Err(())` if this URL is cannot-be-a-base. - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn path_segments_mut(&mut self) -> Result, ()> { if self.cannot_be_a_base() { Err(()) @@ -1518,7 +1518,7 @@ impl Url { /// # } /// # run().unwrap(); /// ``` - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn set_port(&mut self, mut port: Option) -> Result<(), ()> { // has_host implies !cannot_be_a_base if !self.has_host() || self.host() == Some(Host::Domain("")) || self.scheme() == "file" { @@ -1789,7 +1789,7 @@ impl Url { /// # run().unwrap(); /// ``` /// - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn set_ip_host(&mut self, address: IpAddr) -> Result<(), ()> { if self.cannot_be_a_base() { return Err(()); @@ -1829,7 +1829,7 @@ impl Url { /// # } /// # run().unwrap(); /// ``` - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn set_password(&mut self, password: Option<&str>) -> Result<(), ()> { // has_host implies !cannot_be_a_base if !self.has_host() || self.host() == Some(Host::Domain("")) || self.scheme() == "file" { @@ -1922,7 +1922,7 @@ impl Url { /// # } /// # run().unwrap(); /// ``` - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn set_username(&mut self, username: &str) -> Result<(), ()> { // has_host implies !cannot_be_a_base if !self.has_host() || self.host() == Some(Host::Domain("")) || self.scheme() == "file" { @@ -2084,7 +2084,7 @@ impl Url { /// # } /// # run().unwrap(); /// ``` - #[allow(clippy::result_map_unit_fn, clippy::suspicious_operation_groupings)] + #[allow(clippy::result_unit_err, clippy::suspicious_operation_groupings)] pub fn set_scheme(&mut self, scheme: &str) -> Result<(), ()> { let mut parser = Parser::for_setter(String::new()); let remaining = parser.parse_scheme(parser::Input::new(scheme))?; @@ -2164,7 +2164,7 @@ impl Url { /// # } /// ``` #[cfg(any(unix, windows, target_os = "redox"))] - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn from_file_path>(path: P) -> Result { let mut serialization = "file://".to_owned(); let host_start = serialization.len() as u32; @@ -2201,7 +2201,7 @@ impl Url { /// Note that `std::path` does not consider trailing slashes significant /// and usually does not include them (e.g. in `Path::parent()`). #[cfg(any(unix, windows, target_os = "redox"))] - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn from_directory_path>(path: P) -> Result { let mut url = Url::from_file_path(path)?; if !url.serialization.ends_with('/') { @@ -2318,7 +2318,7 @@ impl Url { /// for a Windows path, is not UTF-8.) #[inline] #[cfg(any(unix, windows, target_os = "redox"))] - #[allow(clippy::result_map_unit_fn)] + #[allow(clippy::result_unit_err)] pub fn to_file_path(&self) -> Result { if let Some(segments) = self.path_segments() { let host = match self.host() { diff --git a/url/src/quirks.rs b/url/src/quirks.rs index 42699e224..0dbc6eb44 100644 --- a/url/src/quirks.rs +++ b/url/src/quirks.rs @@ -56,7 +56,7 @@ pub fn protocol(url: &Url) -> &str { } /// Setter for https://url.spec.whatwg.org/#dom-url-protocol -#[allow(clippy::result_map_unit_fn)] +#[allow(clippy::result_unit_err)] pub fn set_protocol(url: &mut Url, mut new_protocol: &str) -> Result<(), ()> { // The scheme state in the spec ignores everything after the first `:`, // but `set_scheme` errors if there is more. @@ -73,7 +73,7 @@ pub fn username(url: &Url) -> &str { } /// Setter for https://url.spec.whatwg.org/#dom-url-username -#[allow(clippy::result_map_unit_fn)] +#[allow(clippy::result_unit_err)] pub fn set_username(url: &mut Url, new_username: &str) -> Result<(), ()> { url.set_username(new_username) } @@ -85,7 +85,7 @@ pub fn password(url: &Url) -> &str { } /// Setter for https://url.spec.whatwg.org/#dom-url-password -#[allow(clippy::result_map_unit_fn)] +#[allow(clippy::result_unit_err)] pub fn set_password(url: &mut Url, new_password: &str) -> Result<(), ()> { url.set_password(if new_password.is_empty() { None @@ -101,7 +101,7 @@ pub fn host(url: &Url) -> &str { } /// Setter for https://url.spec.whatwg.org/#dom-url-host -#[allow(clippy::result_map_unit_fn)] +#[allow(clippy::result_unit_err)] pub fn set_host(url: &mut Url, new_host: &str) -> Result<(), ()> { // If context object’s url’s cannot-be-a-base-URL flag is set, then return. if url.cannot_be_a_base() { @@ -158,7 +158,7 @@ pub fn hostname(url: &Url) -> &str { } /// Setter for https://url.spec.whatwg.org/#dom-url-hostname -#[allow(clippy::result_map_unit_fn)] +#[allow(clippy::result_unit_err)] pub fn set_hostname(url: &mut Url, new_hostname: &str) -> Result<(), ()> { if url.cannot_be_a_base() { return Err(()); @@ -200,7 +200,7 @@ pub fn port(url: &Url) -> &str { } /// Setter for https://url.spec.whatwg.org/#dom-url-port -#[allow(clippy::result_map_unit_fn)] +#[allow(clippy::result_unit_err)] pub fn set_port(url: &mut Url, new_port: &str) -> Result<(), ()> { let result; {