Merge pull request #34 from google/clippy

Run clippy on all the code

Author: damienmg

.ci/build.sh

@@ -11,4 +11,7 @@ case "$1" in
   doc)
     cargo doc --all
     ;;
-esac
+  clippy)
+    cargo clippy --all-targets --all-features -- -D warnings
+    ;;
+esac

.ci/setup.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
-if [ "$1" == "format" ]; then
-  echo "Installing rustfmt..."
-  rustup toolchain install nightly
-  rustup component add --toolchain nightly rustfmt-preview
-  which rustfmt || cargo install --force rustfmt-nightly
-  cargo +nightly fmt -- --version
-fi
+case "$1" in
+  format)
+    echo "Installing rustfmt..."
+    rustup component add --toolchain nightly rustfmt-preview
+    which rustfmt || cargo install --force rustfmt-nightly
+    cargo +nightly fmt -- --version
+    ;;
+  clippy)
+    echo "Installing clippy..."
+    rustup component add clippy --toolchain=nightly || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
+    ;;
+esac

.travis.yml

@@ -11,6 +11,9 @@ matrix:
   - name: "Rust: format"
     env: ACTION=format
     rust: nightly
+  - name: "Rust: clippy"
+    env: ACTION=clippy
+    rust: nightly
   - name: "Rust: doc"
     env: ACTION=doc
     rust: stable

starlark-repl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "starlark-repl"
-version = "0.2.0"
+version = "0.3.0-pre"
 authors = ["Damien Martin-Guillerez <[email protected]>"]
 
 description = "A REPL for the implementation in Rust of the Starlark language."
@@ -21,7 +21,7 @@ codemap = "0.1.1"
 codemap-diagnostic = "0.1"
 getopts = "0.2"
 linefeed = "0.5.3"
-starlark = { version = "0.2", path = "../starlark" }
+starlark = { path = "../starlark" }
 
 [lib]
 

starlark-repl/src/lib.rs

@@ -109,7 +109,7 @@ pub fn repl(global_environment: &Environment, dialect: Dialect) {
     reader.set_prompt(">>> ").unwrap();
 
     while let Ok(ReadResult::Input(input)) = reader.read_line() {
-        if input.len() != 0 {
+        if !input.is_empty() {
             reader.set_prompt("... ").unwrap();
             n += 1;
             let input = input + "\n";

starlark/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "starlark"
-version = "0.2.0"
+version = "0.3.0-pre"
 authors = ["Damien Martin-Guillerez <[email protected]>"]
 build = "build.rs"
 

starlark/src/environment/mod.rs

@@ -24,9 +24,9 @@ use values::*;
 
 // TODO: move that code in some common error code list?
 // CM prefix = Critical Module
-const FROZEN_ENV_ERROR_CODE: &'static str = "CM00";
-const NOT_FOUND_ERROR_CODE: &'static str = "CM01";
-const CANNOT_IMPORT_ERROR_CODE: &'static str = "CE02";
+const FROZEN_ENV_ERROR_CODE: &str = "CM00";
+const NOT_FOUND_ERROR_CODE: &str = "CM01";
+const CANNOT_IMPORT_ERROR_CODE: &str = "CE02";
 
 #[derive(Debug)]
 #[doc(hidden)]
@@ -207,7 +207,7 @@ impl EnvironmentContent {
     /// Get the value of the variable `name`
     pub fn get(&self, name: &str) -> Result<Value, EnvironmentError> {
         if self.variables.contains_key(name) {
-            Ok(self.variables.get(name).unwrap().clone())
+            Ok(self.variables[name].clone())
         } else {
             match self.parent {
                 Some(ref p) => p.get(name),
@@ -233,7 +233,7 @@ impl EnvironmentContent {
     pub fn get_type_value(&self, obj: &Value, id: &str) -> Option<Value> {
         match self.type_objs.get(obj.get_type()) {
             Some(ref d) => match d.get(id) {
-                Some(&ref v) => Some(v.clone()),
+                Some(v) => Some(v.clone()),
                 None => match self.parent {
                     Some(ref p) => p.get_type_value(obj, id),
                     None => None,
@@ -254,12 +254,10 @@ impl EnvironmentContent {
                 r.push(k.clone());
             }
             r
+        } else if let Some(ref p) = self.parent {
+            p.list_type_value(obj)
         } else {
-            if let Some(ref p) = self.parent {
-                p.list_type_value(obj)
-            } else {
-                Vec::new()
-            }
+            Vec::new()
         }
     }