Prepare to migrate to edition 2024 (#42320)

GitOrigin-RevId: 61fb1187dfaf07ae6811a66187c5154d1696c82a

Author: goffrie

crates/application/src/application_function_runner/mod.rs

@@ -1838,7 +1838,7 @@ impl<RT: Runtime> ApplicationFunctionRunner<RT> {
         tx: &mut Transaction<RT>,
         mutation_identifier: &Option<SessionRequestIdentifier>,
     ) -> anyhow::Result<Option<Result<MutationReturn, MutationError>>> {
-        let Some(ref identifier) = mutation_identifier else {
+        let Some(identifier) = mutation_identifier else {
             return Ok(None);
         };
         let mutation_status = SessionRequestModel::new(tx)
@@ -1870,7 +1870,7 @@ impl<RT: Runtime> ApplicationFunctionRunner<RT> {
         mutation_identifier: &Option<SessionRequestIdentifier>,
         outcome: &ValidatedUdfOutcome,
     ) -> anyhow::Result<()> {
-        let Some(ref identifier) = mutation_identifier else {
+        let Some(identifier) = mutation_identifier else {
             return Ok(());
         };
         if let Ok(ref value) = outcome.result {

crates/application/src/cache/mod.rs

@@ -273,7 +273,7 @@ impl CacheEntry {
     fn size(&self) -> usize {
         mem::size_of::<Self>()
             + match self {
-                CacheEntry::Ready(ref result) => result.heap_size(),
+                CacheEntry::Ready(result) => result.heap_size(),
                 // This is an under count since there might be something in the receiver.
                 // However, this is kind of hard to measure, and we expect this to
                 // be the exception, not the rule.
@@ -603,7 +603,7 @@ impl<RT: Runtime> CacheManager<RT> {
                         let FunctionOutcome::Query(mut query_outcome) = outcome else {
                             anyhow::bail!("Received non-query outcome when executing a query")
                         };
-                        if let Ok(ref json_packed_value) = &query_outcome.result {
+                        if let Ok(json_packed_value) = &query_outcome.result {
                             let output: ConvexValue = json_packed_value.unpack();
                             let table_mapping = tx.table_mapping().namespace(component.into());
                             let virtual_system_mapping = tx.virtual_system_mapping();
@@ -892,7 +892,7 @@ impl Inner {
     // `original_ts` matching.
     fn remove_ready(&mut self, key: &StoredCacheKey, original_ts: Timestamp) {
         match self.cache.get(key) {
-            Some(CacheEntry::Ready(ref result)) if result.original_ts == original_ts => {
+            Some(CacheEntry::Ready(result)) if result.original_ts == original_ts => {
                 let (actual_key, entry) = self.cache.pop_entry(key).unwrap();
                 self.size -= actual_key.size() + entry.size();
             },
@@ -943,7 +943,7 @@ impl Inner {
                 self.size += new_entry.size();
                 *entry = new_entry;
             },
-            Some(CacheEntry::Ready(ref mut existing_result)) => {
+            Some(CacheEntry::Ready(existing_result)) => {
                 if existing_result.original_ts < result.original_ts
                     || (existing_result.original_ts == result.original_ts
                         && existing_result.token.ts() < result.token.ts())

crates/application/src/function_log.rs

@@ -419,8 +419,8 @@ impl HeapSize for UdfParams {
 impl UdfParams {
     pub fn is_err(&self) -> bool {
         match self {
-            UdfParams::Function { ref error, .. } => error.is_some(),
-            UdfParams::Http { ref result, .. } => result.is_err(),
+            UdfParams::Function { error, .. } => error.is_some(),
+            UdfParams::Http { result, .. } => result.is_err(),
         }
     }
 

crates/application/src/redaction.rs

@@ -308,7 +308,7 @@ pub mod tests {
         }
         let json = serde_json::from_slice(&body_bytes).unwrap();
         must_let!(let JsonValue::Object(map) = json);
-        must_let!(let JsonValue::String(ref code) = map.get("code").unwrap());
+        must_let!(let JsonValue::String(code) = map.get("code").unwrap());
         code.clone()
     }
 }

crates/application/src/snapshot_import/mod.rs

@@ -1551,7 +1551,7 @@ fn remove_empty_string_optional_entries(
         if !optional_fields.contains(&identifier_field_name) {
             return true;
         }
-        let JsonValue::String(ref s) = value else {
+        let &mut JsonValue::String(ref s) = value else {
             return true;
         };
         !s.is_empty()

crates/application/src/tests/scheduled_jobs.rs

@@ -1,7 +1,4 @@
-use std::{
-    str::FromStr,
-    time::Duration,
-};
+use std::str::FromStr;
 
 use common::{
     components::{
@@ -11,6 +8,7 @@ use common::{
         PublicFunctionPath,
     },
     execution_context::ExecutionContext,
+    knobs::SCHEDULED_JOB_RETENTION,
     pause::{
         HoldGuard,
         PauseController,
@@ -187,7 +185,6 @@ async fn test_scheduled_jobs_garbage_collection(
     rt: TestRuntime,
     pause_controller: PauseController,
 ) -> anyhow::Result<()> {
-    std::env::set_var("SCHEDULED_JOB_RETENTION", "30");
     let application = Application::new_for_tests(&rt).await?;
     application.load_udf_tests_modules().await?;
 
@@ -216,7 +213,7 @@ async fn test_scheduled_jobs_garbage_collection(
     );
 
     // Wait for garbage collector to clean up the job
-    rt.wait(Duration::from_secs(60)).await;
+    rt.wait(*SCHEDULED_JOB_RETENTION * 2).await;
     tx = application.begin(Identity::system()).await?;
     let state = SchedulerModel::new(&mut tx, TableNamespace::test_user())
         .check_status(job_id)

crates/authentication/src/lib.rs

@@ -1,3 +1,5 @@
+#![feature(never_type)]
+
 use std::{
     str::FromStr,
     time::SystemTime,
@@ -771,7 +773,6 @@ where
 #[cfg(test)]
 mod tests {
     use std::{
-        convert::Infallible,
         pin::Pin,
         time::SystemTime,
     };
@@ -834,8 +835,7 @@ mod tests {
     fn fake_http_client(
         metadata: String,
         jwks: String,
-    ) -> impl Fn(HttpRequest) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Infallible>>>>
-    {
+    ) -> impl Fn(HttpRequest) -> Pin<Box<dyn Future<Output = Result<HttpResponse, !>>>> {
         move |request: HttpRequest| {
             let metadata_ = metadata.clone();
             let jwks_ = jwks.clone();
@@ -861,7 +861,7 @@ mod tests {
     fn fake_workos_http_client(
         client_id: &str,
         jwks: String,
-    ) -> impl Fn(HttpRequest) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Infallible>>>>
+    ) -> impl Fn(HttpRequest) -> Pin<Box<dyn Future<Output = Result<HttpResponse, !>>>> + use<>
     {
         let client_id = client_id.to_string();
         move |request: HttpRequest| {

crates/aws_s3/src/storage.rs

@@ -684,7 +684,7 @@ impl<RT: Runtime> Upload for S3Upload<RT> {
 }
 
 impl<RT: Runtime> S3Upload<RT> {
-    fn _abort(&mut self) -> impl Future<Output = anyhow::Result<()>> {
+    fn _abort(&mut self) -> impl Future<Output = anyhow::Result<()>> + use<RT> {
         let client = self.client.clone();
         let bucket = self.bucket.clone();
         let upload_id = self.upload_id.to_string();

crates/aws_utils/src/s3.rs

@@ -57,7 +57,7 @@ impl S3Client {
         &self,
         bucket: String,
         delimiter: String,
-    ) -> impl Stream<Item = anyhow::Result<String>> + Send + Unpin {
+    ) -> impl Stream<Item = anyhow::Result<String>> + Send + Unpin + use<> {
         let stream = self
             .0
             .list_objects_v2()
@@ -82,7 +82,7 @@ impl S3Client {
         &self,
         bucket: String,
         prefix: Option<String>,
-    ) -> impl Stream<Item = anyhow::Result<Object>> + Send + Unpin {
+    ) -> impl Stream<Item = anyhow::Result<Object>> + Send + Unpin + use<> {
         let stream = self
             .0
             .list_objects_v2()

crates/common/src/fastrace_helpers/mod.rs

@@ -299,7 +299,7 @@ impl<T: Future> Future for TraceIfPending<T> {
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
         let _guard;
-        if let TraceIfPendingState::Tracing(ref span) = this.state {
+        if let &mut TraceIfPendingState::Tracing(ref span) = this.state {
             _guard = span.set_local_parent();
         }
         let result = this.future.poll(cx);