Skip to content

Commit 19a5884

Browse files
authored
chore(deps): Upgrade rust to 1.70.0 (#17585)
1 parent 00dae5a commit 19a5884

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

Tiltfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo')
77
docker_build(
88
ref='timberio/vector',
99
context='.',
10-
build_args={'RUST_VERSION': '1.69.0'},
10+
build_args={'RUST_VERSION': '1.70.0'},
1111
dockerfile='tilt/Dockerfile'
1212
)
1313

lib/vector-buffers/src/variants/disk_v2/tests/model/sequencer.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ impl<T> TrackedFuture<T> {
2525
where
2626
F: Future<Output = T> + Send + 'static,
2727
{
28-
let wrapped = async move { fut.await };
29-
3028
Self {
3129
polled_once: false,
32-
fut: spawn(wrapped.boxed()),
30+
fut: spawn(fut.boxed()),
3331
}
3432
}
3533

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.69.0"
2+
channel = "1.70.0"
33
profile = "default"

src/sinks/util/service.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ impl TowerRequestSettings {
357357
S::Future: Send + 'static,
358358
{
359359
let policy = self.retry_policy(retry_logic.clone());
360-
let settings = self.clone();
361360

362361
// Build services
363362
let open = OpenGauge::new();
@@ -368,16 +367,14 @@ impl TowerRequestSettings {
368367
// Build individual service
369368
ServiceBuilder::new()
370369
.layer(AdaptiveConcurrencyLimitLayer::new(
371-
settings.concurrency,
372-
settings.adaptive_concurrency,
370+
self.concurrency,
371+
self.adaptive_concurrency,
373372
retry_logic.clone(),
374373
))
375374
.service(
376375
health_config.build(
377376
health_logic.clone(),
378-
ServiceBuilder::new()
379-
.timeout(settings.timeout)
380-
.service(inner),
377+
ServiceBuilder::new().timeout(self.timeout).service(inner),
381378
open.clone(),
382379
endpoint,
383380
), // NOTE: there is a version conflict for crate `tracing` between `tracing_tower` crate

0 commit comments

Comments
 (0)