Merge #241

241: switch back to the latest beta r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

.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

crates/ra_syntax/src/reparsing.rs

@@ -186,8 +186,10 @@ mod tests {
 
     fn do_check<F>(before: &str, replace_with: &str, reparser: F)
     where
-        for<'a> F: Fn(SyntaxNodeRef<'a>, &AtomEdit)
-            -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>,
+        for<'a> F: Fn(
+            SyntaxNodeRef<'a>,
+            &AtomEdit,
+        ) -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>,
     {
         let (range, before) = extract_range(before);
         let after = replace_range(before.clone(), range, replace_with);

crates/tools/src/lib.rs

@@ -17,7 +17,7 @@ pub type Result<T> = ::std::result::Result<T, failure::Error>;
 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 {