Skip to content

Commit

Permalink
Merge branch 'master' into dani/debugger-stuff4
Browse files Browse the repository at this point in the history
  • Loading branch information
DaniPopes committed Dec 4, 2023
2 parents ff2d3af + adf3099 commit 6314d35
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion crates/debugger/src/tui/draw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ Line::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/k
/// (read memory offset, read memory size, write memory offset, write memory size)
fn get_memory_access(
op: u8,
stack: &Vec<U256>,
stack: &[U256],
) -> (Option<usize>, Option<usize>, Option<usize>, Option<usize>) {
let memory_access = match op {
opcode::KECCAK256 | opcode::RETURN | opcode::REVERT => (1, 2, 0, 0),
Expand Down
6 changes: 3 additions & 3 deletions crates/fmt/src/formatter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ impl<'a, W: Write> Formatter<'a, W> {
fn visit_list<T>(
&mut self,
prefix: &str,
items: &mut Vec<T>,
items: &mut [T],
start_offset: Option<usize>,
end_offset: Option<usize>,
paren_required: bool,
Expand Down Expand Up @@ -1113,7 +1113,7 @@ impl<'a, W: Write> Formatter<'a, W> {
fn visit_block<T>(
&mut self,
loc: Loc,
statements: &mut Vec<T>,
statements: &mut [T],
attempt_single_line: bool,
attempt_omit_braces: bool,
) -> Result<bool>
Expand Down Expand Up @@ -1167,7 +1167,7 @@ impl<'a, W: Write> Formatter<'a, W> {
Statement::Block { loc, statements, .. } => {
self.visit_block(*loc, statements, attempt_single_line, true)
}
_ => self.visit_block(stmt.loc(), &mut vec![stmt], attempt_single_line, true),
_ => self.visit_block(stmt.loc(), &mut [stmt], attempt_single_line, true),
}
}

Expand Down

0 comments on commit 6314d35

Please sign in to comment.