From 20c76b715267e8d8e2a96a5a2853e0e705baf7d6 Mon Sep 17 00:00:00 2001
From: "Heinz N. Gies" <heinz@licenser.net>
Date: Sat, 5 Aug 2023 17:23:05 +0200
Subject: [PATCH] Rust 1.71.1 update

Signed-off-by: Heinz N. Gies <heinz@licenser.net>
---
 Dockerfile                               | 2 +-
 Dockerfile.learn                         | 2 +-
 Dockerfile.native                        | 2 +-
 rust-toolchain                           | 2 +-
 src/codec/json.rs                        | 2 +-
 src/connectors/impls/gpubsub/consumer.rs | 2 +-
 src/connectors/impls/gpubsub/producer.rs | 2 +-
 src/connectors/sink/channel_sink.rs      | 2 +-
 src/connectors/utils/url.rs              | 4 ++--
 tremor-common/src/ids.rs                 | 2 +-
 tremor-script/src/ast/deploy/raw.rs      | 2 +-
 tremor-script/src/ast/raw.rs             | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1e46a79d41..04fd729864 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.70-bullseye as builder
+FROM rust:1.71-bullseye as builder
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/Dockerfile.learn b/Dockerfile.learn
index 60e2449bda..c96a6e7e50 100644
--- a/Dockerfile.learn
+++ b/Dockerfile.learn
@@ -1,4 +1,4 @@
-FROM rust:1.70-bullseye as builder
+FROM rust:1.71-bullseye as builder
 
 RUN cargo install --features=ssl websocat
 
diff --git a/Dockerfile.native b/Dockerfile.native
index e0018b0d0f..b06404880f 100644
--- a/Dockerfile.native
+++ b/Dockerfile.native
@@ -1,4 +1,4 @@
-FROM rust:1.70-bullseye as builder
+FROM rust:1.71-bullseye as builder
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/rust-toolchain b/rust-toolchain
index 832e9afb6c..68bc7ff2a8 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.70.0
+1.71.1
diff --git a/src/codec/json.rs b/src/codec/json.rs
index 82b6721f35..140d84e57d 100644
--- a/src/codec/json.rs
+++ b/src/codec/json.rs
@@ -62,7 +62,7 @@ impl<S: Sorting> Clone for Json<S> {
 impl<S: Sorting> Default for Json<S> {
     fn default() -> Self {
         Self {
-            _phantom: PhantomData::default(),
+            _phantom: PhantomData,
             input_buffer: AlignedBuf::with_capacity(1024),
             string_buffer: vec![0u8; 1024],
             data_buf: Vec::new(),
diff --git a/src/connectors/impls/gpubsub/consumer.rs b/src/connectors/impls/gpubsub/consumer.rs
index 9d94d4662b..9ce11f6a0d 100644
--- a/src/connectors/impls/gpubsub/consumer.rs
+++ b/src/connectors/impls/gpubsub/consumer.rs
@@ -108,7 +108,7 @@ impl ConnectorBuilder for Builder {
             config,
             url,
             client_id,
-            _phantom: PhantomData::default(),
+            _phantom: PhantomData,
         }))
     }
 }
diff --git a/src/connectors/impls/gpubsub/producer.rs b/src/connectors/impls/gpubsub/producer.rs
index 6764e0c1a7..9dfc123903 100644
--- a/src/connectors/impls/gpubsub/producer.rs
+++ b/src/connectors/impls/gpubsub/producer.rs
@@ -79,7 +79,7 @@ impl ConnectorBuilder for Builder {
 
         Ok(Box::new(GpubConnectorWithTokenProvider {
             config,
-            _phantom: PhantomData::default(),
+            _phantom: PhantomData,
         }))
     }
 }
diff --git a/src/connectors/sink/channel_sink.rs b/src/connectors/sink/channel_sink.rs
index aee4bb3000..1995908ad5 100644
--- a/src/connectors/sink/channel_sink.rs
+++ b/src/connectors/sink/channel_sink.rs
@@ -168,7 +168,7 @@ where
             tx,
             rx,
             reply_tx,
-            _b: PhantomData::default(),
+            _b: PhantomData,
             sink_is_connected,
         }
     }
diff --git a/src/connectors/utils/url.rs b/src/connectors/utils/url.rs
index 2739bac851..2869e2b108 100644
--- a/src/connectors/utils/url.rs
+++ b/src/connectors/utils/url.rs
@@ -103,7 +103,7 @@ impl<D: Defaults> Clone for Url<D> {
     fn clone(&self) -> Self {
         Self {
             url: self.url.clone(),
-            _marker: PhantomData::default(),
+            _marker: PhantomData,
         }
     }
 }
@@ -126,7 +126,7 @@ impl<D: Defaults> Default for Url<D> {
             url: url::Url::parse(&format!("{}://{}:{}", D::SCHEME, D::HOST, D::PORT))
                 // ALLOW: this is a known safe url
                 .expect("DEFAULT URL INVALID"),
-            _marker: PhantomData::default(),
+            _marker: PhantomData,
         }
     }
 }
diff --git a/tremor-common/src/ids.rs b/tremor-common/src/ids.rs
index 75b510b663..3fe3fb8b6f 100644
--- a/tremor-common/src/ids.rs
+++ b/tremor-common/src/ids.rs
@@ -198,7 +198,7 @@ impl<T: Id> IdGen<T> {
     pub fn new() -> Self {
         Self {
             current: 0,
-            _marker: PhantomData::default(),
+            _marker: PhantomData,
         }
     }
     /// return the next id for this generator
diff --git a/tremor-script/src/ast/deploy/raw.rs b/tremor-script/src/ast/deploy/raw.rs
index f7611109eb..a63ff1f986 100644
--- a/tremor-script/src/ast/deploy/raw.rs
+++ b/tremor-script/src/ast/deploy/raw.rs
@@ -73,7 +73,7 @@ pub struct DeployRaw<'script> {
 impl<'script> DeployRaw<'script> {
     pub(crate) fn up_script<'registry>(
         self,
-        mut helper: &mut Helper<'script, 'registry>,
+        helper: &mut Helper<'script, 'registry>,
     ) -> Result<Deploy<'script>> {
         let mut stmts: Vec<DeployStmt<'script>> = vec![];
         for (_i, stmt) in self.stmts.into_iter().enumerate() {
diff --git a/tremor-script/src/ast/raw.rs b/tremor-script/src/ast/raw.rs
index ad21bf87a4..06e69fa9fa 100644
--- a/tremor-script/src/ast/raw.rs
+++ b/tremor-script/src/ast/raw.rs
@@ -78,7 +78,7 @@ impl<'script> ScriptRaw<'script> {
     #[allow(clippy::too_many_lines)]
     pub(crate) fn up_script<'registry>(
         self,
-        mut helper: &mut Helper<'script, 'registry>,
+        helper: &mut Helper<'script, 'registry>,
     ) -> Result<Script<'script>> {
         helper.enter_scope();
         let mut exprs = vec![];