Skip to content

Commit cd02b8d

Browse files
Add underscores to long literals in test code
Updating to rust nightly 2017-08-31 made clippy start failing builds on long literals. (e.g., 72400 should be 72_400). This adds underscores to long literals in test code.
1 parent ca7b989 commit cd02b8d

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

diesel/src/pg/types/date_and_time/chrono.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ mod tests {
265265
let query = select(sql::<Date>("'2018-1-1'::date").eq(january_first_2018));
266266
assert!(query.get_result::<bool>(&connection).unwrap());
267267

268-
let distant_future = NaiveDate::from_ymd(72400, 1, 8);
268+
let distant_future = NaiveDate::from_ymd(72_400, 1, 8);
269269
let query = select(sql::<Date>("'72400-1-8'::date").eq(distant_future));
270270
assert!(query.get_result::<bool>(&connection).unwrap());
271271
}
@@ -293,7 +293,7 @@ mod tests {
293293
let query = select(sql::<Date>("'2018-1-1'::date"));
294294
assert_eq!(Ok(january_first_2018), query.get_result::<NaiveDate>(&connection));
295295

296-
let distant_future = NaiveDate::from_ymd(72400, 1, 8);
296+
let distant_future = NaiveDate::from_ymd(72_400, 1, 8);
297297
let query = select(sql::<Date>("'72400-1-8'::date"));
298298
assert_eq!(Ok(distant_future), query.get_result::<NaiveDate>(&connection));
299299
}

diesel/src/pg/types/floats/quickcheck_impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct Digit(i16);
5757
impl Arbitrary for Digit {
5858
fn arbitrary<G: Gen>(g: &mut G) -> Self {
5959
let mut n = -1;
60-
while n < 0 || n >= 10000 {
60+
while n < 0 || n >= 10_000 {
6161
n = i16::arbitrary(g);
6262
}
6363
Digit(n)

diesel/src/pg/types/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,11 @@ pub mod sql_types {
297297
/// # )").unwrap();
298298
/// let new_item = NewItem {
299299
/// name: "Shiny Thing".into(),
300-
/// price: Cents(123456),
300+
/// price: Cents(123_456),
301301
/// };
302302
/// let inserted_item = insert(&new_item).into(items)
303303
/// .get_result::<Item>(&connection).unwrap();
304-
/// assert_eq!(Cents(123456), inserted_item.price);
304+
/// assert_eq!(Cents(123_456), inserted_item.price);
305305
/// # }
306306
/// ```
307307
#[derive(Debug, Clone, Copy, Default)] pub struct Money;

diesel/src/sqlite/types/date_and_time/chrono.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ mod tests {
191191
let query = select(sql::<Date>("'2018-01-01'").eq(january_first_2018));
192192
assert!(query.get_result::<bool>(&connection).unwrap());
193193

194-
let distant_future = NaiveDate::from_ymd(72400, 1, 8);
194+
let distant_future = NaiveDate::from_ymd(72_400, 1, 8);
195195
let query = select(sql::<Date>("'72400-01-08'").eq(distant_future));
196196
assert!(query.get_result::<bool>(&connection).unwrap());
197197
}
@@ -215,7 +215,7 @@ mod tests {
215215
let query = select(sql::<Date>("'2018-01-01'"));
216216
assert_eq!(Ok(january_first_2018), query.get_result::<NaiveDate>(&connection));
217217

218-
let distant_future = NaiveDate::from_ymd(72400, 1, 8);
218+
let distant_future = NaiveDate::from_ymd(72_400, 1, 8);
219219
let query = select(sql::<Date>("'72400-01-08'"));
220220
assert_eq!(Ok(distant_future), query.get_result::<NaiveDate>(&connection));
221221
}
@@ -235,7 +235,7 @@ mod tests {
235235
let query = select(sql::<Date>("'2018-01-01'"));
236236
assert_eq!(Ok(january_first_2018), query.get_result::<NaiveDate>(&connection));
237237

238-
let distant_future = NaiveDate::from_ymd(72400, 1, 8).and_hms(23, 59, 59).with_nanosecond(100000).unwrap();
238+
let distant_future = NaiveDate::from_ymd(72_400, 1, 8).and_hms(23, 59, 59).with_nanosecond(100_000).unwrap();
239239
let query = select(sql::<Timestamp>("'72400-01-08 23:59:59.000100'"));
240240
assert_eq!(Ok(distant_future), query.get_result::<NaiveDateTime>(&connection));
241241
}
@@ -251,11 +251,11 @@ mod tests {
251251
let query = select(sql::<Timestamp>("'-398-04-11 20:00:20.000000'").eq(distant_past));
252252
assert!(query.get_result::<bool>(&connection).unwrap());
253253

254-
let january_first_2018 = NaiveDate::from_ymd(2018, 1, 1).and_hms(12, 00, 00).with_nanosecond(500000).unwrap();
254+
let january_first_2018 = NaiveDate::from_ymd(2018, 1, 1).and_hms(12, 00, 00).with_nanosecond(500_000).unwrap();
255255
let query = select(sql::<Timestamp>("'2018-01-01 12:00:00.000500'").eq(january_first_2018));
256256
assert!(query.get_result::<bool>(&connection).unwrap());
257257

258-
let distant_future = NaiveDate::from_ymd(72400, 1, 8).and_hms(0, 0, 0);
258+
let distant_future = NaiveDate::from_ymd(72_400, 1, 8).and_hms(0, 0, 0);
259259
let query = select(sql::<Timestamp>("'72400-01-08 00:00:00.000000'").eq(distant_future));
260260
assert!(query.get_result::<bool>(&connection).unwrap());
261261
}

diesel_tests/tests/types.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,24 +156,24 @@ fn i16_to_sql_smallint() {
156156
fn i32_from_sql() {
157157
assert_eq!(0, query_single_value::<Integer, i32>("0"));
158158
assert_eq!(-1, query_single_value::<Integer, i32>("-1"));
159-
assert_eq!(70000, query_single_value::<Integer, i32>("70000"));
159+
assert_eq!(70_000, query_single_value::<Integer, i32>("70000"));
160160
}
161161

162162
#[test]
163163
fn i32_to_sql_integer() {
164164
assert!(query_to_sql_equality::<Integer, i32>("0", 0));
165165
assert!(query_to_sql_equality::<Integer, i32>("-1", -1));
166-
assert!(query_to_sql_equality::<Integer, i32>("70000", 70000));
166+
assert!(query_to_sql_equality::<Integer, i32>("70000", 70_000));
167167
assert!(!query_to_sql_equality::<Integer, i32>("0", 1));
168-
assert!(!query_to_sql_equality::<Integer, i32>("70000", 69999));
168+
assert!(!query_to_sql_equality::<Integer, i32>("70000", 69_999));
169169
}
170170

171171
#[test]
172172
#[cfg(feature = "postgres")]
173173
fn i64_from_sql() {
174174
assert_eq!(0, query_single_value::<BigInt, i64>("0::int8"));
175175
assert_eq!(-1, query_single_value::<BigInt, i64>("-1::int8"));
176-
assert_eq!(283745982374,
176+
assert_eq!(283_745_982_374,
177177
query_single_value::<BigInt, i64>("283745982374::int8"));
178178
}
179179

@@ -182,9 +182,9 @@ fn i64_from_sql() {
182182
fn i64_to_sql_bigint() {
183183
assert!(query_to_sql_equality::<BigInt, i64>("0::int8", 0));
184184
assert!(query_to_sql_equality::<BigInt, i64>("-1::int8", -1));
185-
assert!(query_to_sql_equality::<BigInt, i64>("283745982374::int8", 283745982374));
185+
assert!(query_to_sql_equality::<BigInt, i64>("283745982374::int8", 283_745_982_374));
186186
assert!(!query_to_sql_equality::<BigInt, i64>("0::int8", 1));
187-
assert!(!query_to_sql_equality::<BigInt, i64>("283745982374::int8", 283745982373));
187+
assert!(!query_to_sql_equality::<BigInt, i64>("283745982374::int8", 283_745_982_373));
188188
}
189189

190190
use std::{f32, f64};
@@ -383,10 +383,10 @@ fn timestamp_from_sql() {
383383
use diesel::data_types::PgTimestamp;
384384

385385
let query = "'2015-11-13 13:26:48.041057-07'::timestamp";
386-
let expected_value = PgTimestamp(500736408041057);
386+
let expected_value = PgTimestamp(500_736_408_041_057);
387387
assert_eq!(expected_value, query_single_value::<Timestamp, PgTimestamp>(query));
388388
let query = "'2015-11-13 13:26:49.041057-07'::timestamp";
389-
let expected_value = PgTimestamp(500736409041057);
389+
let expected_value = PgTimestamp(500_736_409_041_057);
390390
assert_eq!(expected_value, query_single_value::<Timestamp, PgTimestamp>(query));
391391
}
392392

@@ -396,10 +396,10 @@ fn pg_timestamp_to_sql_timestamp() {
396396
use diesel::data_types::PgTimestamp;
397397

398398
let expected_value = "'2015-11-13 13:26:48.041057-07'::timestamp";
399-
let value = PgTimestamp(500736408041057);
399+
let value = PgTimestamp(500_736_408_041_057);
400400
assert!(query_to_sql_equality::<Timestamp, PgTimestamp>(expected_value, value));
401401
let expected_value = "'2015-11-13 13:26:49.041057-07'::timestamp";
402-
let value = PgTimestamp(500736409041057);
402+
let value = PgTimestamp(500_736_409_041_057);
403403
assert!(query_to_sql_equality::<Timestamp, PgTimestamp>(expected_value, value));
404404
let expected_non_equal_value = "'2015-11-13 13:26:48.041057-07'::timestamp";
405405
assert!(!query_to_sql_equality::<Timestamp, PgTimestamp>(expected_non_equal_value, value));
@@ -755,7 +755,7 @@ fn third_party_crates_can_add_new_types() {
755755

756756
assert_eq!(0, query_single_value::<MyInt, i32>("0"));
757757
assert_eq!(-1, query_single_value::<MyInt, i32>("-1"));
758-
assert_eq!(70000, query_single_value::<MyInt, i32>("70000"));
758+
assert_eq!(70_000, query_single_value::<MyInt, i32>("70000"));
759759
}
760760

761761
fn query_single_value<T, U: Queryable<T, TestBackend>>(sql_str: &str) -> U where

0 commit comments

Comments
 (0)