diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/influxdb3_server/src/http.rs b/influxdb3_server/src/http.rs index ef3562002d..107dcc0747 100644 --- a/influxdb3_server/src/http.rs +++ b/influxdb3_server/src/http.rs @@ -890,8 +890,6 @@ pub(crate) async fn route_request, ) -> Result, Infallible> where - W: WriteBuffer, - Q: QueryExecutor, Error: From<::Error>, { if let Err(e) = http_server.authorize_request(&mut req).await { diff --git a/influxdb3_server/src/http/v1.rs b/influxdb3_server/src/http/v1.rs index c6c13d69a6..d9cb00ea98 100644 --- a/influxdb3_server/src/http/v1.rs +++ b/influxdb3_server/src/http/v1.rs @@ -378,7 +378,7 @@ impl QueryResponseStream { let mut columns = vec!["".to_string(); self.column_map.len()]; self.column_map .iter() - .for_each(|(k, i)| columns[*i] = k.to_owned()); + .for_each(|(k, i)| k.clone_into(&mut columns[*i])); columns } diff --git a/influxdb3_write/src/catalog.rs b/influxdb3_write/src/catalog.rs index 594c7f69be..b70953f12f 100644 --- a/influxdb3_write/src/catalog.rs +++ b/influxdb3_write/src/catalog.rs @@ -186,7 +186,7 @@ impl InnerCatalog { #[cfg(test)] pub fn db_exists(&self, db_name: &str) -> bool { - self.databases.get(db_name).is_some() + self.databases.contains_key(db_name) } } diff --git a/influxdb3_write/src/paths.rs b/influxdb3_write/src/paths.rs index b883f2ff60..4e6a1f0a9e 100644 --- a/influxdb3_write/src/paths.rs +++ b/influxdb3_write/src/paths.rs @@ -1,6 +1,7 @@ use crate::SegmentId; use chrono::prelude::*; use object_store::path::Path as ObjPath; +use std::fmt; use std::ops::Deref; use std::path::Path; use std::path::PathBuf; @@ -109,9 +110,9 @@ impl SegmentWalFilePath { } } -impl ToString for SegmentWalFilePath { - fn to_string(&self) -> String { - self.0.to_string_lossy().into_owned() +impl fmt::Display for SegmentWalFilePath { + fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { + write!(f, "{}", self.0.to_string_lossy()) } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 7aac9b8f1b..1ec3ae9268 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.77.0" +channel = "1.78.0" components = ["rustfmt", "clippy", "rust-analyzer"]