diff --git a/src/main.rs b/src/main.rs index f035401..7602547 100644 --- a/src/main.rs +++ b/src/main.rs @@ -128,14 +128,21 @@ patterns as regex patterns, which replaces the basic string comparison.") }; } -fn main_pattern_type_selected(matches: ArgMatches, quiet: bool, buffer_writer: Arc>, patterns: Arc

) { +fn main_pattern_type_selected(matches: ArgMatches, + quiet: bool, + buffer_writer: Arc>, + patterns: Arc

) { if patterns.len() <= 0 { let mut stdout = buffer_writer.lock().unwrap().buffer(); cprintln!(false, stdout, Color::Red, "Please, provide at least one valid pattern."); - buffer_writer.lock().unwrap().print(&stdout).expect("Could not write to stdout."); + buffer_writer + .lock() + .unwrap() + .print(&stdout) + .expect("Could not write to stdout."); std::process::exit(1); } @@ -158,11 +165,7 @@ fn main_pattern_type_selected(matches: ArgMatches, quiet: "Looking for an address matching any of "); } - cprint!(quiet, - stdout, - Color::Cyan, - "{}", - patterns.len()); + cprint!(quiet, stdout, Color::Cyan, "{}", patterns.len()); if patterns.len() <= 1 { cprint!(quiet, stdout, Color::White, " pattern"); @@ -175,7 +178,11 @@ fn main_pattern_type_selected(matches: ArgMatches, quiet: stdout, Color::White, "---------------------------------------------------------------------------------------"); - buffer_writer.lock().unwrap().print(&stdout).expect("Could not write to stdout."); + buffer_writer + .lock() + .unwrap() + .print(&stdout) + .expect("Could not write to stdout."); } let thread_count = num_cpus::get(); @@ -251,25 +258,24 @@ fn main_pattern_type_selected(matches: ArgMatches, quiet: let mut buffer = buffer_writer.lock().unwrap().buffer(); let mut iterations_per_second = iterations_this_second.lock().unwrap(); - cprint!(quiet, - buffer, - Color::Cyan, - "{}", - *iterations_per_second); + cprint!(quiet, buffer, Color::Cyan, "{}", *iterations_per_second); cprintln!(quiet, buffer, Color::White, " addresses / second"); *sync_buffer.lock().unwrap() = Some(buffer); *iterations_per_second = 0; }); } - 'dance: - loop { + 'dance: loop { if *working_threads.lock().unwrap() <= 0 { break 'dance; } if let Some(ref buffer) = *sync_buffer.lock().unwrap() { - buffer_writer.lock().unwrap().print(buffer).expect("Could not write to stdout."); + buffer_writer + .lock() + .unwrap() + .print(buffer) + .expect("Could not write to stdout."); } *sync_buffer.lock().unwrap() = None; @@ -291,17 +297,9 @@ fn main_pattern_type_selected(matches: ArgMatches, quiet: Color::White, "---------------------------------------------------------------------------------------"); cprint!(quiet, stdout, Color::White, "Found address: "); - cprintln!(quiet, - stdout, - Color::Yellow, - "0x{}", - result.address); + cprintln!(quiet, stdout, Color::Yellow, "0x{}", result.address); cprint!(quiet, stdout, Color::White, "Generated private key: "); - cprintln!(quiet, - stdout, - Color::Red, - "{}", - result.private_key); + cprintln!(quiet, stdout, Color::Red, "{}", result.private_key); cprintln!(quiet, stdout, Color::White, @@ -314,7 +312,11 @@ fn main_pattern_type_selected(matches: ArgMatches, quiet: stdout, Color::White, "---------------------------------------------------------------------------------------"); - buffer_writer.lock().unwrap().print(&stdout).expect("Could not write to stdout."); + buffer_writer + .lock() + .unwrap() + .print(&stdout) + .expect("Could not write to stdout."); } if quiet { diff --git a/src/patterns/mod.rs b/src/patterns/mod.rs index 95685f5..47b361d 100644 --- a/src/patterns/mod.rs +++ b/src/patterns/mod.rs @@ -40,7 +40,8 @@ fn read_patterns(matches: &ArgMatches) -> Vec { } fn parse_patterns(buffer_writer: Arc>, - matches: &ArgMatches) -> Vec

{ + matches: &ArgMatches) + -> Vec

{ // TODO: Use rayon (everywhere) let mut vec: Vec

= Vec::new(); let raw_patterns = read_patterns(matches); @@ -64,7 +65,11 @@ fn parse_patterns(buffer_writer: Arc>, Color::White, "{}", error); - buffer_writer.lock().unwrap().print(&stdout).expect("Could not write to stdout."); + buffer_writer + .lock() + .unwrap() + .print(&stdout) + .expect("Could not write to stdout."); } } } diff --git a/src/patterns/regex.rs b/src/patterns/regex.rs index e5a0413..67b98c4 100644 --- a/src/patterns/regex.rs +++ b/src/patterns/regex.rs @@ -1,4 +1,4 @@ -use ::patterns::{Pattern, Patterns, parse_patterns}; +use patterns::{Pattern, Patterns, parse_patterns}; use std::sync::{Arc, Mutex}; use regex::{Regex, RegexBuilder}; use clap::ArgMatches; @@ -28,11 +28,8 @@ pub struct RegexPatterns { } impl RegexPatterns { - pub fn new(buffer_writer: Arc>, - matches: &ArgMatches) -> RegexPatterns { - RegexPatterns { - vec: parse_patterns(buffer_writer, matches) - } + pub fn new(buffer_writer: Arc>, matches: &ArgMatches) -> RegexPatterns { + RegexPatterns { vec: parse_patterns(buffer_writer, matches) } } } diff --git a/src/patterns/string.rs b/src/patterns/string.rs index 1d4e574..04b1648 100644 --- a/src/patterns/string.rs +++ b/src/patterns/string.rs @@ -1,5 +1,5 @@ -use ::{ADDRESS_PATTERN, AddressLengthType}; -use ::patterns::{Pattern, Patterns, parse_patterns}; +use {ADDRESS_PATTERN, AddressLengthType}; +use patterns::{Pattern, Patterns, parse_patterns}; use std::borrow::Borrow; use std::sync::{Arc, Mutex}; use clap::ArgMatches; @@ -29,8 +29,7 @@ pub struct StringPatterns { } impl StringPatterns { - pub fn new(buffer_writer: Arc>, - matches: &ArgMatches) -> StringPatterns { + pub fn new(buffer_writer: Arc>, matches: &ArgMatches) -> StringPatterns { let patterns = parse_patterns::(buffer_writer, matches); let patterns_by_len: Arc>>, AddressLengthType>> = Arc::new(arr![Mutex>>; Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None), Mutex::new(None)]); @@ -44,20 +43,21 @@ impl StringPatterns { }); - let patterns_by_len_borrowed: GenericArray>>, AddressLengthType> = Arc::try_unwrap(patterns_by_len).unwrap_or_else(|_| panic!("Couldn't unwrap petterns.")); + let patterns_by_len_borrowed: GenericArray>>, + AddressLengthType> = + Arc::try_unwrap(patterns_by_len) + .unwrap_or_else(|_| panic!("Couldn't unwrap petterns.")); let sorted_vecs = patterns_by_len_borrowed.map(|item| { let item: Option> = item.into_inner().unwrap(); item.map(|mut vec| { - vec.sort(); - vec.dedup(); - vec - }) + vec.sort(); + vec.dedup(); + vec + }) }); - StringPatterns { - sorted_vecs, - } + StringPatterns { sorted_vecs } } } @@ -69,7 +69,8 @@ impl Patterns for StringPatterns { let pattern_len = index + 1; let target_address_slice = &address[0..pattern_len]; - if vec.binary_search_by(|item| item.as_str().cmp(target_address_slice)).is_ok() { + if vec.binary_search_by(|item| item.as_str().cmp(target_address_slice)) + .is_ok() { return true; } } @@ -79,7 +80,8 @@ impl Patterns for StringPatterns { } fn len(&self) -> usize { - self.sorted_vecs.par_iter() + self.sorted_vecs + .par_iter() .filter(|opt| opt.is_some()) .map(|opt| opt.as_ref().unwrap().len()) .sum()