diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e327198..fe6ab78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ env: RUSTFLAGS: -Dwarnings RUSTDOCFLAGS: -Dwarnings RUST_BACKTRACE: 1 - MSRV: 1.70.0 + MSRV: 1.73.0 jobs: build: @@ -77,7 +77,7 @@ jobs: services: clickhouse: - image: clickhouse/clickhouse-server + image: clickhouse/clickhouse-server:24.10-alpine ports: - 8123:8123 diff --git a/Cargo.toml b/Cargo.toml index b1d23fd..58867a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" readme = "README.md" edition = "2021" # update `derive/Cargo.toml` and CI if changed -rust-version = "1.70.0" +rust-version = "1.73.0" [lints.rust] rust_2018_idioms = { level = "warn", priority = -1 } @@ -93,7 +93,7 @@ hyper = "1.4" hyper-util = { version = "0.1.6", features = ["client-legacy", "http1"] } hyper-tls = { version = "0.6.0", optional = true } rustls = { version = "0.23", default-features = false, optional = true } -hyper-rustls = { version = "0.27.2", default-features = false, features = [ +hyper-rustls = { version = "0.27.3", default-features = false, features = [ "http1", "tls12", ], optional = true } @@ -110,7 +110,7 @@ lz4_flex = { version = "0.11.3", default-features = false, features = [ cityhash-rs = { version = "=1.0.1", optional = true } # exact version for safety uuid = { version = "1", optional = true } time = { version = "0.3", optional = true } -bstr = { version = "1.2", default-features = false } +bstr = { version = "1.11.0", default-features = false } quanta = { version = "0.12", optional = true } replace_with = { version = "0.1.7" } diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 2d2e4e3..56cb322 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://clickhouse.com" edition = "2021" license = "MIT OR Apache-2.0" # update `Cargo.toml` and CI if changed -rust-version = "1.70.0" +rust-version = "1.73.0" [lib] proc-macro = true diff --git a/src/rowbinary/de.rs b/src/rowbinary/de.rs index d911ded..7e27eea 100644 --- a/src/rowbinary/de.rs +++ b/src/rowbinary/de.rs @@ -25,7 +25,7 @@ struct RowBinaryDeserializer<'cursor, 'data> { input: &'cursor mut &'data [u8], } -impl<'cursor, 'data> RowBinaryDeserializer<'cursor, 'data> { +impl<'data> RowBinaryDeserializer<'_, 'data> { fn read_vec(&mut self, size: usize) -> Result> { Ok(self.read_slice(size)?.to_vec()) } @@ -64,7 +64,7 @@ macro_rules! impl_num { }; } -impl<'cursor, 'data> Deserializer<'data> for &mut RowBinaryDeserializer<'cursor, 'data> { +impl<'data> Deserializer<'data> for &mut RowBinaryDeserializer<'_, 'data> { type Error = Error; impl_num!(i8, deserialize_i8, visit_i8, get_i8); @@ -222,7 +222,7 @@ impl<'cursor, 'data> Deserializer<'data> for &mut RowBinaryDeserializer<'cursor, len: usize, } - impl<'de, 'cursor, 'data> SeqAccess<'data> for Access<'de, 'cursor, 'data> { + impl<'data> SeqAccess<'data> for Access<'_, '_, 'data> { type Error = Error; fn next_element_seed(&mut self, seed: T) -> Result> diff --git a/src/rowbinary/ser.rs b/src/rowbinary/ser.rs index 4fc604d..68fec88 100644 --- a/src/rowbinary/ser.rs +++ b/src/rowbinary/ser.rs @@ -30,7 +30,7 @@ macro_rules! impl_num { }; } -impl<'a, B: BufMut> Serializer for &'a mut RowBinarySerializer { +impl Serializer for &'_ mut RowBinarySerializer { type Error = Error; type Ok = (); type SerializeMap = Impossible<(), Error>; @@ -215,7 +215,7 @@ impl<'a, B: BufMut> Serializer for &'a mut RowBinarySerializer { } } -impl<'a, B: BufMut> SerializeStruct for &'a mut RowBinarySerializer { +impl SerializeStruct for &mut RowBinarySerializer { type Error = Error; type Ok = (); @@ -230,7 +230,7 @@ impl<'a, B: BufMut> SerializeStruct for &'a mut RowBinarySerializer { } } -impl<'a, B: BufMut> SerializeSeq for &'a mut RowBinarySerializer { +impl SerializeSeq for &'_ mut RowBinarySerializer { type Error = Error; type Ok = (); @@ -243,7 +243,7 @@ impl<'a, B: BufMut> SerializeSeq for &'a mut RowBinarySerializer { } } -impl<'a, B: BufMut> SerializeTuple for &'a mut RowBinarySerializer { +impl SerializeTuple for &'_ mut RowBinarySerializer { type Error = Error; type Ok = (); diff --git a/src/sql/bind.rs b/src/sql/bind.rs index c4885b0..1b98b35 100644 --- a/src/sql/bind.rs +++ b/src/sql/bind.rs @@ -24,7 +24,7 @@ impl Bind for S { pub struct Identifier<'a>(pub &'a str); #[sealed] -impl<'a> Bind for Identifier<'a> { +impl Bind for Identifier<'_> { #[inline] fn write(&self, dst: &mut impl fmt::Write) -> Result<(), String> { escape::identifier(self.0, dst).map_err(|err| err.to_string()) diff --git a/src/sql/ser.rs b/src/sql/ser.rs index 6cbdb22..f9ca310 100644 --- a/src/sql/ser.rs +++ b/src/sql/ser.rs @@ -226,7 +226,7 @@ struct SqlListSerializer<'a, W> { closing_char: char, } -impl<'a, W: Write> SerializeSeq for SqlListSerializer<'a, W> { +impl SerializeSeq for SqlListSerializer<'_, W> { type Error = SerializerError; type Ok = (); @@ -253,7 +253,7 @@ impl<'a, W: Write> SerializeSeq for SqlListSerializer<'a, W> { } } -impl<'a, W: Write> SerializeTuple for SqlListSerializer<'a, W> { +impl SerializeTuple for SqlListSerializer<'_, W> { type Error = SerializerError; type Ok = ();