Merge #755: fix: check errors

0aaf2b5 fix: check errors (Jose Celano)

Pull request description:

  Fix check errors.

ACKs for top commit:
  josecelano:
    ACK 0aaf2b5

Tree-SHA512: 62d88216f2f9d09610a1e36779bd2982f03f39bf9bcbea19a264eae20a93180d7cc14859d821d6fe7c04e5f9830e3c12687ee70cb1c34c287254657609297be1

packages/located-error/src/lib.rs

@@ -48,7 +48,7 @@ where
     location: Box<Location<'a>>,
 }
 
-impl<'a, E> std::fmt::Display for LocatedError<'a, E>
+impl<E> std::fmt::Display for LocatedError<'_, E>
 where
     E: Error + ?Sized + Send + Sync,
 {
@@ -57,7 +57,7 @@ where
     }
 }
 
-impl<'a, E> Error for LocatedError<'a, E>
+impl<E> Error for LocatedError<'_, E>
 where
     E: Error + ?Sized + Send + Sync + 'static,
 {
@@ -66,7 +66,7 @@ where
     }
 }
 
-impl<'a, E> Clone for LocatedError<'a, E>
+impl<E> Clone for LocatedError<'_, E>
 where
     E: Error + ?Sized + Send + Sync,
 {

src/mailer.rs

@@ -179,14 +179,14 @@ fn build_letter(verification_url: &str, username: &str, builder: MessageBuilder)
 
 fn build_content(verification_url: &str, username: &str) -> Result<(String, String), tera::Error> {
     let plain_body = format!(
-        r#"
+        "
                 Welcome to Torrust, {username}!
 
                 Please click the confirmation link below to verify your account.
                 {verification_url}
 
                 If this account wasn't made by you, you can ignore this email.
-            "#
+            "
     );
     let mut context = Context::new();
     context.insert("verification", &verification_url);

src/models/info_hash.rs

@@ -336,7 +336,7 @@ impl<'de> serde::de::Deserialize<'de> for InfoHash {
 
 struct InfoHashVisitor;
 
-impl<'v> serde::de::Visitor<'v> for InfoHashVisitor {
+impl serde::de::Visitor<'_> for InfoHashVisitor {
     type Value = InfoHash;
 
     fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

src/web/api/server/v1/auth.rs

@@ -117,7 +117,7 @@ impl Authentication {
     /// # Errors
     ///
     /// This function will return an error if it can get claims from the request
-    pub async fn get_user_id_from_bearer_token(&self, maybe_token: &Option<BearerToken>) -> Result<UserId, ServiceError> {
+    pub async fn get_user_id_from_bearer_token(&self, maybe_token: Option<BearerToken>) -> Result<UserId, ServiceError> {
         let claims = self.get_claims_from_bearer_token(maybe_token).await?;
         Ok(claims.user.user_id)
     }
@@ -130,7 +130,7 @@ impl Authentication {
     ///
     /// - Return an `ServiceError::TokenNotFound` if `HeaderValue` is `None`.
     /// - Pass through the `ServiceError::TokenInvalid` if unable to verify the JWT.
-    async fn get_claims_from_bearer_token(&self, maybe_token: &Option<BearerToken>) -> Result<UserClaims, ServiceError> {
+    async fn get_claims_from_bearer_token(&self, maybe_token: Option<BearerToken>) -> Result<UserClaims, ServiceError> {
         match maybe_token {
             Some(token) => match self.verify_jwt(&token.value()).await {
                 Ok(claims) => Ok(claims),
@@ -166,7 +166,7 @@ pub async fn get_optional_logged_in_user(
     app_data: Arc<AppData>,
 ) -> Result<Option<UserId>, ServiceError> {
     match maybe_bearer_token {
-        Some(bearer_token) => match app_data.auth.get_user_id_from_bearer_token(&Some(bearer_token)).await {
+        Some(bearer_token) => match app_data.auth.get_user_id_from_bearer_token(Some(bearer_token)).await {
             Ok(user_id) => Ok(Some(user_id)),
             Err(error) => Err(error),
         },

src/web/api/server/v1/extractors/optional_user_id.rs

@@ -20,11 +20,6 @@ where
     type Rejection = Response;
 
     async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-        /* let maybe_bearer_token = match bearer_token::Extract::from_request_parts(parts, state).await {
-            Ok(maybe_bearer_token) => maybe_bearer_token.0,
-            Err(_) => return Err(ServiceError::TokenNotFound.into_response()),
-        }; */
-
         let bearer_token = match bearer_token::Extract::from_request_parts(parts, state).await {
             Ok(bearer_token) => bearer_token.0,
             Err(_) => None,
@@ -33,7 +28,7 @@ where
         //Extracts the app state
         let app_data = Arc::from_ref(state);
 
-        match app_data.auth.get_user_id_from_bearer_token(&bearer_token).await {
+        match app_data.auth.get_user_id_from_bearer_token(bearer_token).await {
             Ok(user_id) => Ok(ExtractOptionalLoggedInUser(Some(user_id))),
             Err(_) => Ok(ExtractOptionalLoggedInUser(None)),
         }

src/web/api/server/v1/extractors/user_id.rs

@@ -29,7 +29,7 @@ where
         //Extracts the app state
         let app_data = Arc::from_ref(state);
 
-        match app_data.auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
+        match app_data.auth.get_user_id_from_bearer_token(maybe_bearer_token).await {
             Ok(user_id) => Ok(ExtractLoggedInUser(user_id)),
             Err(_) => Err(ServiceError::LoggedInUserNotFound.into_response()),
         }

tests/e2e/web/api/v1/contexts/torrent/asserts.rs

@@ -14,7 +14,7 @@ use crate::e2e::environment::TestEnv;
 pub async fn canonical_torrent_for(
     mut uploaded_torrent: Torrent,
     env: &TestEnv,
-    downloader: &Option<LoggedInUserData>,
+    downloader: Option<&LoggedInUserData>,
 ) -> Torrent {
     let tracker_url = env.server_settings().unwrap().tracker.url.to_string();
 
@@ -23,8 +23,8 @@ pub async fn canonical_torrent_for(
         None => None,
     };
 
-    uploaded_torrent.announce = Some(build_announce_url(&tracker_url, &tracker_key));
-    uploaded_torrent.announce_list = Some(build_announce_list(&tracker_url, &tracker_key));
+    uploaded_torrent.announce = Some(build_announce_url(&tracker_url, tracker_key.as_ref()));
+    uploaded_torrent.announce_list = Some(build_announce_list(&tracker_url, tracker_key.as_ref()));
 
     uploaded_torrent
 }
@@ -56,15 +56,15 @@ pub async fn get_user_tracker_key(logged_in_user: &LoggedInUserData, env: &TestE
     Some(tracker_key)
 }
 
-pub fn build_announce_url(tracker_url: &str, tracker_key: &Option<TrackerKey>) -> String {
+pub fn build_announce_url(tracker_url: &str, tracker_key: Option<&TrackerKey>) -> String {
     if let Some(key) = &tracker_key {
         format!("{tracker_url}/{}", key.key)
     } else {
         tracker_url.to_string()
     }
 }
 
-fn build_announce_list(tracker_url: &str, tracker_key: &Option<TrackerKey>) -> Vec<Vec<String>> {
+fn build_announce_list(tracker_url: &str, tracker_key: Option<&TrackerKey>) -> Vec<Vec<String>> {
     if let Some(key) = &tracker_key {
         vec![vec![format!("{tracker_url}/{}", key.key)], vec![format!("{tracker_url}")]]
     } else {

tests/e2e/web/api/v1/contexts/torrent/contract.rs

@@ -325,7 +325,7 @@ mod for_guests {
 
             let downloaded_torrent = decode_torrent(&response.bytes).expect("could not decode downloaded torrent");
 
-            let expected_downloaded_torrent = canonical_torrent_for(uploaded_torrent, &env, &None).await;
+            let expected_downloaded_torrent = canonical_torrent_for(uploaded_torrent, &env, None).await;
 
             assert_eq!(downloaded_torrent, expected_downloaded_torrent);
         }