Extend clippy - rust-ethereum#245

aurora-is-near · Nov 30, 2023 · 0d62095 · 0d62095
1 parent 743f288
commit 0d62095
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/interpreter/src/call_create.rs b/interpreter/src/call_create.rs
@@ -34,7 +34,7 @@ pub enum CreateScheme {
 impl CreateScheme {
 	pub fn address<H: RuntimeBackend>(&self, handler: &H) -> H160 {
 		match self {
-			CreateScheme::Create2 {
+			Self::Create2 {
 				caller,
 				code_hash,
 				salt,
@@ -46,7 +46,7 @@ impl CreateScheme {
 				hasher.update(&code_hash[..]);
 				H256::from_slice(hasher.finalize().as_slice()).into()
 			}
-			CreateScheme::Legacy { caller } => {
+			Self::Legacy { caller } => {
 				let nonce = handler.nonce(*caller);
 				let mut stream = rlp::RlpStream::new_list(2);
 				stream.append(caller);
@@ -56,7 +56,7 @@ impl CreateScheme {
 		}
 	}
 
-	pub fn caller(&self) -> H160 {
+	pub const fn caller(&self) -> H160 {
 		match self {
 			Self::Create2 { caller, .. } => *caller,
 			Self::Legacy { caller } => *caller,
@@ -86,7 +86,7 @@ pub enum CallCreateTrapData {
 }
 
 impl CallCreateTrapData {
-	pub fn target_gas(&self) -> Option<U256> {
+	pub const fn target_gas(&self) -> Option<U256> {
 		match self {
 			Self::Call(CallTrapData { gas, .. }) => Some(*gas),
 			Self::Create(_) => None,

diff --git a/interpreter/src/error.rs b/interpreter/src/error.rs
@@ -168,7 +168,7 @@ impl From<ExitException> for ExitResult {
 
 impl From<ExitException> for ExitError {
 	fn from(s: ExitException) -> Self {
-		ExitError::Exception(s)
+		Self::Exception(s)
 	}
 }
 
@@ -203,6 +203,6 @@ impl From<ExitFatal> for ExitResult {
 
 impl From<ExitFatal> for ExitError {
 	fn from(s: ExitFatal) -> Self {
-		ExitError::Fatal(s)
+		Self::Fatal(s)
 	}
 }
diff --git a/interpreter/src/eval/mod.rs b/interpreter/src/eval/mod.rs
@@ -62,7 +62,7 @@ where
 
 impl<S, H, Tr> Etable<S, H, Tr> {
 	/// Default core value for Etable.
-	pub const fn core() -> Etable<S, H, Tr> {
+	pub const fn core() -> Self {
 		let mut table = [eval_unknown as _; 256];
 
 		table[Opcode::STOP.as_usize()] = eval_stop as _;
@@ -186,7 +186,7 @@ impl<S: AsRef<RuntimeState>, H: RuntimeEnvironment + RuntimeBackend, Tr: CallCre
 	Etable<S, H, Tr>
 {
 	/// Runtime Etable.
-	pub const fn runtime() -> Etable<S, H, Tr> {
+	pub const fn runtime() -> Self {
 		let mut table = Self::core();
 
 		table.0[Opcode::SHA3.as_usize()] = eval_sha3 as _;

diff --git a/interpreter/src/lib.rs b/interpreter/src/lib.rs
@@ -54,7 +54,7 @@ pub struct Machine<S> {
 
 impl<S> Machine<S> {
 	/// Return a reference of the program counter.
-	pub fn position(&self) -> usize {
+	pub const fn position(&self) -> usize {
 		self.position
 	}
 

diff --git a/interpreter/src/memory.rs b/interpreter/src/memory.rs
@@ -24,7 +24,7 @@ impl Memory {
 	}
 
 	/// Memory limit.
-	pub fn limit(&self) -> usize {
+	pub const fn limit(&self) -> usize {
 		self.limit
 	}
 
@@ -34,7 +34,7 @@ impl Memory {
 	}
 
 	/// Get the effective length.
-	pub fn effective_len(&self) -> U256 {
+	pub const fn effective_len(&self) -> U256 {
 		self.effective_len
 	}
 
@@ -44,7 +44,7 @@ impl Memory {
 	}
 
 	/// Return the full memory.
-	pub fn data(&self) -> &Vec<u8> {
+	pub const fn data(&self) -> &Vec<u8> {
 		&self.data
 	}
 

diff --git a/interpreter/src/runtime.rs b/interpreter/src/runtime.rs
@@ -18,13 +18,13 @@ pub struct RuntimeState {
 	pub gas: U256,
 }
 
-impl AsRef<RuntimeState> for RuntimeState {
+impl AsRef<Self> for RuntimeState {
 	fn as_ref(&self) -> &Self {
 		self
 	}
 }
 
-impl AsMut<RuntimeState> for RuntimeState {
+impl AsMut<Self> for RuntimeState {
 	fn as_mut(&mut self) -> &mut Self {
 		self
 	}

diff --git a/interpreter/src/stack.rs b/interpreter/src/stack.rs
@@ -48,7 +48,7 @@ macro_rules! impl_perform_popn_pushn {
 
 impl Stack {
 	/// Create a new stack with given limit.
-	pub fn new(limit: usize) -> Self {
+	pub const fn new(limit: usize) -> Self {
 		Self {
 			data: Vec::new(),
 			limit,
@@ -57,7 +57,7 @@ impl Stack {
 
 	#[inline]
 	/// Stack limit.
-	pub fn limit(&self) -> usize {
+	pub const fn limit(&self) -> usize {
 		self.limit
 	}
 
@@ -75,7 +75,7 @@ impl Stack {
 
 	#[inline]
 	/// Stack data.
-	pub fn data(&self) -> &Vec<H256> {
+	pub const fn data(&self) -> &Vec<H256> {
 		&self.data
 	}
 

diff --git a/interpreter/src/utils.rs b/interpreter/src/utils.rs
@@ -46,7 +46,7 @@ pub struct I256(pub Sign, pub U256);
 
 impl I256 {
 	/// Zero value of I256.
-	pub fn zero() -> I256 {
+	pub const fn zero() -> I256 {
 		I256(Sign::Zero, U256::zero())
 	}
 	/// Minimum value of I256.