proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-07 17:30:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clippy and formatting fixups

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-11-18 09:46:01 +01:00
parent ba2da9d125
commit 467d567545
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/client.rs
View File

@ -123,7 +123,7 @@ impl Inner {
self.easy.url(url)?; self.easy.url(url)?;
if let Some(p) = &self.proxy { if let Some(p) = &self.proxy {
self.easy.proxy(&p)?; self.easy.proxy(p)?;
} }
{ {
@ -410,7 +410,7 @@ impl Client {
match self.run_request(request) { match self.run_request(request) {
Ok(response) => break response, Ok(response) => break response,
Err(err) if err.is_bad_nonce() => continue, Err(err) if err.is_bad_nonce() => continue,
Err(err) => return Err(err.into()), Err(err) => return Err(err),
} }
}; };
@ -439,11 +439,11 @@ impl Client {
let directory = let directory =
Self::get_directory(&mut self.inner, &mut self.directory, &self.directory_url)?; Self::get_directory(&mut self.inner, &mut self.directory, &self.directory_url)?;
let nonce = Self::nonce(&mut self.inner, directory)?; let nonce = Self::nonce(&mut self.inner, directory)?;
let request = account.post_request(&account.location, &nonce, data)?; let request = account.post_request(&account.location, nonce, data)?;
let response = match self.inner.run_request(request) { let response = match self.inner.run_request(request) {
Ok(response) => response, Ok(response) => response,
Err(err) if err.is_bad_nonce() => continue, Err(err) if err.is_bad_nonce() => continue,
Err(err) => return Err(err.into()), Err(err) => return Err(err),
}; };
break response; break response;
@ -477,7 +477,7 @@ impl Client {
let mut response = match self.inner.run_request(new_order.request.take().unwrap()) { let mut response = match self.inner.run_request(new_order.request.take().unwrap()) {
Ok(response) => response, Ok(response) => response,
Err(err) if err.is_bad_nonce() => continue, Err(err) if err.is_bad_nonce() => continue,
Err(err) => return Err(err.into()), Err(err) => return Err(err),
}; };
return new_order.response(response.location_required()?, response.bytes().as_ref()); return new_order.response(response.location_required()?, response.bytes().as_ref());
@ -486,12 +486,12 @@ impl Client {
/// Assuming the provided URL is an 'Authorization' URL, get and deserialize it. /// Assuming the provided URL is an 'Authorization' URL, get and deserialize it.
pub fn get_authorization(&mut self, url: &str) -> Result<Authorization, Error> { pub fn get_authorization(&mut self, url: &str) -> Result<Authorization, Error> {
Ok(self.post_as_get(url)?.json()?) self.post_as_get(url)?.json()
} }
/// Assuming the provided URL is an 'Order' URL, get and deserialize it. /// Assuming the provided URL is an 'Order' URL, get and deserialize it.
pub fn get_order(&mut self, url: &str) -> Result<OrderData, Error> { pub fn get_order(&mut self, url: &str) -> Result<OrderData, Error> {
Ok(self.post_as_get(url)?.json()?) self.post_as_get(url)?.json()
} }
/// Low level "POST-as-GET" request. /// Low level "POST-as-GET" request.
@ -509,7 +509,7 @@ impl Client {
match self.inner.run_request(request) { match self.inner.run_request(request) {
Ok(response) => return Ok(response), Ok(response) => return Ok(response),
Err(err) if err.is_bad_nonce() => continue, Err(err) if err.is_bad_nonce() => continue,
Err(err) => return Err(err.into()), Err(err) => return Err(err),
} }
} }
} }
@ -529,14 +529,14 @@ impl Client {
match self.inner.run_request(request) { match self.inner.run_request(request) {
Ok(response) => return Ok(response), Ok(response) => return Ok(response),
Err(err) if err.is_bad_nonce() => continue, Err(err) if err.is_bad_nonce() => continue,
Err(err) => return Err(err.into()), Err(err) => return Err(err),
} }
} }
} }
/// Request challenge validation. Afterwards, the challenge should be polled. /// Request challenge validation. Afterwards, the challenge should be polled.
pub fn request_challenge_validation(&mut self, url: &str) -> Result<Challenge, Error> { pub fn request_challenge_validation(&mut self, url: &str) -> Result<Challenge, Error> {
Ok(self.post(url, &serde_json::json!({}))?.json()?) self.post(url, &serde_json::json!({}))?.json()
} }
/// Shortcut to `account().ok_or_else(...).key_authorization()`. /// Shortcut to `account().ok_or_else(...).key_authorization()`.
@ -588,11 +588,11 @@ impl Client {
let directory = let directory =
Self::get_directory(&mut self.inner, &mut self.directory, &self.directory_url)?; Self::get_directory(&mut self.inner, &mut self.directory, &self.directory_url)?;
let nonce = Self::nonce(&mut self.inner, directory)?; let nonce = Self::nonce(&mut self.inner, directory)?;
let request = revocation.request(&directory, nonce)?; let request = revocation.request(directory, nonce)?;
match self.inner.run_request(request) { match self.inner.run_request(request) {
Ok(_response) => return Ok(()), Ok(_response) => return Ok(()),
Err(err) if err.is_bad_nonce() => continue, Err(err) if err.is_bad_nonce() => continue,
Err(err) => return Err(err.into()), Err(err) => return Err(err),
} }
} }
} }

2
src/order.rs
View File

@ -141,7 +141,7 @@ pub struct Order {
impl Order { impl Order {
/// Get an authorization URL (or `None` if the index is out of range). /// Get an authorization URL (or `None` if the index is out of range).
pub fn authorization(&self, index: usize) -> Option<&str> { pub fn authorization(&self, index: usize) -> Option<&str> {
Some(&self.data.authorizations.get(index)?) Some(self.data.authorizations.get(index)?)
} }
/// Get the number of authorizations in this object. /// Get the number of authorizations in this object.