chore: update to rust 2018

src/objects/cookie.rs

@@ -8,7 +8,7 @@ pub struct Cookie<'a> {
 
 impl<'a> Cookie<'a> {
     pub fn parse(src: &'a str) -> Option<(Cookie<'a>, usize)> {
-        debug_assert!(src.starts_with("["));
+        debug_assert!(src.starts_with('['));
 
         let num1 = memchr2(b'%', b'/', src.as_bytes())
             .filter(|&i| src.as_bytes()[1..i].iter().all(|c| c.is_ascii_digit()))?;

src/objects/fn_ref.rs

@@ -7,10 +7,6 @@ pub struct FnRef<'a> {
     definition: Option<&'a str>,
 }
 
-fn valid_label(ch: &u8) -> bool {
-    ch.is_ascii_alphanumeric() || *ch == b'-' || *ch == b'_'
-}
-
 impl<'a> FnRef<'a> {
     pub fn parse(src: &'a str) -> Option<(FnRef<'a>, usize)> {
         debug_assert!(src.starts_with("[fn:"));
@@ -18,21 +14,24 @@ impl<'a> FnRef<'a> {
         let bytes = src.as_bytes();
         let label = memchr2(b']', b':', &bytes[4..])
             .map(|i| i + 4)
-            .filter(|&i| bytes[4..i].iter().all(valid_label))?;
+            .filter(|&i| {
+                bytes[4..i]
+                    .iter()
+                    .all(|&c| c.is_ascii_alphanumeric() || c == b'-' || c == b'_')
+            })?;
 
         if bytes[label] == b':' {
             let mut pairs = 1;
             let def = memchr2_iter(b'[', b']', &bytes[label..])
                 .map(|i| i + label)
-                .filter(|&i| {
+                .find(|&i| {
                     if bytes[i] == b'[' {
                         pairs += 1;
                     } else {
                         pairs -= 1;
                     }
                     pairs == 0
-                })
-                .next()?;
+                })?;
 
             Some((
                 FnRef {

src/objects/mod.rs

@@ -17,6 +17,7 @@ pub use self::link::Link;
 pub use self::macros::Macros;
 pub use self::snippet::Snippet;
 pub use self::target::{RadioTarget, Target};
+use jetscii::bytes;
 
 #[cfg_attr(test, derive(PartialEq, Debug))]
 pub enum Object<'a> {