From c6ce07931ac64321aaa62a66ed9c423a959f601d Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Sat, 30 Mar 2024 12:15:32 +0000 Subject: [PATCH] Remove new_from_context from the public API --- block-device-adapters/src/buf_stream.rs | 2 +- embedded-fatfs/src/dir_entry.rs | 1 - embedded-fatfs/src/file.rs | 3 +-- embedded-fatfs/src/fs.rs | 1 - embedded-fatfs/src/time.rs | 3 +-- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block-device-adapters/src/buf_stream.rs b/block-device-adapters/src/buf_stream.rs index 9336305..b504589 100644 --- a/block-device-adapters/src/buf_stream.rs +++ b/block-device-adapters/src/buf_stream.rs @@ -239,7 +239,7 @@ mod tests { use aligned::A4; use embedded_io_async::ErrorType; - use super::{BufStream, *}; + use super::*; struct TestBlockDevice(T); diff --git a/embedded-fatfs/src/dir_entry.rs b/embedded-fatfs/src/dir_entry.rs index 7cfe413..3e61c0e 100644 --- a/embedded-fatfs/src/dir_entry.rs +++ b/embedded-fatfs/src/dir_entry.rs @@ -1,6 +1,5 @@ use bitflags::bitflags; use core::char; -use core::convert::TryInto; use core::fmt; #[cfg(not(feature = "unicode"))] use core::iter; diff --git a/embedded-fatfs/src/file.rs b/embedded-fatfs/src/file.rs index 7dd1411..4b083fe 100644 --- a/embedded-fatfs/src/file.rs +++ b/embedded-fatfs/src/file.rs @@ -1,5 +1,4 @@ use core::cmp; -use core::convert::TryFrom; use crate::dir_entry::DirEntryEditor; use crate::error::Error; @@ -75,7 +74,7 @@ impl<'a, IO: ReadWriteSeek, TP, OCC> File<'a, IO, TP, OCC> { /// /// Prefer using [`DirEntry::try_to_file_with_context`](crate::dir_entry::DirEntry::try_to_file_with_context) where possible because /// it does some basic checks to avoid file corruption. - pub fn new_from_context(context: FileContext, fs: &'a FileSystem) -> Self { + pub(crate) fn new_from_context(context: FileContext, fs: &'a FileSystem) -> Self { File { context, fs } } diff --git a/embedded-fatfs/src/fs.rs b/embedded-fatfs/src/fs.rs index 03b8432..4f2fa11 100644 --- a/embedded-fatfs/src/fs.rs +++ b/embedded-fatfs/src/fs.rs @@ -2,7 +2,6 @@ use core::borrow::BorrowMut; use core::cell::{Cell, RefCell}; use core::char; use core::cmp; -use core::convert::TryFrom; use core::fmt::Debug; use core::marker::PhantomData; use core::u32; diff --git a/embedded-fatfs/src/time.rs b/embedded-fatfs/src/time.rs index cbd2f4c..15c8c7b 100644 --- a/embedded-fatfs/src/time.rs +++ b/embedded-fatfs/src/time.rs @@ -1,11 +1,10 @@ #![allow(deprecated)] #[cfg(feature = "chrono")] -use core::convert::TryFrom; use core::fmt::Debug; #[cfg(feature = "chrono")] -use chrono::{self, Datelike, Local, TimeZone, Timelike}; +use chrono::{Datelike, Local, TimeZone, Timelike}; const MIN_YEAR: u16 = 1980; const MAX_YEAR: u16 = 2107;