Skip to content

Commit 6472f84

Browse files
sunng87sunng87
committed
(fix) clippy error
1 parent 6d0c1a1 commit 6472f84

File tree

3 files changed

+45
-39
lines changed

3 files changed

+45
-39
lines changed

‎influxdb/tests/integration_tests.rs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ async fn test_connection_error() {
5252
let test_name = "test_connection_error";
5353
let client =
5454
Client::new("http://127.0.0.1:10086", test_name).with_auth("nopriv_user", "password");
55-
let read_query = Query::raw_read_query("SELECT * FROM weather");
55+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
5656
let read_result = client.query(&read_query).await;
5757
assert_result_err(&read_result);
5858
match read_result {
@@ -78,7 +78,7 @@ async fn test_authed_write_and_read() {
7878
Client::new("http://127.0.0.1:9086", TEST_NAME).with_auth("admin", "password");
7979
let query = format!("CREATE DATABASE {}", TEST_NAME);
8080
client
81-
.query(&Query::raw_read_query(query))
81+
.query(&<dyn Query>::raw_read_query(query))
8282
.await
8383
.expect("could not setup db");
8484

@@ -90,7 +90,7 @@ async fn test_authed_write_and_read() {
9090
let write_result = client.query(&write_query).await;
9191
assert_result_ok(&write_result);
9292

93-
let read_query = Query::raw_read_query("SELECT * FROM weather");
93+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
9494
let read_result = client.query(&read_query).await;
9595
assert_result_ok(&read_result);
9696
assert!(
@@ -126,7 +126,7 @@ async fn test_wrong_authed_write_and_read() {
126126
Client::new("http://127.0.0.1:9086", TEST_NAME).with_auth("admin", "password");
127127
let query = format!("CREATE DATABASE {}", TEST_NAME);
128128
client
129-
.query(&Query::raw_read_query(query))
129+
.query(&<dyn Query>::raw_read_query(query))
130130
.await
131131
.expect("could not setup db");
132132

@@ -145,7 +145,7 @@ async fn test_wrong_authed_write_and_read() {
145145
),
146146
}
147147

148-
let read_query = Query::raw_read_query("SELECT * FROM weather");
148+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
149149
let read_result = client.query(&read_query).await;
150150
assert_result_err(&read_result);
151151
match read_result {
@@ -158,7 +158,7 @@ async fn test_wrong_authed_write_and_read() {
158158

159159
let client = Client::new("http://127.0.0.1:9086", TEST_NAME)
160160
.with_auth("nopriv_user", "password");
161-
let read_query = Query::raw_read_query("SELECT * FROM weather");
161+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
162162
let read_result = client.query(&read_query).await;
163163
assert_result_err(&read_result);
164164
match read_result {
@@ -174,7 +174,7 @@ async fn test_wrong_authed_write_and_read() {
174174
Client::new("http://127.0.0.1:9086", TEST_NAME).with_auth("admin", "password");
175175
let query = format!("DROP DATABASE {}", TEST_NAME);
176176
client
177-
.query(&Query::raw_read_query(query))
177+
.query(&<dyn Query>::raw_read_query(query))
178178
.await
179179
.expect("could not clean up db");
180180
},
@@ -196,7 +196,7 @@ async fn test_non_authed_write_and_read() {
196196
Client::new("http://127.0.0.1:9086", TEST_NAME).with_auth("admin", "password");
197197
let query = format!("CREATE DATABASE {}", TEST_NAME);
198198
client
199-
.query(&Query::raw_read_query(query))
199+
.query(&<dyn Query>::raw_read_query(query))
200200
.await
201201
.expect("could not setup db");
202202
let non_authed_client = Client::new("http://127.0.0.1:9086", TEST_NAME);
@@ -213,7 +213,7 @@ async fn test_non_authed_write_and_read() {
213213
),
214214
}
215215

216-
let read_query = Query::raw_read_query("SELECT * FROM weather");
216+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
217217
let read_result = non_authed_client.query(&read_query).await;
218218
assert_result_err(&read_result);
219219
match read_result {
@@ -229,7 +229,7 @@ async fn test_non_authed_write_and_read() {
229229
Client::new("http://127.0.0.1:9086", TEST_NAME).with_auth("admin", "password");
230230
let query = format!("DROP DATABASE {}", TEST_NAME);
231231
client
232-
.query(&Query::raw_read_query(query))
232+
.query(&<dyn Query>::raw_read_query(query))
233233
.await
234234
.expect("could not clean up db");
235235
},
@@ -255,7 +255,7 @@ async fn test_write_and_read_field() {
255255
let write_result = client.query(&write_query).await;
256256
assert_result_ok(&write_result);
257257

258-
let read_query = Query::raw_read_query("SELECT * FROM weather");
258+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
259259
let read_result = client.query(&read_query).await;
260260
assert_result_ok(&read_result);
261261
assert!(
@@ -304,8 +304,9 @@ async fn test_write_and_read_option() {
304304
temperature: i32,
305305
}
306306

307-
let query =
308-
Query::raw_read_query("SELECT time, temperature, wind_strength FROM weather");
307+
let query = <dyn Query>::raw_read_query(
308+
"SELECT time, temperature, wind_strength FROM weather",
309+
);
309310
let result = client
310311
.json_query(query)
311312
.await
@@ -361,7 +362,7 @@ async fn test_json_query() {
361362
temperature: i32,
362363
}
363364

364-
let query = Query::raw_read_query("SELECT * FROM weather");
365+
let query = <dyn Query>::raw_read_query("SELECT * FROM weather");
365366
let result = client
366367
.json_query(query)
367368
.await
@@ -419,7 +420,7 @@ async fn test_json_query_tagged() {
419420
temperature: i32,
420421
}
421422

422-
let query = Query::raw_read_query("SELECT * FROM weather GROUP BY location");
423+
let query = <dyn Query>::raw_read_query("SELECT * FROM weather GROUP BY location");
423424
let result = client.json_query(query).await.and_then(|mut db_result| {
424425
db_result.deserialize_next_tagged::<WeatherMeta, Weather>()
425426
});
@@ -485,7 +486,7 @@ async fn test_json_query_vec() {
485486
temperature: i32,
486487
}
487488

488-
let query = Query::raw_read_query("SELECT * FROM temperature_vec");
489+
let query = <dyn Query>::raw_read_query("SELECT * FROM temperature_vec");
489490
let result = client
490491
.json_query(query)
491492
.await
@@ -542,7 +543,7 @@ async fn test_serde_multi_query() {
542543

543544
let result = client
544545
.json_query(
545-
Query::raw_read_query("SELECT * FROM temperature")
546+
<dyn Query>::raw_read_query("SELECT * FROM temperature")
546547
.add_query("SELECT * FROM humidity"),
547548
)
548549
.await
@@ -586,7 +587,9 @@ async fn test_serde_multi_query() {
586587
async fn test_wrong_query_errors() {
587588
let client = create_client("test_name");
588589
let result = client
589-
.json_query(Query::raw_read_query("CREATE DATABASE this_should_fail"))
590+
.json_query(<dyn Query>::raw_read_query(
591+
"CREATE DATABASE this_should_fail",
592+
))
590593
.await;
591594
assert!(
592595
result.is_err(),

‎influxdb/tests/integration_tests_v2.rs

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ async fn test_ping_influx_db_tokio() {
5151
async fn test_connection_error() {
5252
let test_name = "test_connection_error";
5353
let client = Client::new("http://127.0.0.1:10086", test_name).with_token("admintoken");
54-
let read_query = Query::raw_read_query("SELECT * FROM weather");
54+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
5555
let read_result = client.query(&read_query).await;
5656
assert_result_err(&read_result);
5757
match read_result {
@@ -76,7 +76,7 @@ async fn test_authed_write_and_read() {
7676
let client = Client::new("http://127.0.0.1:9086", TEST_NAME).with_token("admintoken");
7777
let query = format!("CREATE DATABASE {}", TEST_NAME);
7878
client
79-
.query(&Query::raw_read_query(query))
79+
.query(&<dyn Query>::raw_read_query(query))
8080
.await
8181
.expect("could not setup db");
8282

@@ -87,7 +87,7 @@ async fn test_authed_write_and_read() {
8787
let write_result = client.query(&write_query).await;
8888
assert_result_ok(&write_result);
8989

90-
let read_query = Query::raw_read_query("SELECT * FROM weather");
90+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
9191
let read_result = client.query(&read_query).await;
9292
assert_result_ok(&read_result);
9393
assert!(
@@ -100,7 +100,7 @@ async fn test_authed_write_and_read() {
100100
let query = format!("DROP DATABASE {}", TEST_NAME);
101101

102102
client
103-
.query(&Query::raw_read_query(query))
103+
.query(&<dyn Query>::raw_read_query(query))
104104
.await
105105
.expect("could not clean up db");
106106
},
@@ -121,7 +121,7 @@ async fn test_wrong_authed_write_and_read() {
121121
let client = Client::new("http://127.0.0.1:9086", TEST_NAME).with_token("admintoken");
122122
let query = format!("CREATE DATABASE {}", TEST_NAME);
123123
client
124-
.query(&Query::raw_read_query(query))
124+
.query(&<dyn Query>::raw_read_query(query))
125125
.await
126126
.expect("could not setup db");
127127

@@ -139,7 +139,7 @@ async fn test_wrong_authed_write_and_read() {
139139
),
140140
}
141141

142-
let read_query = Query::raw_read_query("SELECT * FROM weather");
142+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
143143
let read_result = client.query(&read_query).await;
144144
assert_result_err(&read_result);
145145
match read_result {
@@ -152,7 +152,7 @@ async fn test_wrong_authed_write_and_read() {
152152

153153
let client = Client::new("http://127.0.0.1:9086", TEST_NAME)
154154
.with_auth("nopriv_user", "password");
155-
let read_query = Query::raw_read_query("SELECT * FROM weather");
155+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
156156
let read_result = client.query(&read_query).await;
157157
assert_result_err(&read_result);
158158
match read_result {
@@ -167,7 +167,7 @@ async fn test_wrong_authed_write_and_read() {
167167
let client = Client::new("http://127.0.0.1:9086", TEST_NAME).with_token("admintoken");
168168
let query = format!("DROP DATABASE {}", TEST_NAME);
169169
client
170-
.query(&Query::raw_read_query(query))
170+
.query(&<dyn Query>::raw_read_query(query))
171171
.await
172172
.expect("could not clean up db");
173173
},
@@ -188,7 +188,7 @@ async fn test_non_authed_write_and_read() {
188188
let client = Client::new("http://127.0.0.1:9086", TEST_NAME).with_token("admintoken");
189189
let query = format!("CREATE DATABASE {}", TEST_NAME);
190190
client
191-
.query(&Query::raw_read_query(query))
191+
.query(&<dyn Query>::raw_read_query(query))
192192
.await
193193
.expect("could not setup db");
194194
let non_authed_client = Client::new("http://127.0.0.1:9086", TEST_NAME);
@@ -205,7 +205,7 @@ async fn test_non_authed_write_and_read() {
205205
),
206206
}
207207

208-
let read_query = Query::raw_read_query("SELECT * FROM weather");
208+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
209209
let read_result = non_authed_client.query(&read_query).await;
210210
assert_result_err(&read_result);
211211
match read_result {
@@ -220,7 +220,7 @@ async fn test_non_authed_write_and_read() {
220220
let client = Client::new("http://127.0.0.1:9086", TEST_NAME).with_token("admintoken");
221221
let query = format!("DROP DATABASE {}", TEST_NAME);
222222
client
223-
.query(&Query::raw_read_query(query))
223+
.query(&<dyn Query>::raw_read_query(query))
224224
.await
225225
.expect("could not clean up db");
226226
},
@@ -246,7 +246,7 @@ async fn test_write_and_read_field() {
246246
let write_result = client.query(&write_query).await;
247247
assert_result_ok(&write_result);
248248

249-
let read_query = Query::raw_read_query("SELECT * FROM weather");
249+
let read_query = <dyn Query>::raw_read_query("SELECT * FROM weather");
250250
let read_result = client.query(&read_query).await;
251251
assert_result_ok(&read_result);
252252
assert!(
@@ -295,8 +295,9 @@ async fn test_write_and_read_option() {
295295
temperature: i32,
296296
}
297297

298-
let query =
299-
Query::raw_read_query("SELECT time, temperature, wind_strength FROM weather");
298+
let query = <dyn Query>::raw_read_query(
299+
"SELECT time, temperature, wind_strength FROM weather",
300+
);
300301
let result = client
301302
.json_query(query)
302303
.await
@@ -352,7 +353,7 @@ async fn test_json_query() {
352353
temperature: i32,
353354
}
354355

355-
let query = Query::raw_read_query("SELECT * FROM weather");
356+
let query = <dyn Query>::raw_read_query("SELECT * FROM weather");
356357
let result = client
357358
.json_query(query)
358359
.await
@@ -410,7 +411,7 @@ async fn test_json_query_tagged() {
410411
temperature: i32,
411412
}
412413

413-
let query = Query::raw_read_query("SELECT * FROM weather GROUP BY location");
414+
let query = <dyn Query>::raw_read_query("SELECT * FROM weather GROUP BY location");
414415
let result = client.json_query(query).await.and_then(|mut db_result| {
415416
db_result.deserialize_next_tagged::<WeatherMeta, Weather>()
416417
});
@@ -476,7 +477,7 @@ async fn test_json_query_vec() {
476477
temperature: i32,
477478
}
478479

479-
let query = Query::raw_read_query("SELECT * FROM temperature_vec");
480+
let query = <dyn Query>::raw_read_query("SELECT * FROM temperature_vec");
480481
let result = client
481482
.json_query(query)
482483
.await
@@ -533,7 +534,7 @@ async fn test_serde_multi_query() {
533534

534535
let result = client
535536
.json_query(
536-
Query::raw_read_query("SELECT * FROM temperature")
537+
<dyn Query>::raw_read_query("SELECT * FROM temperature")
537538
.add_query("SELECT * FROM humidity"),
538539
)
539540
.await
@@ -577,7 +578,9 @@ async fn test_serde_multi_query() {
577578
async fn test_wrong_query_errors() {
578579
let client = create_client("test_name");
579580
let result = client
580-
.json_query(Query::raw_read_query("CREATE DATABASE this_should_fail"))
581+
.json_query(<dyn Query>::raw_read_query(
582+
"CREATE DATABASE this_should_fail",
583+
))
581584
.await;
582585
assert!(
583586
result.is_err(),

‎influxdb/tests/utilities.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ where
2929
let test_name = name.into();
3030
let query = format!("CREATE DATABASE {}", test_name);
3131
create_client(test_name)
32-
.query(&Query::raw_read_query(query))
32+
.query(&<dyn Query>::raw_read_query(query))
3333
.await
3434
}
3535

@@ -41,7 +41,7 @@ where
4141
let test_name = name.into();
4242
let query = format!("DROP DATABASE {}", test_name);
4343
create_client(test_name)
44-
.query(&Query::raw_read_query(query))
44+
.query(&<dyn Query>::raw_read_query(query))
4545
.await
4646
}
4747

0 commit comments

Comments
 (0)