diff --git a/crates/fm/src/file_map.rs b/crates/fm/src/file_map.rs index 2a1cd662d4e..d893b6c14d8 100644 --- a/crates/fm/src/file_map.rs +++ b/crates/fm/src/file_map.rs @@ -51,7 +51,7 @@ impl FileId { pub struct File<'input>(&'input SimpleFile); impl<'input> File<'input> { - pub fn get_source(self) -> &'input str { + pub fn source(self) -> &'input str { self.0.source() } } diff --git a/crates/noirc_evaluator/src/ssa/context.rs b/crates/noirc_evaluator/src/ssa/context.rs index 366b9e7c655..58f9d9d94cf 100644 --- a/crates/noirc_evaluator/src/ssa/context.rs +++ b/crates/noirc_evaluator/src/ssa/context.rs @@ -479,8 +479,8 @@ impl SsaContext { None } - pub fn get_root_value(&self, id: NodeId) -> NodeId { - self.get_variable(id).map(|v| v.get_root()).unwrap_or(id) + pub fn root_value(&self, id: NodeId) -> NodeId { + self.get_variable(id).map(|v| v.root()).unwrap_or(id) } pub fn add_variable(&mut self, obj: node::Variable, root: Option) -> NodeId { @@ -502,7 +502,7 @@ impl SsaContext { new_value: NodeId, block_id: BlockId, ) { - let root_id = self.get_root_value(var_id); + let root_id = self.root_value(var_id); let root = self.get_variable(root_id).unwrap(); let root_name = root.name.clone(); let cb = &mut self[block_id]; @@ -907,7 +907,7 @@ impl SsaContext { witness: None, parent_block: self.current_block, }; - let ls_root = lhs_obj.get_root(); + let ls_root = lhs_obj.root(); //ssa: we create a new variable a1 linked to a let new_var_id = self.add_variable(new_var, Some(ls_root)); let op = Operation::Binary(node::Binary { @@ -998,7 +998,7 @@ impl SsaContext { witness: None, parent_block: self.current_block, }; - let ls_root = lhs_obj.get_root(); + let ls_root = lhs_obj.root(); //ssa: we create a new variable a1 linked to a let new_var_id = self.add_variable(new_var, Some(ls_root)); //ass diff --git a/crates/noirc_evaluator/src/ssa/node.rs b/crates/noirc_evaluator/src/ssa/node.rs index 6355afcdbb3..5504325ed64 100644 --- a/crates/noirc_evaluator/src/ssa/node.rs +++ b/crates/noirc_evaluator/src/ssa/node.rs @@ -14,7 +14,7 @@ use std::ops::{Add, BitAnd, BitOr, BitXor, Mul, Shl, Shr, Sub}; pub trait Node: std::fmt::Display { fn get_type(&self) -> ObjectType; - fn get_id(&self) -> NodeId; + fn id(&self) -> NodeId; fn size_in_bits(&self) -> u32; } @@ -52,7 +52,7 @@ impl Node for Variable { self.get_type().bits() } - fn get_id(&self) -> NodeId { + fn id(&self) -> NodeId { self.id } } @@ -76,11 +76,11 @@ impl Node for NodeObject { } } - fn get_id(&self) -> NodeId { + fn id(&self) -> NodeId { match self { - NodeObject::Obj(o) => o.get_id(), + NodeObject::Obj(o) => o.id(), NodeObject::Instr(i) => i.id, - NodeObject::Const(c) => c.get_id(), + NodeObject::Const(c) => c.id(), NodeObject::Function(_, id, _) => *id, } } @@ -95,7 +95,7 @@ impl Node for Constant { self.value.bits().try_into().unwrap() } - fn get_id(&self) -> NodeId { + fn id(&self) -> NodeId { self.id } } @@ -149,7 +149,7 @@ pub struct Variable { } impl Variable { - pub fn get_root(&self) -> NodeId { + pub fn root(&self) -> NodeId { self.root.unwrap_or(self.id) } diff --git a/crates/noirc_evaluator/src/ssa/ssa_form.rs b/crates/noirc_evaluator/src/ssa/ssa_form.rs index 1704a05fbc2..530158c6557 100644 --- a/crates/noirc_evaluator/src/ssa/ssa_form.rs +++ b/crates/noirc_evaluator/src/ssa/ssa_form.rs @@ -107,7 +107,7 @@ pub fn get_current_value_in_block( var_id: NodeId, block_id: BlockId, ) -> NodeId { - let root = ctx.get_root_value(var_id); + let root = ctx.root_value(var_id); ctx[block_id] .get_current_value(root) //Local value numbering diff --git a/crates/noirc_frontend/src/hir/def_map/mod.rs b/crates/noirc_frontend/src/hir/def_map/mod.rs index 0d183bc1890..2fb161e20b3 100644 --- a/crates/noirc_frontend/src/hir/def_map/mod.rs +++ b/crates/noirc_frontend/src/hir/def_map/mod.rs @@ -134,7 +134,7 @@ pub fn parse_file( all_errors: &mut Vec, ) -> ParsedModule { let file = fm.fetch_file(file_id); - let (program, errors) = parse_program(file.get_source()); + let (program, errors) = parse_program(file.source()); all_errors.extend(errors.into_iter().map(|error| error.in_file(file_id))); program } diff --git a/crates/noirc_frontend/src/lexer/lexer.rs b/crates/noirc_frontend/src/lexer/lexer.rs index cbdae322e81..7d4fcf3c0a9 100644 --- a/crates/noirc_frontend/src/lexer/lexer.rs +++ b/crates/noirc_frontend/src/lexer/lexer.rs @@ -33,7 +33,7 @@ impl<'a> Lexer<'a> { } pub fn from_file(source: File<'a>) -> Self { - let source_file = source.get_source(); + let source_file = source.source(); Lexer::new(source_file) }