From 4f5db8fcfcec0e75a636aae1144cda79de1403b8 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Tue, 12 Mar 2019 17:40:23 +0100 Subject: [PATCH 1/2] feat: Alias level critical as fatal --- general/src/protocol/types.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/general/src/protocol/types.rs b/general/src/protocol/types.rs index 697bab87b2..b7b2d9c82c 100644 --- a/general/src/protocol/types.rs +++ b/general/src/protocol/types.rs @@ -515,7 +515,7 @@ impl FromStr for Level { "info" | "log" => Level::Info, "warning" => Level::Warning, "error" => Level::Error, - "fatal" => Level::Fatal, + "fatal" | "critical" => Level::Fatal, _ => return Err(ParseLevelError), }) } @@ -816,6 +816,10 @@ fn test_level() { Level::Warning, Annotated::::from_json("30").unwrap().0.unwrap() ); + assert_eq_dbg!( + Level::Fatal, + Annotated::::from_json("\"critical\"").unwrap().0.unwrap() + ); } #[test] From 255e74ab9a4be73f840384366aab767b8e9fd6de Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Tue, 12 Mar 2019 18:14:00 +0100 Subject: [PATCH 2/2] fix: formatting --- general/src/protocol/types.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/general/src/protocol/types.rs b/general/src/protocol/types.rs index b7b2d9c82c..efe6105161 100644 --- a/general/src/protocol/types.rs +++ b/general/src/protocol/types.rs @@ -818,7 +818,10 @@ fn test_level() { ); assert_eq_dbg!( Level::Fatal, - Annotated::::from_json("\"critical\"").unwrap().0.unwrap() + Annotated::::from_json("\"critical\"") + .unwrap() + .0 + .unwrap() ); }