diff options
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/reparsing.rs | 6 | ||||
-rw-r--r-- | crates/tools/src/lib.rs | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 012453497..36fd746dd 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -9,7 +9,7 @@ env: | |||
9 | 9 | ||
10 | build: &rust_build | 10 | build: &rust_build |
11 | language: rust | 11 | language: rust |
12 | rust: beta-2018-11-19 | 12 | rust: beta |
13 | script: | 13 | script: |
14 | - cargo gen-tests --verify | 14 | - cargo gen-tests --verify |
15 | - cargo gen-syntax --verify | 15 | - cargo gen-syntax --verify |
diff --git a/crates/ra_syntax/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs index d48133166..ddcb8f6f6 100644 --- a/crates/ra_syntax/src/reparsing.rs +++ b/crates/ra_syntax/src/reparsing.rs | |||
@@ -186,8 +186,10 @@ mod tests { | |||
186 | 186 | ||
187 | fn do_check<F>(before: &str, replace_with: &str, reparser: F) | 187 | fn do_check<F>(before: &str, replace_with: &str, reparser: F) |
188 | where | 188 | where |
189 | for<'a> F: Fn(SyntaxNodeRef<'a>, &AtomEdit) | 189 | for<'a> F: Fn( |
190 | -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>, | 190 | SyntaxNodeRef<'a>, |
191 | &AtomEdit, | ||
192 | ) -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>, | ||
191 | { | 193 | { |
192 | let (range, before) = extract_range(before); | 194 | let (range, before) = extract_range(before); |
193 | let after = replace_range(before.clone(), range, replace_with); | 195 | let after = replace_range(before.clone(), range, replace_with); |
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index e81761cf2..3013f4e36 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs | |||
@@ -17,7 +17,7 @@ pub type Result<T> = ::std::result::Result<T, failure::Error>; | |||
17 | pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; | 17 | pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; |
18 | pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; | 18 | pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; |
19 | pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; | 19 | pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; |
20 | const TOOLCHAIN: &str = "beta-2018-11-19"; | 20 | const TOOLCHAIN: &str = "beta-2018-11-24"; |
21 | 21 | ||
22 | #[derive(Debug)] | 22 | #[derive(Debug)] |
23 | pub struct Test { | 23 | pub struct Test { |