From ab77ab64b12d17f44ff9a8cb1168cc9a81233f53 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Fri, 11 Oct 2024 09:43:17 +0200 Subject: [PATCH] Fix hifitime upgrade Signed-off-by: Guillaume W. Bres --- rinex/src/epoch.rs | 9 +++------ rinex/src/merge.rs | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rinex/src/epoch.rs b/rinex/src/epoch.rs index 620d4598..95bd0eab 100644 --- a/rinex/src/epoch.rs +++ b/rinex/src/epoch.rs @@ -1,12 +1,9 @@ //! Epoch parsing helpers use crate::types::Type; use hifitime::{ - Epoch, - //EpochError as HifitimeEpochError, - errors::{ - ParsingError as HifitimeParsingError, - HifitimeError, - }, + //EpochError as HifitimeEpochError, + errors::{HifitimeError, ParsingError as HifitimeParsingError}, + Epoch, TimeScale, }; use std::str::FromStr; diff --git a/rinex/src/merge.rs b/rinex/src/merge.rs index fdc2c5a7..f877944e 100644 --- a/rinex/src/merge.rs +++ b/rinex/src/merge.rs @@ -1,10 +1,10 @@ //! RINEX File merging (combination) use crate::prelude::Epoch; +use hifitime::errors::HifitimeError; use std::cmp::{Eq, PartialEq}; use std::collections::HashMap; use std::hash::Hash; use thiserror::Error; -use hifitime::errors::HifitimeError; // use hifitime::EpochError;