From 7fa0ee885e8b6169fc5fd76b9759b04a9d7ce2b1 Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sun, 26 Jan 2020 16:23:37 -0500 Subject: [PATCH] Refactor QuoteKind to common.rs --- src/common.rs | 17 +++++++++++++++++ src/value.rs | 19 +------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/common.rs b/src/common.rs index a09875a..6003c3c 100644 --- a/src/common.rs +++ b/src/common.rs @@ -359,3 +359,20 @@ impl Scope { self.functions.extend(other.functions); } } + +#[derive(Debug, Copy, Clone, Eq, PartialEq)] +pub(crate) enum QuoteKind { + Single, + Double, + None, +} + +impl QuoteKind { + pub fn as_str(self) -> &'static str { + match self { + Self::Single => "'", + Self::Double => "\"", + Self::None => "", + } + } +} diff --git a/src/value.rs b/src/value.rs index e86acbe..a12e6d3 100644 --- a/src/value.rs +++ b/src/value.rs @@ -6,7 +6,7 @@ use std::ops::Add; use crate::args::eat_call_args; use crate::builtin::GLOBAL_FUNCTIONS; use crate::color::Color; -use crate::common::{Keyword, Op, Scope, Symbol}; +use crate::common::{Keyword, Op, QuoteKind, Scope, Symbol}; use crate::units::Unit; use crate::utils::{devour_whitespace_or_comment, eat_interpolation}; use crate::{Token, TokenKind}; @@ -64,23 +64,6 @@ impl Display for ListSeparator { } } -#[derive(Debug, Copy, Clone, Eq, PartialEq)] -pub(crate) enum QuoteKind { - Single, - Double, - None, -} - -impl QuoteKind { - pub fn as_str(self) -> &'static str { - match self { - Self::Single => "'", - Self::Double => "\"", - Self::None => "", - } - } -} - #[derive(Debug, Clone, Eq, PartialEq)] pub(crate) enum Value { Important,