ra_syntax: SyntaxError::range() now returns by value
This commit is contained in:
@@ -180,7 +180,7 @@ fn merge_errors(
|
||||
}
|
||||
res.extend(new_errors.into_iter().map(|new_err| {
|
||||
// fighting borrow checker with a variable ;)
|
||||
let offseted_range = *new_err.range() + range_before_reparse.start();
|
||||
let offseted_range = new_err.range() + range_before_reparse.start();
|
||||
new_err.with_range(offseted_range)
|
||||
}));
|
||||
res
|
||||
|
||||
@@ -30,8 +30,8 @@ impl SyntaxError {
|
||||
pub fn message(&self) -> &str {
|
||||
&self.0
|
||||
}
|
||||
pub fn range(&self) -> &TextRange {
|
||||
&self.1
|
||||
pub fn range(&self) -> TextRange {
|
||||
self.1
|
||||
}
|
||||
|
||||
pub fn with_range(mut self, range: TextRange) -> Self {
|
||||
|
||||
@@ -128,14 +128,8 @@ fn dump_tokens_and_errors(tokens: &[Token], errors: &[SyntaxError], text: &str)
|
||||
writeln!(acc, "{:?} {} {:?}", token.kind, token_len, token_text).unwrap();
|
||||
}
|
||||
for err in errors {
|
||||
writeln!(
|
||||
acc,
|
||||
"> error{:?} token({:?}) msg({})",
|
||||
err.range(),
|
||||
&text[*err.range()],
|
||||
err.message()
|
||||
)
|
||||
.unwrap();
|
||||
writeln!(acc, "> error{:?} token({:?}) msg({})", err.range(), &text[err.range()], err)
|
||||
.unwrap();
|
||||
}
|
||||
acc
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user