fix

examples/fn_layout_filter.rs

@@ -13,12 +13,12 @@
 // limitations under the License.
 
 use log::LevelFilter;
-use logforth::{
-    append,
-    filter::{CustomFilter, FilterResult},
-    layout::CustomLayout,
-    Dispatch, Logger,
-};
+use logforth::append;
+use logforth::filter::CustomFilter;
+use logforth::filter::FilterResult;
+use logforth::layout::CustomLayout;
+use logforth::Dispatch;
+use logforth::Logger;
 
 fn main() {
     Logger::new()

examples/json_stdio.rs

@@ -14,10 +14,9 @@
 
 use log::LevelFilter;
 use logforth::append;
-use logforth::filter;
 use logforth::layout;
-use logforth::logger::Dispatch;
-use logforth::logger::Logger;
+use logforth::Dispatch;
+use logforth::Logger;
 
 fn main() {
     Logger::new()

examples/rolling_file.rs

@@ -13,14 +13,13 @@
 // limitations under the License.
 
 use log::LevelFilter;
-use logforth::append;
-use logforth::append::NonBlockingBuilder;
-use logforth::append::RollingFileWriter;
-use logforth::append::Rotation;
-use logforth::filter;
-use logforth::layout;
-use logforth::logger::Dispatch;
-use logforth::logger::Logger;
+use logforth::append::rolling_file::NonBlockingBuilder;
+use logforth::append::rolling_file::RollingFile;
+use logforth::append::rolling_file::RollingFileWriter;
+use logforth::append::rolling_file::Rotation;
+use logforth::layout::JsonLayout;
+use logforth::Dispatch;
+use logforth::Logger;
 
 fn main() {
     let rolling = RollingFileWriter::builder()
@@ -36,8 +35,8 @@ fn main() {
         .dispatch(
             Dispatch::new()
                 .filter(LevelFilter::Trace)
-                .layout(layout::JsonLayout)
-                .append(append::RollingFile::new(writer)),
+                .layout(JsonLayout)
+                .append(RollingFile::new(writer)),
         )
         .apply()
         .unwrap();

examples/simple_stdio.rs

@@ -12,14 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use log::Level;
-use logforth::{append, filter::MinLevel, layout::TextLayout, Dispatch, Logger};
+use log::LevelFilter;
+use logforth::append;
+use logforth::layout::TextLayout;
+use logforth::Dispatch;
+use logforth::Logger;
 
 fn main() {
     Logger::new()
         .dispatch(
             Dispatch::new()
-                .filter(MinLevel(Level::Trace))
+                .filter(LevelFilter::Trace)
                 .layout(TextLayout::default())
                 .append(append::Stdout),
         )

rustfmt.toml

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# comment_width = 120
-# format_code_in_doc_comments = true
-# group_imports = "StdExternalCrate"
-# imports_granularity = "Item"
-# wrap_comments = true
+comment_width = 120
+format_code_in_doc_comments = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Item"
+wrap_comments = true

src/append/opentelemetry.rs

@@ -17,8 +17,10 @@ use std::time::Duration;
 use std::time::SystemTime;
 
 use log::Record;
-use opentelemetry::logs::{AnyValue, LoggerProvider as ILoggerProvider};
-use opentelemetry::logs::{Logger, Severity};
+use opentelemetry::logs::AnyValue;
+use opentelemetry::logs::Logger;
+use opentelemetry::logs::LoggerProvider as ILoggerProvider;
+use opentelemetry::logs::Severity;
 use opentelemetry::InstrumentationLibrary;
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::logs::LoggerProvider;

src/filter/min_level.rs

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use log::Level;
+use log::LevelFilter;
 use log::Metadata;
 
 use crate::filter::Filter;
 use crate::filter::FilterResult;
 
 #[derive(Debug, Clone)]
-pub struct MinLevel(pub Level);
+pub struct MinLevel(pub LevelFilter);
 
 impl MinLevel {
     pub(crate) fn filter(&self, metadata: &Metadata) -> FilterResult {
@@ -37,8 +37,8 @@ impl From<MinLevel> for Filter {
     }
 }
 
-impl From<Level> for Filter {
-    fn from(filter: Level) -> Self {
+impl From<LevelFilter> for Filter {
+    fn from(filter: LevelFilter) -> Self {
         Filter::MinLevel(MinLevel(filter))
     }
 }

src/filter/mod.rs

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub use self::{custom::CustomFilter, min_level::MinLevel};
+pub use self::custom::CustomFilter;
+pub use self::min_level::MinLevel;
 
 mod custom;
 mod min_level;

src/layout/custom.rs

@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::fmt::{Arguments, Debug, Formatter};
+use std::fmt::Arguments;
+use std::fmt::Debug;
+use std::fmt::Formatter;
 
 use crate::layout::Layout;
 

src/layout/identical.rs

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::layout::Layout;
 use std::fmt::Arguments;
 
+use crate::layout::Layout;
+
 #[derive(Debug, Default, Clone, Copy)]
 pub struct IdenticalLayout;
 

src/layout/json.rs

@@ -86,6 +86,6 @@ impl JsonLayout {
 
 impl From<JsonLayout> for Layout {
     fn from(layout: JsonLayout) -> Self {
-        Layout::JsonLayout(layout)
+        Layout::Json(layout)
     }
 }