Skip to content

Commit 1c798cf

Browse files
committed
fix: Fix remaining format string warnings in CLI crate
- Fix 12 clippy::uninlined_format_args warnings in datafusion-postgres-cli - Update all format! macros to use modern inline variable syntax - Includes table registration error messages and println statements - Now passes clippy --workspace --all-targets --all-features -- -D warnings
1 parent f447346 commit 1c798cf

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

datafusion-postgres-cli/src/main.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl Opt {
111111
}
112112
}
113113
Err(e) => {
114-
return Err(format!("Failed to load directory {}: {}", directory, e).into());
114+
return Err(format!("Failed to load directory {directory}: {e}").into());
115115
}
116116
}
117117
}
@@ -128,17 +128,17 @@ async fn setup_session_context(
128128
session_context
129129
.register_csv(table_name, table_path, CsvReadOptions::default())
130130
.await
131-
.map_err(|e| format!("Failed to register CSV table '{}': {}", table_name, e))?;
132-
println!("Loaded {} as table {}", table_path, table_name);
131+
.map_err(|e| format!("Failed to register CSV table '{table_name}': {e}"))?;
132+
println!("Loaded {table_path} as table {table_name}");
133133
}
134134

135135
// Register JSON tables
136136
for (table_name, table_path) in opts.json_tables.iter().map(|s| parse_table_def(s.as_ref())) {
137137
session_context
138138
.register_json(table_name, table_path, NdJsonReadOptions::default())
139139
.await
140-
.map_err(|e| format!("Failed to register JSON table '{}': {}", table_name, e))?;
141-
println!("Loaded {} as table {}", table_path, table_name);
140+
.map_err(|e| format!("Failed to register JSON table '{table_name}': {e}"))?;
141+
println!("Loaded {table_path} as table {table_name}");
142142
}
143143

144144
// Register Arrow tables
@@ -150,8 +150,8 @@ async fn setup_session_context(
150150
session_context
151151
.register_arrow(table_name, table_path, ArrowReadOptions::default())
152152
.await
153-
.map_err(|e| format!("Failed to register Arrow table '{}': {}", table_name, e))?;
154-
println!("Loaded {} as table {}", table_path, table_name);
153+
.map_err(|e| format!("Failed to register Arrow table '{table_name}': {e}"))?;
154+
println!("Loaded {table_path} as table {table_name}");
155155
}
156156

157157
// Register Parquet tables
@@ -163,17 +163,17 @@ async fn setup_session_context(
163163
session_context
164164
.register_parquet(table_name, table_path, ParquetReadOptions::default())
165165
.await
166-
.map_err(|e| format!("Failed to register Parquet table '{}': {}", table_name, e))?;
167-
println!("Loaded {} as table {}", table_path, table_name);
166+
.map_err(|e| format!("Failed to register Parquet table '{table_name}': {e}"))?;
167+
println!("Loaded {table_path} as table {table_name}");
168168
}
169169

170170
// Register Avro tables
171171
for (table_name, table_path) in opts.avro_tables.iter().map(|s| parse_table_def(s.as_ref())) {
172172
session_context
173173
.register_avro(table_name, table_path, AvroReadOptions::default())
174174
.await
175-
.map_err(|e| format!("Failed to register Avro table '{}': {}", table_name, e))?;
176-
println!("Loaded {} as table {}", table_path, table_name);
175+
.map_err(|e| format!("Failed to register Avro table '{table_name}': {e}"))?;
176+
println!("Loaded {table_path} as table {table_name}");
177177
}
178178

179179
// Register pg_catalog
@@ -202,7 +202,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
202202

203203
serve(Arc::new(session_context), &server_options)
204204
.await
205-
.map_err(|e| format!("Failed to run server: {}", e))?;
205+
.map_err(|e| format!("Failed to run server: {e}"))?;
206206

207207
Ok(())
208208
}

0 commit comments

Comments
 (0)