From ebc4e7525346e1d3ecb98b449b0d09f25ef37d91 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 24 Nov 2018 21:52:49 +0300 Subject: switch back to the latest beta --- .travis.yml | 2 +- crates/ra_syntax/src/reparsing.rs | 6 ++++-- 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: build: &rust_build language: rust - rust: beta-2018-11-19 + rust: beta script: - cargo gen-tests --verify - 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 { fn do_check(before: &str, replace_with: &str, reparser: F) where - for<'a> F: Fn(SyntaxNodeRef<'a>, &AtomEdit) - -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec)>, + for<'a> F: Fn( + SyntaxNodeRef<'a>, + &AtomEdit, + ) -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec)>, { let (range, before) = extract_range(before); 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 = ::std::result::Result; pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; -const TOOLCHAIN: &str = "beta-2018-11-19"; +const TOOLCHAIN: &str = "beta-2018-11-24"; #[derive(Debug)] pub struct Test { -- cgit v1.2.3