From 21d38e41d6ecb630b914c335d7b923a7b8bb2ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 20 Nov 2021 12:19:33 +0200 Subject: [PATCH] gstreamer: Rename `DateTime` constructors to replace the `new_` prefix with `from_` --- gstreamer/src/date_time.rs | 56 ++++++++++++++++++-------------- gstreamer/src/date_time_serde.rs | 24 +++++++------- gstreamer/src/tags_serde.rs | 10 +++--- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/gstreamer/src/date_time.rs b/gstreamer/src/date_time.rs index 5b34b0f12..3dba92bd8 100644 --- a/gstreamer/src/date_time.rs +++ b/gstreamer/src/date_time.rs @@ -144,7 +144,7 @@ impl DateTime { } #[doc(alias = "gst_date_time_new_local_time")] - pub fn new_local_time( + pub fn from_local_time( year: impl Into, month: impl Into>, day: impl Into>, @@ -177,7 +177,7 @@ impl DateTime { } #[doc(alias = "gst_date_time_new_y")] - pub fn new_y(year: i32) -> Result { + pub fn from_y(year: i32) -> Result { assert_initialized_main_thread!(); validate(None, year, None, None, None, None, None)?; @@ -189,7 +189,7 @@ impl DateTime { } #[doc(alias = "gst_date_time_new_ym")] - pub fn new_ym(year: i32, month: i32) -> Result { + pub fn from_ym(year: i32, month: i32) -> Result { assert_initialized_main_thread!(); validate(None, year, Some(month), None, None, None, None)?; @@ -201,7 +201,7 @@ impl DateTime { } #[doc(alias = "gst_date_time_new_ymd")] - pub fn new_ymd(year: i32, month: i32, day: i32) -> Result { + pub fn from_ymd(year: i32, month: i32, day: i32) -> Result { assert_initialized_main_thread!(); validate(None, year, Some(month), Some(day), None, None, None)?; @@ -567,7 +567,7 @@ mod tests { assert_eq!(utc_date_time.microsecond().unwrap(), 123_456); // Date without an hour (which implies no TZ) - let utc_date_time = DateTime::new_ymd(2019, 1, 1).unwrap().to_utc().unwrap(); + let utc_date_time = DateTime::from_ymd(2019, 1, 1).unwrap().to_utc().unwrap(); assert_eq!(utc_date_time.year(), 2019); assert_eq!(utc_date_time.month().unwrap(), 1); assert_eq!(utc_date_time.day().unwrap(), 1); @@ -646,30 +646,36 @@ mod tests { ); // Partially defined `DateTime` - assert!(DateTime::new_ymd(2020, 8, 20).unwrap() > DateTime::new_ymd(2019, 8, 20).unwrap()); - assert!(DateTime::new_ymd(2019, 9, 20).unwrap() > DateTime::new_ymd(2019, 8, 20).unwrap()); - assert!(DateTime::new_ymd(2019, 8, 21).unwrap() > DateTime::new_ymd(2019, 8, 20).unwrap()); + assert!( + DateTime::from_ymd(2020, 8, 20).unwrap() > DateTime::from_ymd(2019, 8, 20).unwrap() + ); + assert!( + DateTime::from_ymd(2019, 9, 20).unwrap() > DateTime::from_ymd(2019, 8, 20).unwrap() + ); + assert!( + DateTime::from_ymd(2019, 8, 21).unwrap() > DateTime::from_ymd(2019, 8, 20).unwrap() + ); - assert!(DateTime::new_ym(2020, 8).unwrap() > DateTime::new_ym(2019, 8).unwrap()); - assert!(DateTime::new_ym(2019, 9).unwrap() > DateTime::new_ym(2019, 8).unwrap()); - assert!(DateTime::new_ym(2019, 9).unwrap() > DateTime::new_ymd(2019, 8, 20).unwrap()); + assert!(DateTime::from_ym(2020, 8).unwrap() > DateTime::from_ym(2019, 8).unwrap()); + assert!(DateTime::from_ym(2019, 9).unwrap() > DateTime::from_ym(2019, 8).unwrap()); + assert!(DateTime::from_ym(2019, 9).unwrap() > DateTime::from_ymd(2019, 8, 20).unwrap()); - assert!(DateTime::new_y(2020).unwrap() > DateTime::new_y(2019).unwrap()); - assert!(DateTime::new_ym(2020, 1).unwrap() > DateTime::new_y(2019).unwrap()); + assert!(DateTime::from_y(2020).unwrap() > DateTime::from_y(2019).unwrap()); + assert!(DateTime::from_ym(2020, 1).unwrap() > DateTime::from_y(2019).unwrap()); assert!( DateTime::new(2f32, 2019, 8, 20, 19, 43, 44.123_456f64).unwrap() - < DateTime::new_ymd(2020, 8, 20).unwrap() + < DateTime::from_ymd(2020, 8, 20).unwrap() ); assert!( - DateTime::new_ymd(2020, 8, 20).unwrap() + DateTime::from_ymd(2020, 8, 20).unwrap() > DateTime::new(2f32, 2019, 8, 20, 19, 43, 44.123_456f64).unwrap() ); // Comparison occurs on the same TZ when the `DateTime` doesn't have time (note 2) assert!( - DateTime::new_ymd(2020, 1, 1).unwrap() + DateTime::from_ymd(2020, 1, 1).unwrap() > DateTime::new(-2f32, 2019, 12, 31, 23, 59, 0f64).unwrap() ); @@ -678,17 +684,17 @@ mod tests { // but we can't tell if it's before or after and they are not equal (note 1) assert!(DateTime::new(2f32, 2019, 8, 20, 19, 43, 44.123_456f64) .unwrap() - .partial_cmp(&DateTime::new_ymd(2019, 8, 20).unwrap()) + .partial_cmp(&DateTime::from_ymd(2019, 8, 20).unwrap()) .is_none()); - assert!(DateTime::new_ymd(2019, 8, 20) + assert!(DateTime::from_ymd(2019, 8, 20) .unwrap() .partial_cmp(&DateTime::new(2f32, 2019, 8, 20, 19, 43, 44.123_456f64).unwrap()) .is_none()); - assert!(DateTime::new_ym(2019, 1) + assert!(DateTime::from_ym(2019, 1) .unwrap() - .partial_cmp(&DateTime::new_y(2019).unwrap()) + .partial_cmp(&DateTime::from_y(2019).unwrap()) .is_none()); } @@ -712,26 +718,26 @@ mod tests { ); assert_eq!( - DateTime::new_ymd(2018, 5, 28).unwrap(), - DateTime::new_ymd(2018, 5, 28).unwrap() + DateTime::from_ymd(2018, 5, 28).unwrap(), + DateTime::from_ymd(2018, 5, 28).unwrap() ); // In the following cases, the partially defined `DateTime` is a range WRT // the fully defined `DateTime` and this range includes the fully defined `DateTime`, // but they are not equal (note 1) assert_ne!( - DateTime::new_ymd(2018, 5, 28).unwrap(), + DateTime::from_ymd(2018, 5, 28).unwrap(), DateTime::new(2f32, 2018, 5, 28, 16, 6, None).unwrap() ); assert_ne!( DateTime::new(2f32, 2018, 5, 28, 16, 6, None).unwrap(), - DateTime::new_ym(2018, 5).unwrap() + DateTime::from_ym(2018, 5).unwrap() ); assert_ne!( DateTime::new(2f32, 2018, 5, 28, 16, 6, None).unwrap(), - DateTime::new_y(2018).unwrap() + DateTime::from_y(2018).unwrap() ); } } diff --git a/gstreamer/src/date_time_serde.rs b/gstreamer/src/date_time_serde.rs index fe28f028e..89d3281e5 100644 --- a/gstreamer/src/date_time_serde.rs +++ b/gstreamer/src/date_time_serde.rs @@ -148,9 +148,9 @@ impl TryFrom for DateTime { fn try_from(dt_variant: DateTimeVariants) -> Result { skip_assert_initialized!(); match dt_variant { - DateTimeVariants::Y(y) => DateTime::new_y(y), - DateTimeVariants::YM(y, m) => DateTime::new_ym(y, m), - DateTimeVariants::YMD(y, m, d) => DateTime::new_ymd(y, m, d), + DateTimeVariants::Y(y) => DateTime::from_y(y), + DateTimeVariants::YM(y, m) => DateTime::from_ym(y, m), + DateTimeVariants::YMD(y, m, d) => DateTime::from_ymd(y, m, d), DateTimeVariants::YMDhmTz(y, m, d, h, mn, tz) => { DateTime::new(tz, y, m, d, h, mn, None) } @@ -196,15 +196,15 @@ mod tests { let res = ron::ser::to_string_pretty(&datetime, pretty_config.clone()); assert_eq!(Ok("YMDhmTz(2018, 5, 28, 16, 6, 2)".to_owned()), res,); - let datetime = DateTime::new_ymd(2018, 5, 28).unwrap(); + let datetime = DateTime::from_ymd(2018, 5, 28).unwrap(); let res = ron::ser::to_string_pretty(&datetime, pretty_config.clone()); assert_eq!(Ok("YMD(2018, 5, 28)".to_owned()), res); - let datetime = DateTime::new_ym(2018, 5).unwrap(); + let datetime = DateTime::from_ym(2018, 5).unwrap(); let res = ron::ser::to_string_pretty(&datetime, pretty_config.clone()); assert_eq!(Ok("YM(2018, 5)".to_owned()), res); - let datetime = DateTime::new_y(2018).unwrap(); + let datetime = DateTime::from_y(2018).unwrap(); let res = ron::ser::to_string_pretty(&datetime, pretty_config); assert_eq!(Ok("Y(2018)".to_owned()), res); } @@ -236,15 +236,15 @@ mod tests { let datetime_ron = "YMD(2018, 5, 28)"; let datetime_de: DateTime = ron::de::from_str(datetime_ron).unwrap(); - assert_eq!(datetime_de, DateTime::new_ymd(2018, 5, 28).unwrap()); + assert_eq!(datetime_de, DateTime::from_ymd(2018, 5, 28).unwrap()); let datetime_ron = "YM(2018, 5)"; let datetime_de: DateTime = ron::de::from_str(datetime_ron).unwrap(); - assert_eq!(datetime_de, DateTime::new_ym(2018, 5).unwrap()); + assert_eq!(datetime_de, DateTime::from_ym(2018, 5).unwrap()); let datetime_ron = "Y(2018)"; let datetime_de: DateTime = ron::de::from_str(datetime_ron).unwrap(); - assert_eq!(datetime_de, DateTime::new_y(2018).unwrap()); + assert_eq!(datetime_de, DateTime::from_y(2018).unwrap()); } #[test] @@ -261,17 +261,17 @@ mod tests { let datetime_de: DateTime = ron::de::from_str(datetime_ser.as_str()).unwrap(); assert_eq!(datetime_de, datetime); - let datetime = DateTime::new_ymd(2018, 5, 28).unwrap(); + let datetime = DateTime::from_ymd(2018, 5, 28).unwrap(); let datetime_ser = ron::ser::to_string(&datetime).unwrap(); let datetime_de: DateTime = ron::de::from_str(datetime_ser.as_str()).unwrap(); assert_eq!(datetime_de, datetime); - let datetime = DateTime::new_ym(2018, 5).unwrap(); + let datetime = DateTime::from_ym(2018, 5).unwrap(); let datetime_ser = ron::ser::to_string(&datetime).unwrap(); let datetime_de: DateTime = ron::de::from_str(datetime_ser.as_str()).unwrap(); assert_eq!(datetime_de, datetime); - let datetime = DateTime::new_y(2018).unwrap(); + let datetime = DateTime::from_y(2018).unwrap(); let datetime_ser = ron::ser::to_string(&datetime).unwrap(); let datetime_de: DateTime = ron::de::from_str(datetime_ser.as_str()).unwrap(); assert_eq!(datetime_de, datetime); diff --git a/gstreamer/src/tags_serde.rs b/gstreamer/src/tags_serde.rs index 5c5570ecb..d1bf28591 100644 --- a/gstreamer/src/tags_serde.rs +++ b/gstreamer/src/tags_serde.rs @@ -336,7 +336,7 @@ mod tests { TagMergeMode::Append, ); tags.add::( - &crate::DateTime::new_ymd(2018, 5, 28).unwrap(), + &crate::DateTime::from_ymd(2018, 5, 28).unwrap(), TagMergeMode::Append, ); @@ -481,7 +481,7 @@ mod tests { ); assert_eq!( tags.index::(0).unwrap().get(), - crate::DateTime::new_ymd(2018, 5, 28).unwrap() + crate::DateTime::from_ymd(2018, 5, 28).unwrap() ); let sample = tags.index::(0).unwrap().get(); let buffer = sample.buffer().unwrap(); @@ -517,7 +517,7 @@ mod tests { ); assert_eq!( tags.index::(0).unwrap().get(), - crate::DateTime::new_ymd(2018, 5, 28).unwrap() + crate::DateTime::from_ymd(2018, 5, 28).unwrap() ); let sample = tags.index::(0).unwrap().get(); let buffer = sample.buffer().unwrap(); @@ -546,7 +546,7 @@ mod tests { TagMergeMode::Append, ); tags.add::( - &crate::DateTime::new_ymd(2018, 5, 28).unwrap(), + &crate::DateTime::from_ymd(2018, 5, 28).unwrap(), TagMergeMode::Append, ); @@ -594,7 +594,7 @@ mod tests { ); assert_eq!( tags.index::(0).unwrap().get(), - crate::DateTime::new_ymd(2018, 5, 28).unwrap() + crate::DateTime::from_ymd(2018, 5, 28).unwrap() ); let sample = tags.index::(0).unwrap().get(); let buffer = sample.buffer().unwrap();