Update to 2018 edition

Cargo.toml

@@ -15,16 +15,17 @@ homepage = "https://soft.github.io/run-or-raise/"
 repository = "https://github.com/Soft/run-or-raise"
 version = "0.3.1"
 exclude = ["_config.yml"]
+edition = "2018"
 
 [badges.travis-ci]
 repository = "Soft/run-or-raise"
 
 [dependencies]
 encoding = "0.2.33"
-failure = "0.1.1"
-lazy_static = "1.0.0"
+failure = "0.1.3"
+lazy_static = "1.2.0"
 nom = "3.2.1"
-regex = "0.2.7"
+regex = "1.1.0"
 termion = "1.5.1"
 xcb = "0.8.2"
 

README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/Soft/run-or-raise.svg?branch=master)](https://travis-ci.org/Soft/run-or-raise)
 [![Latest Version](https://img.shields.io/crates/v/run-or-raise.svg)](https://crates.io/crates/run-or-raise)
 [![GitHub release](https://img.shields.io/github/release/Soft/run-or-raise.svg)](https://github.com/Soft/run-or-raise/releases)
+[![dependency status](https://deps.rs/repo/github/soft/run-or-raise/status.svg)](https://deps.rs/repo/github/soft/run-or-raise)
 [![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/crate/run-or-raise)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 

src/conditions.rs

@@ -2,7 +2,7 @@ use regex::Regex;
 use xcb::{self, Connection, Window};
 use failure::{Error, err_msg};
 
-use windows::{get_string_property, get_atom};
+use crate::windows::{get_string_property, get_atom};
 
 #[derive(Debug,PartialEq)]
 pub enum Property {

src/main.rs

@@ -1,14 +1,3 @@
-extern crate xcb;
-extern crate regex;
-extern crate encoding;
-extern crate termion;
-extern crate failure;
-
-#[macro_use]
-extern crate nom;
-#[macro_use]
-extern crate lazy_static;
-
 mod parsing;
 mod windows;
 mod conditions;

src/parsing.rs

@@ -1,8 +1,8 @@
-use nom::{IError, space};
+use nom::*;
 use std::str::FromStr;
 use regex::Regex;
 
-use conditions::*;
+use crate::conditions::*;
 
 named!(property<&str, Property>,
        alt_complete!(value!(Property::Class, tag_s!("class"))

src/windows.rs

@@ -3,8 +3,9 @@ use std::sync::Mutex;
 use std::collections::HashMap;
 use encoding::{Encoding, DecoderTrap};
 use encoding::all::ISO_8859_1;
-use conditions::Condition;
+use crate::conditions::Condition;
 use failure::{Error, err_msg};
+use lazy_static::*;
 
 const XCB_EWMH_CLIENT_SOURCE_TYPE_OTHER: u32 = 2;
 
@@ -21,7 +22,7 @@ impl<'a> WindowTreeIter<'a> {
     fn new(conn: &'a Connection, win: Window) -> Result<WindowTreeIter<'a>, xcb::GenericError> {
         let reply = xcb::query_tree(conn, win).get_reply()?;
         Ok(WindowTreeIter {
-            conn: conn,
+            conn,
             stack: reply.children().to_owned(),
         })
     }