Skip to content

Commit d62c91e

Browse files
committed
Merge remote-tracking branch 'origin/main' into always-use-post
2 parents f6b08e3 + f3771b0 commit d62c91e

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
RUSTFLAGS: -Dwarnings
1212
RUSTDOCFLAGS: -Dwarnings
1313
RUST_BACKTRACE: 1
14-
MSRV: 1.70.0
14+
MSRV: 1.73.0
1515

1616
jobs:
1717
build:
@@ -77,7 +77,7 @@ jobs:
7777

7878
services:
7979
clickhouse:
80-
image: clickhouse/clickhouse-server
80+
image: clickhouse/clickhouse-server:24.10-alpine
8181
ports:
8282
- 8123:8123
8383

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
1010
readme = "README.md"
1111
edition = "2021"
1212
# update `derive/Cargo.toml` and CI if changed
13-
rust-version = "1.70.0"
13+
rust-version = "1.73.0"
1414

1515
[lints.rust]
1616
rust_2018_idioms = { level = "warn", priority = -1 }
@@ -93,7 +93,7 @@ hyper = "1.4"
9393
hyper-util = { version = "0.1.6", features = ["client-legacy", "http1"] }
9494
hyper-tls = { version = "0.6.0", optional = true }
9595
rustls = { version = "0.23", default-features = false, optional = true }
96-
hyper-rustls = { version = "0.27.2", default-features = false, features = [
96+
hyper-rustls = { version = "0.27.3", default-features = false, features = [
9797
"http1",
9898
"tls12",
9999
], optional = true }
@@ -110,7 +110,7 @@ lz4_flex = { version = "0.11.3", default-features = false, features = [
110110
cityhash-rs = { version = "=1.0.1", optional = true } # exact version for safety
111111
uuid = { version = "1", optional = true }
112112
time = { version = "0.3", optional = true }
113-
bstr = { version = "1.2", default-features = false }
113+
bstr = { version = "1.11.0", default-features = false }
114114
quanta = { version = "0.12", optional = true }
115115
replace_with = { version = "0.1.7" }
116116

derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ homepage = "https://clickhouse.com"
88
edition = "2021"
99
license = "MIT OR Apache-2.0"
1010
# update `Cargo.toml` and CI if changed
11-
rust-version = "1.70.0"
11+
rust-version = "1.73.0"
1212

1313
[lib]
1414
proc-macro = true

src/rowbinary/de.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct RowBinaryDeserializer<'cursor, 'data> {
2525
input: &'cursor mut &'data [u8],
2626
}
2727

28-
impl<'cursor, 'data> RowBinaryDeserializer<'cursor, 'data> {
28+
impl<'data> RowBinaryDeserializer<'_, 'data> {
2929
fn read_vec(&mut self, size: usize) -> Result<Vec<u8>> {
3030
Ok(self.read_slice(size)?.to_vec())
3131
}
@@ -64,7 +64,7 @@ macro_rules! impl_num {
6464
};
6565
}
6666

67-
impl<'cursor, 'data> Deserializer<'data> for &mut RowBinaryDeserializer<'cursor, 'data> {
67+
impl<'data> Deserializer<'data> for &mut RowBinaryDeserializer<'_, 'data> {
6868
type Error = Error;
6969

7070
impl_num!(i8, deserialize_i8, visit_i8, get_i8);
@@ -222,7 +222,7 @@ impl<'cursor, 'data> Deserializer<'data> for &mut RowBinaryDeserializer<'cursor,
222222
len: usize,
223223
}
224224

225-
impl<'de, 'cursor, 'data> SeqAccess<'data> for Access<'de, 'cursor, 'data> {
225+
impl<'data> SeqAccess<'data> for Access<'_, '_, 'data> {
226226
type Error = Error;
227227

228228
fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>

src/rowbinary/ser.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ macro_rules! impl_num {
3030
};
3131
}
3232

33-
impl<'a, B: BufMut> Serializer for &'a mut RowBinarySerializer<B> {
33+
impl<B: BufMut> Serializer for &'_ mut RowBinarySerializer<B> {
3434
type Error = Error;
3535
type Ok = ();
3636
type SerializeMap = Impossible<(), Error>;
@@ -215,7 +215,7 @@ impl<'a, B: BufMut> Serializer for &'a mut RowBinarySerializer<B> {
215215
}
216216
}
217217

218-
impl<'a, B: BufMut> SerializeStruct for &'a mut RowBinarySerializer<B> {
218+
impl<B: BufMut> SerializeStruct for &mut RowBinarySerializer<B> {
219219
type Error = Error;
220220
type Ok = ();
221221

@@ -230,7 +230,7 @@ impl<'a, B: BufMut> SerializeStruct for &'a mut RowBinarySerializer<B> {
230230
}
231231
}
232232

233-
impl<'a, B: BufMut> SerializeSeq for &'a mut RowBinarySerializer<B> {
233+
impl<B: BufMut> SerializeSeq for &'_ mut RowBinarySerializer<B> {
234234
type Error = Error;
235235
type Ok = ();
236236

@@ -243,7 +243,7 @@ impl<'a, B: BufMut> SerializeSeq for &'a mut RowBinarySerializer<B> {
243243
}
244244
}
245245

246-
impl<'a, B: BufMut> SerializeTuple for &'a mut RowBinarySerializer<B> {
246+
impl<B: BufMut> SerializeTuple for &'_ mut RowBinarySerializer<B> {
247247
type Error = Error;
248248
type Ok = ();
249249

src/sql/bind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl<S: Serialize> Bind for S {
2424
pub struct Identifier<'a>(pub &'a str);
2525

2626
#[sealed]
27-
impl<'a> Bind for Identifier<'a> {
27+
impl Bind for Identifier<'_> {
2828
#[inline]
2929
fn write(&self, dst: &mut impl fmt::Write) -> Result<(), String> {
3030
escape::identifier(self.0, dst).map_err(|err| err.to_string())

src/sql/ser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ struct SqlListSerializer<'a, W> {
226226
closing_char: char,
227227
}
228228

229-
impl<'a, W: Write> SerializeSeq for SqlListSerializer<'a, W> {
229+
impl<W: Write> SerializeSeq for SqlListSerializer<'_, W> {
230230
type Error = SerializerError;
231231
type Ok = ();
232232

@@ -253,7 +253,7 @@ impl<'a, W: Write> SerializeSeq for SqlListSerializer<'a, W> {
253253
}
254254
}
255255

256-
impl<'a, W: Write> SerializeTuple for SqlListSerializer<'a, W> {
256+
impl<W: Write> SerializeTuple for SqlListSerializer<'_, W> {
257257
type Error = SerializerError;
258258
type Ok = ();
259259

0 commit comments

Comments
 (0)