language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cargo format

Browse source
This commit is contained in:
Phil Ellison 2019-08-11 15:04:08 +01:00 • committed by Aleksey Kladov
parent 456e72c4e4
commit 4f6f3933ec
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_hir/src/expr/validation.rs
View file

@ -12,7 +12,7 @@ use crate::{
name, name,
path::{PathKind, PathSegment}, path::{PathKind, PathSegment},
ty::{InferenceResult, Ty, TypeCtor}, ty::{InferenceResult, Ty, TypeCtor},
Function, HasSource, HirDatabase, ModuleDef, Name, Path, PerNs, Resolution Function, HasSource, HirDatabase, ModuleDef, Name, Path, PerNs, Resolution,
}; };
use ra_syntax::ast; use ra_syntax::ast;
@ -116,11 +116,12 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
PathSegment { name: name::STD, args_and_bindings: None }, PathSegment { name: name::STD, args_and_bindings: None },
PathSegment { name: name::RESULT_MOD, args_and_bindings: None }, PathSegment { name: name::RESULT_MOD, args_and_bindings: None },
PathSegment { name: name::RESULT_TYPE, args_and_bindings: None }, PathSegment { name: name::RESULT_TYPE, args_and_bindings: None },
] ],
}; };
let resolver = self.func.resolver(db); let resolver = self.func.resolver(db);
let std_result_enum = match resolver.resolve_path_segments(db, &std_result_path).into_fully_resolved() { let std_result_enum =
match resolver.resolve_path_segments(db, &std_result_path).into_fully_resolved() {
PerNs { types: Some(Resolution::Def(ModuleDef::Enum(e))), .. } => e, PerNs { types: Some(Resolution::Def(ModuleDef::Enum(e))), .. } => e,
_ => return, _ => return,
}; };
@ -129,13 +130,11 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
fn enum_from_type(ty: &Ty) -> Option<Enum> { fn enum_from_type(ty: &Ty) -> Option<Enum> {
match ty { match ty {
Ty::Apply(t) => { Ty::Apply(t) => match t.ctor {
match t.ctor {
TypeCtor::Adt(AdtDef::Enum(e)) => Some(e), TypeCtor::Adt(AdtDef::Enum(e)) => Some(e),
_ => None, _ => None,
} },
} _ => None,
_ => None
} }
} }

3
crates/ra_ide_api/src/diagnostics.rs
View file

@ -217,7 +217,8 @@ mod tests {
} }
fn check_apply_diagnostic_fix_for_target_file(target_file: &str, fixture: &str, after: &str) { fn check_apply_diagnostic_fix_for_target_file(target_file: &str, fixture: &str, after: &str) {
let (analysis, file_id, target_file_contents) = fixture_with_target_file(fixture, target_file); let (analysis, file_id, target_file_contents) =
fixture_with_target_file(fixture, target_file);
let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap(); let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap();
let mut fix = diagnostic.fix.unwrap(); let mut fix = diagnostic.fix.unwrap();
let edit = fix.source_file_edits.pop().unwrap().edit; let edit = fix.source_file_edits.pop().unwrap().edit;