From 9bfac330f8d0dc4a2599f40696d555abfccb6c39 Mon Sep 17 00:00:00 2001
From: Mark Schmale <m.schmale@uniorg.de>
Date: Thu, 13 Sep 2018 10:49:47 +0200
Subject: [PATCH] refactor(format_parser): do not include the '$' in the
 variable name.

if we don't include it, we don't need to trim it away.
---
 src/format.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/format.rs b/src/format.rs
index f921102..50da261 100644
--- a/src/format.rs
+++ b/src/format.rs
@@ -121,10 +121,10 @@ impl FormatPart {
         match self {
             Variable(name) => format!(
                 "(?P<{}>{})",
-                name.trim_left_matches('$'),
+                name,
                 match name.as_str() {
-                    "$status" => "\\d{3}",
-                    "$body_bytes_sent" => "\\d+",
+                    "status" => "\\d{3}",
+                    "body_bytes_sent" => "\\d+",
                     _ => ".*",
                 }
             ),
@@ -150,7 +150,7 @@ fn read_byte(chr: u8, index: usize, state: &FormatParserState) -> FormatParserSt
     use format::FormatParserState::*;
     match state {
         Start => match chr {
-            b'$' => Variable(index, index + 1),
+            b'$' => Variable(index + 1, index + 1),
             _ => Fixed(index, index + 1),
         },
         Variable(start, _end) => match chr {
@@ -159,7 +159,7 @@ fn read_byte(chr: u8, index: usize, state: &FormatParserState) -> FormatParserSt
             _ => Fixed(index, index + 1),
         },
         Fixed(start, _end) => match chr {
-            b'$' => Variable(index, index + 1),
+            b'$' => Variable(index + 1, index + 1),
             _ => Fixed(*start, index + 1),
         },
     }
@@ -217,23 +217,23 @@ mod test {
         let format = Format::from_str(format_input).unwrap();
 
         assert_eq!(
-            Some(&Variable(String::from("$remote_addr"))),
+            Some(&Variable(String::from("remote_addr"))),
             format.parts.get(0)
         );
         assert_eq!(Some(&Fixed(String::from(" - "))), format.parts.get(1));
         assert_eq!(
-            Some(&Variable(String::from("$remote_user"))),
+            Some(&Variable(String::from("remote_user"))),
             format.parts.get(2)
         );
         assert_eq!(Some(&Fixed(String::from(" ["))), format.parts.get(3));
         assert_eq!(
-            Some(&Variable(String::from("$time_local"))),
+            Some(&Variable(String::from("time_local"))),
             format.parts.get(4)
         );
         assert_eq!(Some(&Fixed(String::from(r#"] ""#))), format.parts.get(5));
         assert_eq!(Some(&Fixed(String::from(r#"] ""#))), format.parts.get(5));
         assert_eq!(
-            Some(&Variable(String::from("$request"))),
+            Some(&Variable(String::from("request"))),
             format.parts.get(6)
         );
         assert_eq!(Some(&Fixed(String::from(r#"" ""#))), format.parts.get(15));