nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 10:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build for Diagnostic type change

Browse Source
This commit is contained in:
Phil Ellison 2019-08-13 07:31:06 +01:00 committed by Aleksey Kladov
parent 200470692f
commit 6a04e9ce14
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ra_hir/src/diagnostics.rs
View File

@ -154,11 +154,8 @@ impl Diagnostic for MissingOkInTailExpr {
fn message(&self) -> String {
"wrap return expression in Ok".to_string()
}
fn file(&self) -> HirFileId {
self.file
}
fn syntax_node_ptr(&self) -> SyntaxNodePtr {
self.expr.into()
fn source(&self) -> Source<SyntaxNodePtr> {
Source { file_id: self.file, ast: self.expr.into() }
}
fn as_any(&self) -> &(dyn Any + Send + 'static) {
self
@ -169,8 +166,8 @@ impl AstDiagnostic for MissingOkInTailExpr {
type AST = ast::Expr;
fn ast(&self, db: &impl HirDatabase) -> Self::AST {
let root = db.parse_or_expand(self.file()).unwrap();
let node = self.syntax_node_ptr().to_node(&root);
let root = db.parse_or_expand(self.file).unwrap();
let node = self.source().ast.to_node(&root);
ast::Expr::cast(node).unwrap()
}
}