Merge remote-tracking branch 'origin/develop' into develop

logger/src/handler/stdout.rs

@@ -30,12 +30,12 @@ use crate::easy_termcolor::{color, EasyTermColor};
 use crate::handler::{Flag, Handler};
 use crate::util::write_time;
 use crate::{Colors, LogMsg};
+use bp3d_debug::logger::Level;
+use bp3d_debug::util::Location;
 use bp3d_os::time::LocalUtcOffset;
 use bp3d_util::format::FixedBufStr;
 use std::io::IsTerminal;
 use std::mem::MaybeUninit;
-use bp3d_debug::logger::Level;
-use bp3d_debug::util::Location;
 use termcolor::{ColorChoice, ColorSpec, StandardStream};
 use time::{OffsetDateTime, UtcOffset};
 

logger/src/lib.rs

@@ -45,12 +45,12 @@ use bp3d_os::dirs::App;
 use crossbeam_channel::Receiver;
 use std::path::PathBuf;
 
+pub use bp3d_debug::logger::Level;
+pub use bp3d_debug::util::Location;
 pub use builder::*;
 pub use internal::Logger;
 pub use level::LevelFilter;
 pub use log_msg::LogMsg;
-pub use bp3d_debug::logger::Level;
-pub use bp3d_debug::util::Location;
 
 /// The log buffer type.
 pub type LogBuffer = Receiver<LogMsg>;

logger/src/log_msg.rs

@@ -26,10 +26,10 @@
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use std::fmt::{Error, Write};
-use std::mem::MaybeUninit;
 use bp3d_debug::logger::Level;
 use bp3d_debug::util::Location;
+use std::fmt::{Error, Write};
+use std::mem::MaybeUninit;
 use time::OffsetDateTime;
 
 // Size of the control fields of the log message structure:

logger/src/util.rs

@@ -52,10 +52,10 @@ pub fn write_time(msg: &mut impl Write, time: OffsetDateTime) {
 
 #[cfg(test)]
 mod tests {
-    use bp3d_debug::logger::Level;
-    use bp3d_debug::util::Location;
     use crate::util::write_time;
     use crate::LogMsg;
+    use bp3d_debug::logger::Level;
+    use bp3d_debug::util::Location;
     use bp3d_os::time::LocalOffsetDateTime;
     use time::OffsetDateTime;