fluencelabs/aquavm
1
0
Fork 0
mirror of https://github.com/fluencelabs/aquavm synced 2025-07-24 10:32:01 +00:00
Code Issues Projects Releases Wiki Activity

Make clippy happier by resolving some warnings (#271)

Browse Source 
1. Use $crate inside macros.
2. Remove unused lifetime.
3. Use write! instead of String::push_str + format! to reduce allocation.
This commit is contained in:
Ivan Boldyrev
2022-05-31 14:44:45 +03:00
committed by GitHub
parent 1c0ff2c979
commit 1c70a3d17d
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
air/src/execution_step/air/mod.rs
View File

@@ -94,13 +94,14 @@ impl<'i> ExecutableInstruction<'i> for Instruction<'i> {
#[macro_export]
macro_rules! log_instruction {
($instr_name:expr, $exec_ctx:expr, $trace_ctx:expr) => {
use std::fmt::Write as _;
log::debug!(target: air_log_targets::INSTRUCTION, "> {}", stringify!($instr_name));
let mut variables = String::from(" scalars:");
variables.push_str(&format!("\n {}", $exec_ctx.scalars));
write!(variables, "\n {}", $exec_ctx.scalars).unwrap();
variables.push_str(" streams:");
variables.push_str(&format!("\n {}", $exec_ctx.streams));
write!(variables, " streams:").unwrap();
write!(variables, "\n {}", $exec_ctx.streams).unwrap();
log::trace!(target: air_log_targets::DATA_CACHE, "{}", variables);
log::trace!(

2
air/src/execution_step/errors/execution_errors.rs
View File

@@ -65,7 +65,7 @@ impl From<CatchableError> for ExecutionError {
macro_rules! trace_to_exec_err {
($trace_expr: expr, $instruction: ident) => {
$trace_expr.map_err(|trace_error| {
crate::execution_step::ExecutionError::Uncatchable(crate::execution_step::UncatchableError::TraceError {
$crate::execution_step::ExecutionError::Uncatchable($crate::execution_step::UncatchableError::TraceError {
trace_error,
instruction: $instruction.to_string(),
})

2
air/src/execution_step/execution_context/last_error/last_error_descriptor.rs
View File

@@ -32,7 +32,7 @@ pub(crate) struct LastErrorDescriptor {
error_can_be_set: bool,
}
impl<'s> LastErrorDescriptor {
impl LastErrorDescriptor {
pub(crate) fn try_to_set_from_error(
&mut self,
error: &(impl LastErrorAffectable + ToErrorCode + ToString),

4
air/src/execution_step/lambda_applier/mod.rs
View File

@@ -29,8 +29,8 @@ pub(crate) use applier::select_from_stream;
macro_rules! lambda_to_execution_error {
($lambda_expr: expr) => {
$lambda_expr.map_err(|lambda_error| {
crate::execution_step::ExecutionError::Catchable(std::rc::Rc::new(
crate::execution_step::CatchableError::LambdaApplierError(lambda_error),
$crate::execution_step::ExecutionError::Catchable(std::rc::Rc::new(
$crate::execution_step::CatchableError::LambdaApplierError(lambda_error),
))
})
};