From 8e485bc77aaa49d41063853f83ab6017d334939e Mon Sep 17 00:00:00 2001 From: lyuts Date: Sat, 18 Nov 2023 15:19:46 -0800 Subject: [PATCH] aya-log-parser: add support of :p format --- aya-log-parser/src/lib.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/aya-log-parser/src/lib.rs b/aya-log-parser/src/lib.rs index 8e4f30a7..cdce04e0 100644 --- a/aya-log-parser/src/lib.rs +++ b/aya-log-parser/src/lib.rs @@ -55,7 +55,7 @@ fn push_literal(frag: &mut Vec, unescaped_literal: &str) -> Result<(), /// Parses the display hint (e.g. the `ipv4` in `{:ipv4}`). fn parse_display_hint(s: &str) -> Result { Ok(match s { - "x" => DisplayHint::LowerHex, + "p" | "x" => DisplayHint::LowerHex, "X" => DisplayHint::UpperHex, "i" => DisplayHint::Ip, "mac" => DisplayHint::LowerMac, @@ -145,7 +145,7 @@ mod test { #[test] fn test_parse() { assert_eq!( - parse("foo {} bar {:x} test {:X} ayy {:i} lmao {{}} {{something}}"), + parse("foo {} bar {:x} test {:X} ayy {:i} lmao {{}} {{something}} {:p}"), Ok(vec![ Fragment::Literal("foo ".into()), Fragment::Parameter(Parameter { @@ -163,7 +163,10 @@ mod test { Fragment::Parameter(Parameter { hint: DisplayHint::Ip }), - Fragment::Literal(" lmao {} {something}".into()), + Fragment::Literal(" lmao {} {something} ".into()), + Fragment::Parameter(Parameter { + hint: DisplayHint::LowerHex + }), ]) ); assert!(parse("foo {:}").is_err());