Skip to content

Commit

Permalink
Rust 1.71.1 update
Browse files Browse the repository at this point in the history
Signed-off-by: Heinz N. Gies <heinz@licenser.net>
  • Loading branch information
Licenser committed Aug 5, 2023
1 parent 48ba0e2 commit 20c76b7
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.learn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.70-bullseye as builder
FROM rust:1.71-bullseye as builder

RUN cargo install --features=ssl websocat

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.native
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.70.0
1.71.1
2 changes: 1 addition & 1 deletion src/codec/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/impls/gpubsub/consumer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl ConnectorBuilder for Builder {
config,
url,
client_id,
_phantom: PhantomData::default(),
_phantom: PhantomData,
}))
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/impls/gpubsub/producer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl ConnectorBuilder for Builder {

Ok(Box::new(GpubConnectorWithTokenProvider {
config,
_phantom: PhantomData::default(),
_phantom: PhantomData,
}))
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/sink/channel_sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ where
tx,
rx,
reply_tx,
_b: PhantomData::default(),
_b: PhantomData,
sink_is_connected,
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/connectors/utils/url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}
}
Expand All @@ -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,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tremor-common/src/ids.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tremor-script/src/ast/deploy/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tremor-script/src/ast/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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![];
Expand Down

0 comments on commit 20c76b7

Please sign in to comment.