Upgrade to 2018 edition

Cargo.toml

@@ -6,6 +6,7 @@ authors     = ["Casey Rodarmor <casey@rodarmor.com>"]
 license     = "CC0-1.0"
 homepage    = "https://github.com/casey/just"
 readme      = "crates-io-readme.md"
+edition     = "2018"
 
 [dependencies]
 ansi_term      = "0.11"

justfile

@@ -70,7 +70,7 @@ install-dev-deps:
 
 # everyone's favorite animate paper clip
 clippy:
-	cargo +nightly clippy
+	cargo clippy
 
 # count non-empty lines of code
 sloc:

src/assignment_evaluator.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 use brev;
 
@@ -164,9 +164,8 @@ impl<'a, 'b> AssignmentEvaluator<'a, 'b> {
 #[cfg(test)]
 mod test {
   use super::*;
+  use crate::testing::parse_success;
   use brev::OutputError;
-  use testing::parse_success;
-  use Configuration;
 
   fn no_cwd_err() -> Result<PathBuf, String> {
     Err(String::from("no cwd in tests"))

src/assignment_resolver.rs

@@ -1,6 +1,6 @@
-use common::*;
+use crate::common::*;
 
-use CompilationErrorKind::*;
+use crate::CompilationErrorKind::*;
 
 pub struct AssignmentResolver<'a: 'b, 'b> {
   assignments: &'b Map<&'a str, Expression<'a>>,

src/color.rs

@@ -1,7 +1,7 @@
 extern crate ansi_term;
 extern crate atty;
 
-use common::*;
+use crate::common::*;
 
 use self::ansi_term::Color::*;
 use self::ansi_term::{ANSIGenericString, Prefix, Style, Suffix};

src/command_ext.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 pub trait CommandExt {
   fn export_environment_variables<'a>(

src/common.rs

@@ -1,38 +1,52 @@
-pub use std::borrow::Cow;
-pub use std::collections::{BTreeMap as Map, BTreeSet as Set};
-pub use std::fmt::Display;
-pub use std::io::prelude::*;
-pub use std::ops::Range;
-pub use std::path::{Path, PathBuf};
-pub use std::process::Command;
-pub use std::sync::{Mutex, MutexGuard};
-pub use std::{cmp, env, fmt, fs, io, iter, process, usize, vec};
+pub(crate) use std::{
+  borrow::Cow,
+  cmp,
+  collections::{BTreeMap as Map, BTreeSet as Set},
+  env, fmt,
+  fmt::Display,
+  fs, io, iter,
+  ops::{Range, RangeInclusive},
+  path::{Path, PathBuf},
+  process,
+  process::Command,
+  sync::{Mutex, MutexGuard},
+  usize, vec,
+};
 
-pub use color::Color;
-pub use libc::{EXIT_FAILURE, EXIT_SUCCESS};
-pub use regex::Regex;
-pub use tempdir::TempDir;
+pub(crate) use crate::color::Color;
+pub(crate) use libc::{EXIT_FAILURE, EXIT_SUCCESS};
+pub(crate) use regex::Regex;
+pub(crate) use tempdir::TempDir;
 
-pub use assignment_evaluator::AssignmentEvaluator;
-pub use assignment_resolver::AssignmentResolver;
-pub use command_ext::CommandExt;
-pub use compilation_error::{CompilationError, CompilationErrorKind, CompilationResult};
-pub use configuration::Configuration;
-pub use cooked_string::CookedString;
-pub use expression::Expression;
-pub use fragment::Fragment;
-pub use function::{evaluate_function, resolve_function, FunctionContext};
-pub use interrupt_handler::InterruptHandler;
-pub use justfile::Justfile;
-pub use lexer::Lexer;
-pub use load_dotenv::load_dotenv;
-pub use misc::{default, empty};
-pub use parameter::Parameter;
-pub use parser::Parser;
-pub use range_ext::RangeExt;
-pub use recipe::{Recipe, RecipeContext};
-pub use recipe_resolver::RecipeResolver;
-pub use runtime_error::{RunResult, RuntimeError};
-pub use shebang::Shebang;
-pub use token::{Token, TokenKind};
-pub use verbosity::Verbosity;
+pub(crate) use crate::{
+  assignment_evaluator::AssignmentEvaluator,
+  assignment_resolver::AssignmentResolver,
+  compilation_error::{CompilationError, CompilationErrorKind, CompilationResult},
+  configuration::Configuration,
+  cooked_string::CookedString,
+  expression::Expression,
+  fragment::Fragment,
+  function::{evaluate_function, resolve_function, FunctionContext},
+  interrupt_handler::InterruptHandler,
+  justfile::Justfile,
+  lexer::Lexer,
+  load_dotenv::load_dotenv,
+  misc::{default, empty},
+  parameter::Parameter,
+  parser::Parser,
+  recipe::{Recipe, RecipeContext},
+  recipe_resolver::RecipeResolver,
+  runtime_error::{RunResult, RuntimeError},
+  shebang::Shebang,
+  token::{Token, TokenKind},
+  verbosity::Verbosity,
+};
+
+#[allow(unused_imports)]
+pub(crate) use std::io::prelude::*;
+
+#[allow(unused_imports)]
+pub(crate) use crate::command_ext::CommandExt;
+
+#[allow(unused_imports)]
+pub(crate) use crate::range_ext::RangeExt;

src/compilation_error.rs

@@ -1,6 +1,6 @@
-use common::*;
+use crate::common::*;
 
-use misc::{maybe_s, show_whitespace, write_error_context, Or};
+use crate::misc::{maybe_s, show_whitespace, write_error_context, Or};
 
 pub type CompilationResult<'a, T> = Result<T, CompilationError<'a>>;
 
@@ -92,7 +92,7 @@ pub enum CompilationErrorKind<'a> {
 
 impl<'a> Display for CompilationError<'a> {
   fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-    use CompilationErrorKind::*;
+    use crate::CompilationErrorKind::*;
     let error = Color::fmt(f).error();
     let message = Color::fmt(f).message();
 

src/configuration.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 pub const DEFAULT_SHELL: &str = "sh";
 

src/cooked_string.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 #[derive(PartialEq, Debug)]
 pub struct CookedString<'a> {

src/expression.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 #[derive(PartialEq, Debug)]
 pub enum Expression<'a> {

src/fragment.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 #[derive(PartialEq, Debug)]
 pub enum Fragment<'a> {

src/function.rs

@@ -1,8 +1,8 @@
-use common::*;
+use crate::common::*;
 
 use target;
 
-use platform::{Platform, PlatformInterface};
+use crate::platform::{Platform, PlatformInterface};
 
 lazy_static! {
   static ref FUNCTIONS: Map<&'static str, Function> = vec![

src/interrupt_handler.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 use ctrlc;
 

src/justfile.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 use edit_distance::edit_distance;
 
@@ -186,8 +186,8 @@ impl<'a> Display for Justfile<'a> {
 #[cfg(test)]
 mod test {
   use super::*;
-  use testing::parse_success;
-  use RuntimeError::*;
+  use crate::testing::parse_success;
+  use crate::RuntimeError::*;
 
   fn no_cwd_err() -> Result<PathBuf, String> {
     Err(String::from("no cwd in tests"))

src/lexer.rs

@@ -1,7 +1,7 @@
-use common::*;
+use crate::common::*;
 
-use CompilationErrorKind::*;
-use TokenKind::*;
+use crate::CompilationErrorKind::*;
+use crate::TokenKind::*;
 
 fn re(pattern: &str) -> Regex {
   Regex::new(pattern).unwrap()
@@ -321,7 +321,7 @@ impl<'a> Lexer<'a> {
         if escape || content_end >= self.rest.len() {
           return Err(self.error(UnterminatedString));
         }
-        (prefix, &self.rest[start..content_end + 1], StringToken)
+        (prefix, &self.rest[start..=content_end], StringToken)
       } else {
         return Err(self.error(UnknownStartOfToken));
       };
@@ -383,7 +383,7 @@ mod test {
       fn $name() {
         let input = $input;
         let expected = $expected;
-        let tokens = ::Lexer::lex(input).unwrap();
+        let tokens = crate::Lexer::lex(input).unwrap();
         let roundtrip = tokens
           .iter()
           .map(|t| {

src/lib.rs

@@ -55,6 +55,6 @@ mod shebang;
 mod token;
 mod verbosity;
 
-use common::*;
+use crate::common::*;
 
-pub use run::run;
+pub use crate::run::run;

src/load_dotenv.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 use dotenv;
 

src/misc.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 use unicode_width::UnicodeWidthChar;
 

src/parameter.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 #[derive(PartialEq, Debug)]
 pub struct Parameter<'a> {

src/parser.rs

@@ -1,8 +1,8 @@
-use common::*;
+use crate::common::*;
 
 use itertools;
-use CompilationErrorKind::*;
-use TokenKind::*;
+use crate::CompilationErrorKind::*;
+use crate::TokenKind::*;
 
 pub struct Parser<'a> {
   text: &'a str,
@@ -449,7 +449,7 @@ impl<'a> Parser<'a> {
 mod test {
   use super::*;
   use brev;
-  use testing::parse_success;
+  use crate::testing::parse_success;
 
   macro_rules! summary_test {
     ($name:ident, $input:expr, $expected:expr $(,)*) => {

src/platform.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 use brev;
 

src/range_ext.rs

@@ -1,4 +1,4 @@
-use common::*;
+use crate::common::*;
 
 pub trait RangeExt<T> {
   fn range_contains(&self, i: T) -> bool;
@@ -13,16 +13,34 @@ where
   }
 }
 
+impl<T> RangeExt<T> for RangeInclusive<T>
+where
+  T: PartialOrd + Copy,
+{
+  fn range_contains(&self, i: T) -> bool {
+    i >= *self.start() && i <= *self.end()
+  }
+}
+
 #[cfg(test)]
 mod test {
   use super::*;
 
   #[test]
-  fn range() {
+  fn exclusive() {
     assert!((0..1).range_contains(0));
     assert!((10..20).range_contains(15));
     assert!(!(0..0).range_contains(0));
     assert!(!(1..10).range_contains(0));
     assert!(!(1..10).range_contains(10));
   }
+
+  #[test]
+  fn inclusive() {
+    assert!((0..=1).range_contains(0));
+    assert!((10..=20).range_contains(15));
+    assert!((0..=0).range_contains(0));
+    assert!(!(1..=10).range_contains(0));
+    assert!((1..=10).range_contains(10));
+  }
 }