chore(deps): Upgrade rust to 1.70.0 (vectordotdev#17585)

aholmberg · Jun 7, 2023 · 6c48565 · 6c48565
1 parent c55c9ec
commit 6c48565
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/Tiltfile b/Tiltfile
@@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo')
 docker_build(
     ref='timberio/vector',
     context='.',
-    build_args={'RUST_VERSION': '1.69.0'},
+    build_args={'RUST_VERSION': '1.70.0'},
     dockerfile='tilt/Dockerfile'
     )
 

diff --git a/lib/vector-buffers/src/variants/disk_v2/tests/model/sequencer.rs b/lib/vector-buffers/src/variants/disk_v2/tests/model/sequencer.rs
@@ -25,11 +25,9 @@ impl<T> TrackedFuture<T> {
     where
         F: Future<Output = T> + Send + 'static,
     {
-        let wrapped = async move { fut.await };
-
         Self {
             polled_once: false,
-            fut: spawn(wrapped.boxed()),
+            fut: spawn(fut.boxed()),
         }
     }
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.69.0"
+channel = "1.70.0"
 profile = "default"
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
@@ -357,7 +357,6 @@ impl TowerRequestSettings {
         S::Future: Send + 'static,
     {
         let policy = self.retry_policy(retry_logic.clone());
-        let settings = self.clone();
 
         // Build services
         let open = OpenGauge::new();
@@ -368,16 +367,14 @@ impl TowerRequestSettings {
                 // Build individual service
                 ServiceBuilder::new()
                     .layer(AdaptiveConcurrencyLimitLayer::new(
-                        settings.concurrency,
-                        settings.adaptive_concurrency,
+                        self.concurrency,
+                        self.adaptive_concurrency,
                         retry_logic.clone(),
                     ))
                     .service(
                         health_config.build(
                             health_logic.clone(),
-                            ServiceBuilder::new()
-                                .timeout(settings.timeout)
-                                .service(inner),
+                            ServiceBuilder::new().timeout(self.timeout).service(inner),
                             open.clone(),
                             endpoint,
                         ), // NOTE: there is a version conflict for crate `tracing` between `tracing_tower` crate