diff --git a/src/file_handler/mod.rs b/src/file_handler/mod.rs index 0c825f165..eb3ac3773 100644 --- a/src/file_handler/mod.rs +++ b/src/file_handler/mod.rs @@ -45,7 +45,7 @@ impl> PathFileHandler

{ } } -impl<'a, P: AsRef> FileHandler for &'a mut PathFileHandler

{ +impl> FileHandler for &mut PathFileHandler

{ type Reader = File; fn get_file_if_exists(self, name: &str) -> Result<(Option, PathBuf)> { let f = self.base_path.as_ref().join(name); diff --git a/src/gtfs/mod.rs b/src/gtfs/mod.rs index 8301b6be8..e7fd655ec 100644 --- a/src/gtfs/mod.rs +++ b/src/gtfs/mod.rs @@ -69,7 +69,7 @@ struct Agency { ticketing_deep_link_id: Option, } -impl<'a> From<&'a objects::Network> for Agency { +impl From<&objects::Network> for Agency { fn from(obj: &objects::Network) -> Agency { Agency { id: Some(obj.id.clone()), @@ -248,7 +248,7 @@ struct BookingRule { booking_url: Option, } -impl<'a> From<&'a objects::BookingRule> for BookingRule { +impl From<&objects::BookingRule> for BookingRule { fn from(obj: &objects::BookingRule) -> BookingRule { BookingRule { id: obj.id.clone(), @@ -286,7 +286,7 @@ struct Transfer { min_transfer_time: Option, } -impl<'a> From<&'a objects::Transfer> for Transfer { +impl From<&objects::Transfer> for Transfer { fn from(obj: &objects::Transfer) -> Transfer { Transfer { from_stop_id: obj.from_stop_id.clone(), diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs index 6ca8461e9..8e7944450 100644 --- a/src/gtfs/write.rs +++ b/src/gtfs/write.rs @@ -375,7 +375,7 @@ where .collect() } -impl<'a> From<&'a objects::PhysicalMode> for RouteType { +impl From<&objects::PhysicalMode> for RouteType { fn from(obj: &objects::PhysicalMode) -> RouteType { match obj.id.as_str() { "RailShuttle" | "Tramway" => RouteType::Tramway, diff --git a/src/model_builder.rs b/src/model_builder.rs index 6606b4f01..156119c41 100644 --- a/src/model_builder.rs +++ b/src/model_builder.rs @@ -606,7 +606,7 @@ impl AsDateTime for &NaiveDateTime { } } -impl<'a> VehicleJourneyBuilder<'a> { +impl VehicleJourneyBuilder<'_> { fn find_or_create_sp(&mut self, sp: &str) -> Idx { self.model .collections @@ -1039,7 +1039,7 @@ impl<'a> VehicleJourneyBuilder<'a> { } } -impl<'a> Drop for VehicleJourneyBuilder<'a> { +impl Drop for VehicleJourneyBuilder<'_> { fn drop(&mut self) { use std::ops::DerefMut; let collections = &mut self.model.collections; diff --git a/src/objects.rs b/src/objects.rs index 268729038..e9386828c 100644 --- a/src/objects.rs +++ b/src/objects.rs @@ -923,7 +923,7 @@ impl<'de> ::serde::Deserialize<'de> for Time { // using the visitor pattern to avoid a string allocation struct TimeVisitor; - impl<'de> Visitor<'de> for TimeVisitor { + impl Visitor<'_> for TimeVisitor { type Value = Time; fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { formatter.write_str("a time in the format HH:MM:SS")