diff --git a/foundation/metadata/src/lib.rs b/foundation/metadata/src/lib.rs index 7b6c00a3..d12498ef 100644 --- a/foundation/metadata/src/lib.rs +++ b/foundation/metadata/src/lib.rs @@ -88,7 +88,7 @@ pub async fn email(service_account: &str) -> Result { async fn get_etag_with_trim(suffix: &str) -> Result { let result = get_etag(suffix).await?; - return Ok(result.trim().to_string()); + Ok(result.trim().to_string()) } async fn get_etag(suffix: &str) -> Result { diff --git a/spanner-derive/src/column.rs b/spanner-derive/src/column.rs index 1d77c855..f54eda2c 100644 --- a/spanner-derive/src/column.rs +++ b/spanner-derive/src/column.rs @@ -14,7 +14,7 @@ pub(crate) struct Column<'a> { pub commit_timestamp: bool, } -impl<'a> Column<'a> { +impl Column<'_> { pub(crate) fn name(&self) -> String { match &self.column_name { Some(v) => v.to_string(), diff --git a/spanner-derive/src/symbol.rs b/spanner-derive/src/symbol.rs index dc363e54..5a266017 100644 --- a/spanner-derive/src/symbol.rs +++ b/spanner-derive/src/symbol.rs @@ -16,7 +16,7 @@ impl PartialEq for Ident { } } -impl<'a> PartialEq for &'a Ident { +impl PartialEq for &Ident { fn eq(&self, word: &Symbol) -> bool { *self == word.0 } @@ -28,7 +28,7 @@ impl PartialEq for Path { } } -impl<'a> PartialEq for &'a Path { +impl PartialEq for &Path { fn eq(&self, word: &Symbol) -> bool { self.is_ident(word.0) } diff --git a/spanner/src/row.rs b/spanner/src/row.rs index 352f5aca..da5caf40 100644 --- a/spanner/src/row.rs +++ b/spanner/src/row.rs @@ -310,10 +310,10 @@ where } pub fn as_ref<'a>(item: &'a Value, field: &'a Field) -> Result<&'a Kind, Error> { - return match item.kind.as_ref() { + match item.kind.as_ref() { Some(v) => Ok(v), None => Err(Error::NoKind(field.name.to_string())), - }; + } } pub fn kind_to_error<'a, T>(v: &'a value::Kind, field: &'a Field) -> Result { diff --git a/spanner/src/statement.rs b/spanner/src/statement.rs index 17659a16..582a7971 100644 --- a/spanner/src/statement.rs +++ b/spanner/src/statement.rs @@ -283,7 +283,7 @@ where } } -impl<'a, T> ToKind for &'a [T] +impl ToKind for &[T] where T: ToKind, { diff --git a/spanner/src/transaction.rs b/spanner/src/transaction.rs index 6314f511..463d85d5 100644 --- a/spanner/src/transaction.rs +++ b/spanner/src/transaction.rs @@ -250,11 +250,11 @@ impl Transaction { } pub(crate) fn get_session_name(&self) -> String { - return self.session.as_ref().unwrap().session.name.to_string(); + self.session.as_ref().unwrap().session.name.to_string() } pub(crate) fn as_mut_session(&mut self) -> &mut ManagedSession { - return self.session.as_mut().unwrap(); + self.session.as_mut().unwrap() } /// returns the owner ship of session. diff --git a/spanner/src/transaction_rw.rs b/spanner/src/transaction_rw.rs index f7161366..8681d423 100644 --- a/spanner/src/transaction_rw.rs +++ b/spanner/src/transaction_rw.rs @@ -266,7 +266,7 @@ impl ReadWriteTransaction { { let opt = options.unwrap_or_default(); - return match result { + match result { Ok(s) => match self.commit(opt).await { Ok(c) => Ok((c.commit_timestamp.map(|ts| ts.into()), s)), // Retry the transaction using the same session on ABORT error. @@ -293,11 +293,11 @@ impl ReadWriteTransaction { Code::Aborted => Err((err, self.take_session())), _ => { let _ = self.rollback(opt.call_options.retry).await; - return Err((err, self.take_session())); + Err((err, self.take_session())) } } } - }; + } } pub(crate) async fn commit(&mut self, options: CommitOptions) -> Result { diff --git a/storage/src/sign.rs b/storage/src/sign.rs index ef7cd1e9..d80c82eb 100644 --- a/storage/src/sign.rs +++ b/storage/src/sign.rs @@ -313,13 +313,12 @@ fn v4_sanitize_headers(hdrs: &[String]) -> Vec { } fn extract_header_names(kvs: &[String]) -> Vec<&str> { - return kvs - .iter() + kvs.iter() .map(|header| { let name_value: Vec<&str> = header.split(':').collect(); name_value[0] }) - .collect(); + .collect() } fn validate_options(opts: &SignedURLOptions) -> Result<(), SignedURLError> {