commit 9c2fb0a75c77c7a9f8b8321ea91aa43d14a24ab3
author Alex Crichton <alex@alexcrichton.com> Fri May 26 08:49:31 2017 -0700
committer Alex Crichton <alex@alexcrichton.com> Fri May 26 08:49:31 2017 -0700
tree b5dafa5dc4237475762357668fda898bfa97b1ca
parent 46060dca49fc0f049e7407ce484e07b8ebe12767

Minor API tweaks

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index c28e09a..541e070 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,6 @@
 extern crate synom;
 
 use std::fmt;
-use std::ops;
 use std::str::FromStr;
 use std::iter::FromIterator;
 
@@ -140,10 +139,8 @@
     }
 }
 
-impl ops::Deref for Symbol {
-    type Target = str;
-
-    fn deref(&self) -> &str {
+impl Symbol {
+    fn as_str(&self) -> &str {
         &self.0
     }
 }
@@ -164,20 +161,28 @@
 }
 
 impl Literal {
-    pub fn bytechar(b: u8) -> Literal {
-        Literal(imp::Literal::bytechar(b))
+    pub fn byte_char(b: u8) -> Literal {
+        Literal(imp::Literal::byte_char(b))
     }
 
-    pub fn bytestring(s: &[u8]) -> Literal {
-        Literal(imp::Literal::bytestring(s))
+    pub fn byte_string(s: &[u8]) -> Literal {
+        Literal(imp::Literal::byte_string(s))
     }
 
     pub fn doccomment(s: &str) -> Literal {
         Literal(imp::Literal::doccomment(s))
     }
+
+    pub fn float(s: &str) -> Literal {
+        Literal(imp::Literal::float(s))
+    }
+
+    pub fn integer(s: &str) -> Literal {
+        Literal(imp::Literal::integer(s))
+    }
 }
 
-macro_rules! tys {
+macro_rules! froms {
     ($($t:ty,)*) => {$(
         impl<'a> From<$t> for Literal {
             fn from(t: $t) -> Literal {
@@ -187,7 +192,7 @@
     )*}
 }
 
-tys! {
+froms! {
     u8, u16, u32, u64, usize,
     i8, i16, i32, i64, isize,
     f32, f64, char, &'a str,