summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-07-02 22:01:50 +0200
committerGitHub <noreply@github.com>2018-07-02 22:01:50 +0200
commita138dd408dfab3325bd5513c7b5b035853e2b351 (patch)
tree1d553647377399c7b90fbbf98d00257763fa2bd9
parentc8da09f687c83bd6ec920d242c74917f2720a36b (diff)
parente0156bf4adc1d28f7b41a9266472c1ea6e38dfca (diff)
downloadimag-a138dd408dfab3325bd5513c7b5b035853e2b351.zip
imag-a138dd408dfab3325bd5513c7b5b035853e2b351.tar.gz
Merge pull request #1498 from matthiasbeyer/update-rustc
Update rustc in travis
-rw-r--r--.travis.yml4
-rw-r--r--bin/domain/imag-habit/src/main.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 8a05e2a..297ab4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,14 +16,14 @@ matrix:
- bash ./scripts/branch-contains-no-tmp-commits
- bash ./scripts/version-updated
- language: rust
- rust: 1.24.0
+ rust: 1.25.0
cache:
cargo: true
script:
- cargo build --all --all-features -j 1 || exit 1
- cargo test --all --all-features -j 1 || exit 1
- language: rust
- rust: 1.25.0
+ rust: 1.26.0
cache:
cargo: true
script:
diff --git a/bin/domain/imag-habit/src/main.rs b/bin/domain/imag-habit/src/main.rs
index 218a0d6..6d195ba 100644
--- a/bin/domain/imag-habit/src/main.rs
+++ b/bin/domain/imag-habit/src/main.rs
@@ -197,7 +197,7 @@ fn delete(rt: &Runtime) {
}
};
- fle
+ let _ = fle
.linked_instances()
.map_err_trace_exit_unwrap(1)
.trace_unwrap_exit(1)