From 434f108adad75b7c5e25db745a9f9fefa5cdaa31 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 24 Nov 2019 18:48:29 +0300 Subject: Simplify --- crates/ra_cli/src/analysis_stats.rs | 2 +- crates/ra_hir/src/expr.rs | 6 +++--- crates/ra_hir/src/test_db.rs | 2 +- crates/ra_hir/src/ty/infer.rs | 4 ++-- crates/ra_hir_def/src/body.rs | 28 ++++++---------------------- crates/ra_hir_def/src/body/scope.rs | 4 ++-- crates/ra_hir_def/src/nameres.rs | 2 +- crates/ra_hir_def/src/nameres/tests.rs | 2 +- 8 files changed, 17 insertions(+), 33 deletions(-) (limited to 'crates') diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs index 9cd21e4b6..135de7ffb 100644 --- a/crates/ra_cli/src/analysis_stats.rs +++ b/crates/ra_cli/src/analysis_stats.rs @@ -109,7 +109,7 @@ pub fn run( } let body = f.body(db); let inference_result = f.infer(db); - for (expr_id, _) in body.exprs() { + for (expr_id, _) in body.exprs.iter() { let ty = &inference_result[expr_id]; num_exprs += 1; if let Ty::Unknown = ty { diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 6b703d8b4..43fedde7a 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -44,15 +44,15 @@ impl<'a, 'b> ExprValidator<'a, 'b> { pub(crate) fn validate_body(&mut self, db: &impl HirDatabase) { let body = self.func.body(db); - for e in body.exprs() { + for e in body.exprs.iter() { if let (id, Expr::RecordLit { path, fields, spread }) = e { self.validate_record_literal(id, path, fields, *spread, db); } } - let body_expr = &body[body.body_expr()]; + let body_expr = &body[body.body_expr]; if let Expr::Block { statements: _, tail: Some(t) } = body_expr { - self.validate_results_in_tail_expr(body.body_expr(), *t, db); + self.validate_results_in_tail_expr(body.body_expr, *t, db); } } diff --git a/crates/ra_hir/src/test_db.rs b/crates/ra_hir/src/test_db.rs index 03c7ac155..efee2f658 100644 --- a/crates/ra_hir/src/test_db.rs +++ b/crates/ra_hir/src/test_db.rs @@ -80,7 +80,7 @@ impl TestDB { let crate_graph = self.crate_graph(); for krate in crate_graph.iter().next() { let crate_def_map = self.crate_def_map(krate); - for module_id in crate_def_map.modules() { + for (module_id, _) in crate_def_map.modules.iter() { let module_id = ModuleId { krate, module_id }; let module = crate::Module::from(module_id); module.diagnostics( diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 471bdc387..2e744e5ec 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs @@ -565,7 +565,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { fn collect_fn(&mut self, data: &FunctionData) { let body = Arc::clone(&self.body); // avoid borrow checker problem - for (type_ref, pat) in data.params.iter().zip(body.params()) { + for (type_ref, pat) in data.params.iter().zip(body.params.iter()) { let ty = self.make_ty(type_ref); self.infer_pat(*pat, &ty, BindingMode::default()); @@ -574,7 +574,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { } fn infer_body(&mut self) { - self.infer_expr(self.body.body_expr(), &Expectation::has_type(self.return_ty.clone())); + self.infer_expr(self.body.body_expr, &Expectation::has_type(self.return_ty.clone())); } fn resolve_into_iter_item(&self) -> Option { diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index c06997cf1..45a36d793 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs @@ -20,7 +20,7 @@ use crate::{ DefWithBodyId, HasModule, HasSource, Lookup, ModuleId, }; -pub struct Expander { +struct Expander { crate_def_map: Arc, current_file_id: HirFileId, hygiene: Hygiene, @@ -28,7 +28,7 @@ pub struct Expander { } impl Expander { - pub fn new(db: &impl DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander { + fn new(db: &impl DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander { let crate_def_map = db.crate_def_map(module.krate); let hygiene = Hygiene::new(db, current_file_id); Expander { crate_def_map, current_file_id, hygiene, module } @@ -101,17 +101,17 @@ impl Drop for Mark { /// The body of an item (function, const etc.). #[derive(Debug, Eq, PartialEq)] pub struct Body { - exprs: Arena, - pats: Arena, + pub exprs: Arena, + pub pats: Arena, /// The patterns for the function's parameters. While the parameter types are /// part of the function signature, the patterns are not (they don't change /// the external type of the function). /// /// If this `Body` is for the body of a constant, this will just be /// empty. - params: Vec, + pub params: Vec, /// The `ExprId` of the actual body expression. - body_expr: ExprId, + pub body_expr: ExprId, } pub type ExprPtr = Either, AstPtr>; @@ -182,22 +182,6 @@ impl Body { ) -> (Body, BodySourceMap) { lower::lower(db, expander, params, body) } - - pub fn params(&self) -> &[PatId] { - &self.params - } - - pub fn body_expr(&self) -> ExprId { - self.body_expr - } - - pub fn exprs(&self) -> impl Iterator { - self.exprs.iter() - } - - pub fn pats(&self) -> impl Iterator { - self.pats.iter() - } } impl Index for Body { diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index 20d707bc4..5240a59d5 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs @@ -54,8 +54,8 @@ impl ExprScopes { let mut scopes = ExprScopes { scopes: Arena::default(), scope_by_expr: FxHashMap::default() }; let root = scopes.root_scope(); - scopes.add_params_bindings(body, root, body.params()); - compute_expr_scopes(body.body_expr(), body, &mut scopes, root); + scopes.add_params_bindings(body, root, &body.params); + compute_expr_scopes(body.body_expr, body, &mut scopes, root); scopes } diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index 9476fb1ad..2359386c2 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs @@ -81,13 +81,13 @@ use crate::{ #[derive(Debug, PartialEq, Eq)] pub struct CrateDefMap { pub root: LocalModuleId, + pub modules: Arena, pub(crate) krate: CrateId, /// The prelude module for this crate. This either comes from an import /// marked with the `prelude_import` attribute, or (in the normal case) from /// a dependency (`std` or `core`). pub(crate) prelude: Option, pub(crate) extern_prelude: FxHashMap, - pub(crate) modules: Arena, edition: Edition, diagnostics: Vec, diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs index f0b86af7c..f502f1cb3 100644 --- a/crates/ra_hir_def/src/nameres/tests.rs +++ b/crates/ra_hir_def/src/nameres/tests.rs @@ -25,7 +25,7 @@ fn compute_crate_def_map(fixture: &str) -> Arc { fn render_crate_def_map(map: &CrateDefMap) -> String { let mut buf = String::new(); - go(&mut buf, map, "\ncrate", map.root()); + go(&mut buf, map, "\ncrate", map.root); return buf.trim().to_string(); fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: LocalModuleId) { -- cgit v1.2.3