Add support for older Rust versions (down to 1.25.0).

progval · progval · commit 844ccfdcb65b · 2018-06-21T01:44:02.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: rust
 rust:
+  - 1.25.0
   - stable
   - beta
   - nightly
diff --git a/src/ast.rs b/src/ast.rs
@@ -99,7 +99,7 @@ pub enum Uop {
 
 impl fmt::Display for Uop {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "{}", match self {
+        write!(f, "{}", match *self {
             Uop::Plus => "+",
             Uop::Minus => "-",
             Uop::Invert => "~",
@@ -144,7 +144,7 @@ pub enum Bop {
 
 impl fmt::Display for Bop {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "{}", match self {
+        write!(f, "{}", match *self {
             Bop::Add => "+",
             Bop::Sub => "-",
             Bop::Mult => "*",
@@ -290,7 +290,7 @@ pub enum AugAssignOp {
 
 impl fmt::Display for AugAssignOp {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "{}", match self {
+        write!(f, "{}", match *self {
             AugAssignOp::Add => "+=",
             AugAssignOp::Sub => "-=",
             AugAssignOp::Mult => "*=",
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -65,7 +65,7 @@ named!(pub spaces_nl<StrSpan, ()>,
 pub fn spaces_nonl(i: StrSpan) -> Result<(StrSpan, ()), ::nom::Err<StrSpan>> {
     let mut it = i.fragment.chars().enumerate().peekable();
     while let Some((index, c)) = it.next() {
-        let next_char = it.peek().map(|(_,c)|*c);
+        let next_char = it.peek().map(|&(_,c)|c);
         match c {
             ' ' | '\t' | '\x0c' => (),
             '\\' if next_char.unwrap_or(' ') == '\n' => {it.next();},
diff --git a/src/lib.rs b/src/lib.rs
@@ -22,7 +22,6 @@
 //! # Example
 //!
 //! ```
-//! extern crate python_parser;
 //! use python_parser::ast::*;
 //! let code = "print(2 + 3, fd=sys.stderr)";
 //! let ast = python_parser::file_input(python_parser::make_strspan(code))
diff --git a/src/strings.rs b/src/strings.rs
@@ -57,19 +57,13 @@ named!(escapedchar<StrSpan, Option<PyStringCodePoint>>,
         unicode_names2::character(&name.iter().collect::<String>()).map(cp_from_char)
       }
     | preceded!(char!('u'), count!(one_of!("0123456789abcdefABCDEF"), 4)) => { |v: Vec<char>| {
-        let it: Vec<u32> = v.iter().map(|c| c.to_digit(16).unwrap()).collect();
-        if let [d1, d2, d3, d4] = &it[..] {
-            cp_from_u32((d1 << 12) + (d2 << 8) + (d3 << 4) + d4)
-        }
-        else { unreachable!() }
+        let v: Vec<u32> = v.iter().map(|c| c.to_digit(16).unwrap()).collect();
+        cp_from_u32((v[0] << 12) + (v[1] << 8) + (v[2] << 4) + v[3])
       }}
     | preceded!(char!('U'), count!(one_of!("0123456789abcdefABCDEF"), 8)) => { |v: Vec<char>| {
-        let it: Vec<u32> = v.iter().map(|c| c.to_digit(16).unwrap()).collect();
-        if let [d1, d2, d3, d4, d5, d6, d7, d8] = &it[..] {
-            cp_from_u32((d1 << 28) + (d2 << 24) + (d3 << 20) + (d4 << 16) +
-                                  (d5 << 12) + (d6 << 8) + (d7 << 4) + d8)
-        }
-        else { unreachable!() }
+        let v: Vec<u32> = v.iter().map(|c| c.to_digit(16).unwrap()).collect();
+        cp_from_u32((v[0] << 28) + (v[1] << 24) + (v[2] << 20) + (v[3] << 16) +
+                    (v[4] << 12) + (v[5] << 8 ) + (v[6] << 4 ) + v[7])
       }}
     )
   )
diff --git a/src/visitors/printer.rs b/src/visitors/printer.rs

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 language: rust
 rust:
 +  - 1.25.0
   - stable
   - beta
   - nightly