aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-11-24 18:53:24 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-11-24 18:53:24 +0000
commit8f5fb8341314e94b1d91afa50ca895f78180f948 (patch)
tree95e5679ccd855a1070708183646fd57262047887 /crates
parent4bff9ce59a2da626a332c8aca488a5942997019e (diff)
parentebc4e7525346e1d3ecb98b449b0d09f25ef37d91 (diff)
Merge #241
241: switch back to the latest beta r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_syntax/src/reparsing.rs6
-rw-r--r--crates/tools/src/lib.rs2
2 files changed, 5 insertions, 3 deletions
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>;
17pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; 17pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
18pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; 18pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
19pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; 19pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera";
20const TOOLCHAIN: &str = "beta-2018-11-19"; 20const TOOLCHAIN: &str = "beta-2018-11-24";
21 21
22#[derive(Debug)] 22#[derive(Debug)]
23pub struct Test { 23pub struct Test {