Skip to content

Commit

Permalink
Switch to nightly build of Rust
Browse files Browse the repository at this point in the history
  • Loading branch information
danielpclark committed Dec 6, 2017
1 parent ab754c1 commit 63c6a27
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ language: rust
os:
- linux
rust:
- stable
- beta
- nightly
before_install:
- wget https://www.aescrypt.com/download/v3/linux/aescrypt-3.13.tgz
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ a secondary system.

## Installation

_abrute needs the nightly build of Rust for the TryFrom trait._

To use the install script you need to have the following commands available on your
system `curl wget unzip sudo cc` and possibly other build essentials for C.

Expand Down Expand Up @@ -58,7 +60,7 @@ cd ../.. && rm -rf aescrypt-3.13
Next you need to have [Rust installed](https://www.rust-lang.org/en-US/install.html).

```bash
curl https://sh.rustup.rs -sSf | sh
curl https://sh.rustup.rs -sSf | sh -s -- --channel=nightly
```

Then you can get and compile abrute.
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ else
if [ "$Rust_answer" == "y" ];
then
# User agreed, proceed with installation
curl https://sh.rustup.rs -sSf | sh
curl https://sh.rustup.rs -sSf | sh -s -- --channel=nightly
else
# User refused, abort installation
exit 1
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ USE OF THIS BINARY FALLS UNDER THE MIT LICENSE (c) 2017").

// Begin Resume Feature
let starting = sequencer.to_s();
use ::resume::{ResumeKey,ResumeFile};
use ::resume::{ResumeKey,ResumeFile};
let cli_key = ResumeKey::new(
resume_key_chars.clone(),
adjacent.map(str::to_string),
Expand Down
2 changes: 1 addition & 1 deletion src/resume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ fn input_and_output_for_resume_works() {

let keys = ResumeKeyDB::get(".example.res".to_string());
let k = keys.rkeys.iter().next();
assert_eq!(Some(&r), k);
assert_eq!(Some(&r), k);

let _a = fs::remove_file(".example.res");
assert!(!Path::new(".example.res").exists(), "`.example.res` cleanup failed!");
Expand Down

0 comments on commit 63c6a27

Please sign in to comment.