Skip to content

Commit 5a3ec62

Browse files
valentinewallacevalentinewallace
committed
Initial run of rustfmt.
1 parent ebeae59 commit 5a3ec62

File tree

75 files changed

+20760
-7720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+20760
-7720
lines changed

‎fuzz/src/bin/chanmon_consistency_target.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ extern crate lightning_fuzz;
77
use lightning_fuzz::chanmon_consistency::*;
88

99
#[cfg(feature = "afl")]
10-
#[macro_use] extern crate afl;
10+
#[macro_use]
11+
extern crate afl;
1112
#[cfg(feature = "afl")]
1213
fn main() {
1314
fuzz!(|data| {
@@ -16,7 +17,8 @@ fn main() {
1617
}
1718

1819
#[cfg(feature = "honggfuzz")]
19-
#[macro_use] extern crate honggfuzz;
20+
#[macro_use]
21+
extern crate honggfuzz;
2022
#[cfg(feature = "honggfuzz")]
2123
fn main() {
2224
loop {
@@ -27,7 +29,8 @@ fn main() {
2729
}
2830

2931
#[cfg(feature = "libfuzzer_fuzz")]
30-
#[macro_use] extern crate libfuzzer_sys;
32+
#[macro_use]
33+
extern crate libfuzzer_sys;
3134
#[cfg(feature = "libfuzzer_fuzz")]
3235
fuzz_target!(|data: &[u8]| {
3336
chanmon_consistency_run(data.as_ptr(), data.len());
@@ -44,9 +47,9 @@ fn main() {
4447

4548
#[test]
4649
fn run_test_cases() {
50+
use lightning_fuzz::utils::test_logger::StringBuffer;
4751
use std::fs;
4852
use std::io::Read;
49-
use lightning_fuzz::utils::test_logger::StringBuffer;
5053

5154
use std::sync::{atomic, Arc};
5255
{
@@ -64,20 +67,25 @@ fn run_test_cases() {
6467

6568
let thread_count_ref = Arc::clone(&threads_running);
6669
let main_thread_ref = std::thread::current();
67-
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
70+
threads.push((
71+
path.file_name().unwrap().to_str().unwrap().to_string(),
6872
std::thread::spawn(move || {
6973
let string_logger = StringBuffer::new();
7074

7175
let panic_logger = string_logger.clone();
7276
let res = if ::std::panic::catch_unwind(move || {
7377
chanmon_consistency_test(&data, panic_logger);
74-
}).is_err() {
78+
})
79+
.is_err()
80+
{
7581
Some(string_logger.into_string())
76-
} else { None };
82+
} else {
83+
None
84+
};
7785
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
7886
main_thread_ref.unpark();
7987
res
80-
})
88+
}),
8189
));
8290
while threads_running.load(atomic::Ordering::Acquire) > 32 {
8391
std::thread::park();

‎fuzz/src/bin/chanmon_deser_target.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ extern crate lightning_fuzz;
77
use lightning_fuzz::chanmon_deser::*;
88

99
#[cfg(feature = "afl")]
10-
#[macro_use] extern crate afl;
10+
#[macro_use]
11+
extern crate afl;
1112
#[cfg(feature = "afl")]
1213
fn main() {
1314
fuzz!(|data| {
@@ -16,7 +17,8 @@ fn main() {
1617
}
1718

1819
#[cfg(feature = "honggfuzz")]
19-
#[macro_use] extern crate honggfuzz;
20+
#[macro_use]
21+
extern crate honggfuzz;
2022
#[cfg(feature = "honggfuzz")]
2123
fn main() {
2224
loop {
@@ -27,7 +29,8 @@ fn main() {
2729
}
2830

2931
#[cfg(feature = "libfuzzer_fuzz")]
30-
#[macro_use] extern crate libfuzzer_sys;
32+
#[macro_use]
33+
extern crate libfuzzer_sys;
3134
#[cfg(feature = "libfuzzer_fuzz")]
3235
fuzz_target!(|data: &[u8]| {
3336
chanmon_deser_run(data.as_ptr(), data.len());
@@ -44,9 +47,9 @@ fn main() {
4447

4548
#[test]
4649
fn run_test_cases() {
50+
use lightning_fuzz::utils::test_logger::StringBuffer;
4751
use std::fs;
4852
use std::io::Read;
49-
use lightning_fuzz::utils::test_logger::StringBuffer;
5053

5154
use std::sync::{atomic, Arc};
5255
{
@@ -64,20 +67,25 @@ fn run_test_cases() {
6467

6568
let thread_count_ref = Arc::clone(&threads_running);
6669
let main_thread_ref = std::thread::current();
67-
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
70+
threads.push((
71+
path.file_name().unwrap().to_str().unwrap().to_string(),
6872
std::thread::spawn(move || {
6973
let string_logger = StringBuffer::new();
7074

7175
let panic_logger = string_logger.clone();
7276
let res = if ::std::panic::catch_unwind(move || {
7377
chanmon_deser_test(&data, panic_logger);
74-
}).is_err() {
78+
})
79+
.is_err()
80+
{
7581
Some(string_logger.into_string())
76-
} else { None };
82+
} else {
83+
None
84+
};
7785
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
7886
main_thread_ref.unpark();
7987
res
80-
})
88+
}),
8189
));
8290
while threads_running.load(atomic::Ordering::Acquire) > 32 {
8391
std::thread::park();

‎fuzz/src/bin/full_stack_target.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ extern crate lightning_fuzz;
77
use lightning_fuzz::full_stack::*;
88

99
#[cfg(feature = "afl")]
10-
#[macro_use] extern crate afl;
10+
#[macro_use]
11+
extern crate afl;
1112
#[cfg(feature = "afl")]
1213
fn main() {
1314
fuzz!(|data| {
@@ -16,7 +17,8 @@ fn main() {
1617
}
1718

1819
#[cfg(feature = "honggfuzz")]
19-
#[macro_use] extern crate honggfuzz;
20+
#[macro_use]
21+
extern crate honggfuzz;
2022
#[cfg(feature = "honggfuzz")]
2123
fn main() {
2224
loop {
@@ -27,7 +29,8 @@ fn main() {
2729
}
2830

2931
#[cfg(feature = "libfuzzer_fuzz")]
30-
#[macro_use] extern crate libfuzzer_sys;
32+
#[macro_use]
33+
extern crate libfuzzer_sys;
3134
#[cfg(feature = "libfuzzer_fuzz")]
3235
fuzz_target!(|data: &[u8]| {
3336
full_stack_run(data.as_ptr(), data.len());
@@ -44,9 +47,9 @@ fn main() {
4447

4548
#[test]
4649
fn run_test_cases() {
50+
use lightning_fuzz::utils::test_logger::StringBuffer;
4751
use std::fs;
4852
use std::io::Read;
49-
use lightning_fuzz::utils::test_logger::StringBuffer;
5053

5154
use std::sync::{atomic, Arc};
5255
{
@@ -64,20 +67,25 @@ fn run_test_cases() {
6467

6568
let thread_count_ref = Arc::clone(&threads_running);
6669
let main_thread_ref = std::thread::current();
67-
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
70+
threads.push((
71+
path.file_name().unwrap().to_str().unwrap().to_string(),
6872
std::thread::spawn(move || {
6973
let string_logger = StringBuffer::new();
7074

7175
let panic_logger = string_logger.clone();
7276
let res = if ::std::panic::catch_unwind(move || {
7377
full_stack_test(&data, panic_logger);
74-
}).is_err() {
78+
})
79+
.is_err()
80+
{
7581
Some(string_logger.into_string())
76-
} else { None };
82+
} else {
83+
None
84+
};
7785
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
7886
main_thread_ref.unpark();
7987
res
80-
})
88+
}),
8189
));
8290
while threads_running.load(atomic::Ordering::Acquire) > 32 {
8391
std::thread::park();

‎fuzz/src/bin/msg_accept_channel_target.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ extern crate lightning_fuzz;
77
use lightning_fuzz::msg_targets::msg_accept_channel::*;
88

99
#[cfg(feature = "afl")]
10-
#[macro_use] extern crate afl;
10+
#[macro_use]
11+
extern crate afl;
1112
#[cfg(feature = "afl")]
1213
fn main() {
1314
fuzz!(|data| {
@@ -16,7 +17,8 @@ fn main() {
1617
}
1718

1819
#[cfg(feature = "honggfuzz")]
19-
#[macro_use] extern crate honggfuzz;
20+
#[macro_use]
21+
extern crate honggfuzz;
2022
#[cfg(feature = "honggfuzz")]
2123
fn main() {
2224
loop {
@@ -27,7 +29,8 @@ fn main() {
2729
}
2830

2931
#[cfg(feature = "libfuzzer_fuzz")]
30-
#[macro_use] extern crate libfuzzer_sys;
32+
#[macro_use]
33+
extern crate libfuzzer_sys;
3134
#[cfg(feature = "libfuzzer_fuzz")]
3235
fuzz_target!(|data: &[u8]| {
3336
msg_accept_channel_run(data.as_ptr(), data.len());
@@ -44,9 +47,9 @@ fn main() {
4447

4548
#[test]
4649
fn run_test_cases() {
50+
use lightning_fuzz::utils::test_logger::StringBuffer;
4751
use std::fs;
4852
use std::io::Read;
49-
use lightning_fuzz::utils::test_logger::StringBuffer;
5053

5154
use std::sync::{atomic, Arc};
5255
{
@@ -64,20 +67,25 @@ fn run_test_cases() {
6467

6568
let thread_count_ref = Arc::clone(&threads_running);
6669
let main_thread_ref = std::thread::current();
67-
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
70+
threads.push((
71+
path.file_name().unwrap().to_str().unwrap().to_string(),
6872
std::thread::spawn(move || {
6973
let string_logger = StringBuffer::new();
7074

7175
let panic_logger = string_logger.clone();
7276
let res = if ::std::panic::catch_unwind(move || {
7377
msg_accept_channel_test(&data, panic_logger);
74-
}).is_err() {
78+
})
79+
.is_err()
80+
{
7581
Some(string_logger.into_string())
76-
} else { None };
82+
} else {
83+
None
84+
};
7785
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
7886
main_thread_ref.unpark();
7987
res
80-
})
88+
}),
8189
));
8290
while threads_running.load(atomic::Ordering::Acquire) > 32 {
8391
std::thread::park();

‎fuzz/src/bin/msg_announcement_signatures_target.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ extern crate lightning_fuzz;
77
use lightning_fuzz::msg_targets::msg_announcement_signatures::*;
88

99
#[cfg(feature = "afl")]
10-
#[macro_use] extern crate afl;
10+
#[macro_use]
11+
extern crate afl;
1112
#[cfg(feature = "afl")]
1213
fn main() {
1314
fuzz!(|data| {
@@ -16,7 +17,8 @@ fn main() {
1617
}
1718

1819
#[cfg(feature = "honggfuzz")]
19-
#[macro_use] extern crate honggfuzz;
20+
#[macro_use]
21+
extern crate honggfuzz;
2022
#[cfg(feature = "honggfuzz")]
2123
fn main() {
2224
loop {
@@ -27,7 +29,8 @@ fn main() {
2729
}
2830

2931
#[cfg(feature = "libfuzzer_fuzz")]
30-
#[macro_use] extern crate libfuzzer_sys;
32+
#[macro_use]
33+
extern crate libfuzzer_sys;
3134
#[cfg(feature = "libfuzzer_fuzz")]
3235
fuzz_target!(|data: &[u8]| {
3336
msg_announcement_signatures_run(data.as_ptr(), data.len());
@@ -44,9 +47,9 @@ fn main() {
4447

4548
#[test]
4649
fn run_test_cases() {
50+
use lightning_fuzz::utils::test_logger::StringBuffer;
4751
use std::fs;
4852
use std::io::Read;
49-
use lightning_fuzz::utils::test_logger::StringBuffer;
5053

5154
use std::sync::{atomic, Arc};
5255
{
@@ -64,20 +67,25 @@ fn run_test_cases() {
6467

6568
let thread_count_ref = Arc::clone(&threads_running);
6669
let main_thread_ref = std::thread::current();
67-
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
70+
threads.push((
71+
path.file_name().unwrap().to_str().unwrap().to_string(),
6872
std::thread::spawn(move || {
6973
let string_logger = StringBuffer::new();
7074

7175
let panic_logger = string_logger.clone();
7276
let res = if ::std::panic::catch_unwind(move || {
7377
msg_announcement_signatures_test(&data, panic_logger);
74-
}).is_err() {
78+
})
79+
.is_err()
80+
{
7581
Some(string_logger.into_string())
76-
} else { None };
82+
} else {
83+
None
84+
};
7785
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
7886
main_thread_ref.unpark();
7987
res
80-
})
88+
}),
8189
));
8290
while threads_running.load(atomic::Ordering::Acquire) > 32 {
8391
std::thread::park();

0 commit comments

Comments
 (0)