diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-24 13:34:19 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-24 13:34:19 +0000 |
commit | abb9bfe44dfe1fb0685ead5e000ed281c55c8968 (patch) | |
tree | da9abcbbf5998732960fba0e73b7407bf1f90024 | |
parent | f092bb377e96f7e5b4b0cc428ab8c77d46e04e37 (diff) | |
parent | 5c258a86773167114354710ec2ac34e1fc976e69 (diff) |
Merge #627
627: Use stable toolchain r=matklad a=kjeremy
Fixes #622
Co-authored-by: Jeremy Kolb <[email protected]>
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | crates/tools/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 7ccfe78fb..bddf1bebb 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -6,7 +6,7 @@ before_cache: | |||
6 | 6 | ||
7 | build: &rust_build | 7 | build: &rust_build |
8 | language: rust | 8 | language: rust |
9 | rust: 1.32.0 | 9 | rust: stable |
10 | script: | 10 | script: |
11 | - rustup component add rustfmt | 11 | - rustup component add rustfmt |
12 | - rustup component add rust-src | 12 | - rustup component add rust-src |
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index 39f181432..d404db214 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs | |||
@@ -15,7 +15,7 @@ pub type Result<T> = std::result::Result<T, failure::Error>; | |||
15 | pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; | 15 | pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; |
16 | pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; | 16 | pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; |
17 | pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; | 17 | pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; |
18 | const TOOLCHAIN: &str = "1.32.0"; | 18 | const TOOLCHAIN: &str = "stable"; |
19 | 19 | ||
20 | #[derive(Debug)] | 20 | #[derive(Debug)] |
21 | pub struct Test { | 21 | pub struct Test { |