Fix for Rust 1.85.0 (#953)

boost_manager/src/activator.rs

@@ -38,7 +38,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

boost_manager/src/purger.rs

@@ -20,7 +20,7 @@ impl ManagedTask for Purger {
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

boost_manager/src/updater.rs

@@ -27,7 +27,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

boost_manager/src/watcher.rs

@@ -34,7 +34,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

file_store/src/file_info_poller.rs

@@ -556,8 +556,8 @@ mod tests {
                 .0
                 .clone()
                 .into_iter()
-                .filter(|file_info| after.map_or(true, |v| file_info.timestamp > v))
-                .filter(|file_info| before.map_or(true, |v| file_info.timestamp <= v))
+                .filter(|file_info| after.is_none_or(|v| file_info.timestamp > v))
+                .filter(|file_info| before.is_none_or(|v| file_info.timestamp <= v))
                 .collect())
         }
 

file_store/src/file_store.rs

@@ -153,8 +153,8 @@ impl FileStore {
                             None
                         }
                     })
-                    .filter(move |info| after.map_or(true, |v| info.timestamp > v))
-                    .filter(move |info| before.map_or(true, |v| info.timestamp <= v))
+                    .filter(move |info| after.is_none_or(|v| info.timestamp > v))
+                    .filter(move |info| before.is_none_or(|v| info.timestamp <= v))
                     .map(Ok);
                 stream::iter(filtered).boxed()
             }

iot_verifier/src/gateway_updater.rs

@@ -36,7 +36,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

iot_verifier/src/runner.rs

@@ -89,7 +89,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

iot_verifier/src/witness_updater.rs

@@ -61,7 +61,7 @@ impl ManagedTask for WitnessUpdaterServer {
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_config/src/mobile_radio_tracker.rs

@@ -116,7 +116,7 @@ impl ManagedTask for MobileRadioTracker {
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/boosting_oracles/data_sets.rs

@@ -267,7 +267,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/coverage.rs

@@ -195,7 +195,7 @@ impl ManagedTask for CoverageDaemon {
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/data_session.rs

@@ -124,7 +124,7 @@ impl ManagedTask for DataSessionIngestor {
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/heartbeats/cbrs.rs

@@ -198,7 +198,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/heartbeats/wifi.rs

@@ -189,7 +189,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/radio_threshold.rs

@@ -53,7 +53,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/rewarder.rs

@@ -394,7 +394,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/sp_boosted_rewards_bans.rs

@@ -140,7 +140,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/speedtests.rs

@@ -223,7 +223,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/subscriber_location.rs

@@ -208,7 +208,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }

mobile_verifier/src/unique_connections/ingestor.rs

@@ -46,7 +46,7 @@ where
         Box::pin(
             handle
                 .map_err(anyhow::Error::from)
-                .and_then(|result| async move { result.map_err(anyhow::Error::from) }),
+                .and_then(|result| async move { result }),
         )
     }
 }