Crack down on the whitespace violators

brson · Aug 21, 2015 · 1b6de4c · 1b6de4c
1 parent e5480cf
commit 1b6de4c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 6,9 @@ sudo: false
 script:
  - ./test.sh
  # Ensure no files are indented using tabs.
- - test $(git grep -l ' ' | wc -l) -eq 4
  - test $(git grep -F ' ' | grep -vE '(Binary file|\.travis\.yml|\.gitmodules)' | wc -l) -eq 0
  # Ensure there is no trailing whitespace.
  - test $(git grep -E '\s $' | grep -vF 'Binary file' | wc -l) -eq 0
 
 branches:
  only:

diff --git a/README.md b/README.md
@@ -175,8 175,8 @@ dynamic linking, even though the toolchains live in various places.
 It keeps Cargo's metadata isolated per toolchain via the `CARGO_HOME`
 environment variable.
 
-`multirust` saves settings and toolchains per user in `~/.multirust`. 
-The directory is initialized when using the `multirust` command to 
 `multirust` saves settings and toolchains per user in `~/.multirust`.
 The directory is initialized when using the `multirust` command to
 set the default channel, or when setting an override or updating for first time.
 
 # Can you trust Rust binaries?

diff --git a/src/multirust b/src/multirust
@@ -468,10 468,10 @@ handle_command_line_args() {
  show-override) show_override;;
  list-overrides) list_overrides;;
  list-toolchains) list_toolchains;;
- remove-override) 
- if [ -z "${2-}" ]; then 
  remove-override)
  if [ -z "${2-}" ]; then
  remove_override "$(pwd -P)"
- else 
  else
  remove_override $2
  fi
  ;;