From 4f9ee69ab6ef48b9dd96a88fc8909da305bb3d09 Mon Sep 17 00:00:00 2001
From: acdenisSK <acdenissk69@gmail.com>
Date: Thu, 19 Jul 2018 11:15:26 +0200
Subject: Merge `Token` and `TokenOwned`

---
 src/framework/standard/args.rs | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'src/framework')

diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs
index 17ee460..b58879b 100644
--- a/src/framework/standard/args.rs
+++ b/src/framework/standard/args.rs
@@ -87,37 +87,21 @@ enum TokenKind {
     QuotedArgument,
 }
 
-#[derive(Debug)]
-struct Token<'a> {
-    lit: &'a str,
-    kind: TokenKind,
-    pos: usize,
-}
-
-impl<'a> Token<'a> {
-    fn new(kind: TokenKind, lit: &'a str, pos: usize) -> Self {
-        Token { kind, lit, pos }
-    }
-}
-
 #[derive(Debug, Clone)]
-struct TokenOwned {
+struct Token {
     kind: TokenKind,
     lit: String,
+    // start position
     pos: usize,
 }
 
-impl<'a> Token<'a> {
-    fn to_owned(&self) -> TokenOwned {
-        TokenOwned {
-            kind: self.kind,
-            lit: self.lit.to_string(),
-            pos: self.pos,
-        }
+impl Token {
+    fn new(kind: TokenKind, lit: &str, pos: usize) -> Self {
+        Token { kind, lit: lit.to_string(), pos }
     }
 }
 
-impl PartialEq<TokenKind> for TokenOwned {
+impl PartialEq<TokenKind> for Token {
     fn eq(&self, other: &TokenKind) -> bool {
         self.kind == *other
     }
@@ -161,7 +145,7 @@ impl<'a> Lexer<'a> {
         Some(())
     }
 
-    fn commit(&mut self) -> Option<Token<'a>> {
+    fn commit(&mut self) -> Option<Token> {
         if self.at_end() {
             return None;
         }
@@ -290,7 +274,7 @@ impl<'a> Lexer<'a> {
 #[derive(Clone, Debug)]
 pub struct Args {
     message: String,
-    args: Vec<TokenOwned>,
+    args: Vec<Token>,
     offset: usize,
 }
 
@@ -338,7 +322,7 @@ impl Args {
                 continue;
             }
 
-            args.push(token.to_owned());
+            args.push(token);
         }
 
         Args {
@@ -966,7 +950,7 @@ impl<'a, T: FromStr> Iterator for IterQuoted<'a, T> where T::Err: StdError  {
     }
 }
 
-fn quotes_extract(token: &TokenOwned) -> &str {
+fn quotes_extract(token: &Token) -> &str {
     if token.kind == TokenKind::QuotedArgument {
         &token.lit[1..token.lit.len() - 1]
     } else {
-- 
cgit v1.2.3