Skip to content

Integrate rustfmt #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Integrate rustfmt #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30f55ee
Fix situations where rustfmt broke custom readability.
valentinewallace Dec 20, 2019
97c2825
Preempt undesirable rustfmt changes.
valentinewallace Feb 13, 2020
441899d
rustfmt: skip all macros due to bug in rustfmt (see issues 3068, 3858)
valentinewallace Jan 14, 2020
2fbe48b
Update fuzzing generated code to conform to rustfmt.
valentinewallace Jan 21, 2020
0c2066a
Add rustfmt config.
valentinewallace Dec 19, 2019
410fbf6
Initial run of rustfmt.
valentinewallace Apr 30, 2020
a7b8d3b
Integrate rustfmt into travis and Github Actions.
valentinewallace Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
include:
- toolchain: stable
build-net-tokio: true
check-fmt: true
- toolchain: beta
build-net-tokio: true
- toolchain: 1.39.0
Expand All @@ -32,6 +33,9 @@ jobs:
toolchain: ${{ matrix.toolchain }}
override: true
profile: minimal
- name: Check formatting
if: matrix.check-fmt
run: rustup component add rustfmt && cargo fmt --all -- --check && cd fuzz && cargo fmt --all -- --check
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio
if: matrix.build-net-tokio
run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ before_install:
- sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev

script:
# Check formatting
- if [ "$(rustup show | grep stable)" != "" ]; then rustup component add rustfmt && cargo fmt --all -- --check && cd fuzz && cargo fmt --all -- --check && cd ../ ; fi
# Support lightning-net-tokio only on Rust stable, beta, and 1.39.0
- if [ "$(rustup show | grep default | grep '1.39.0')" != "" ]; then export BUILD_NET_TOKIO=1; fi
- if [ "$(rustup show | grep default | grep '1\.')" == "" ]; then export BUILD_NET_TOKIO=1; fi
Expand Down
5 changes: 5 additions & 0 deletions fuzz/rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
hard_tabs = true # use tab characters for indentation, spaces for alignment
use_field_init_shorthand = true
max_width = 120
use_small_heuristics = "Max"
fn_args_layout = "Compressed"
24 changes: 16 additions & 8 deletions fuzz/src/bin/chanmon_consistency_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ extern crate lightning_fuzz;
use lightning_fuzz::chanmon_consistency::*;

#[cfg(feature = "afl")]
#[macro_use] extern crate afl;
#[macro_use]
extern crate afl;
#[cfg(feature = "afl")]
fn main() {
fuzz!(|data| {
Expand All @@ -16,7 +17,8 @@ fn main() {
}

#[cfg(feature = "honggfuzz")]
#[macro_use] extern crate honggfuzz;
#[macro_use]
extern crate honggfuzz;
#[cfg(feature = "honggfuzz")]
fn main() {
loop {
Expand All @@ -27,7 +29,8 @@ fn main() {
}

#[cfg(feature = "libfuzzer_fuzz")]
#[macro_use] extern crate libfuzzer_sys;
#[macro_use]
extern crate libfuzzer_sys;
#[cfg(feature = "libfuzzer_fuzz")]
fuzz_target!(|data: &[u8]| {
chanmon_consistency_run(data.as_ptr(), data.len());
Expand All @@ -44,9 +47,9 @@ fn main() {

#[test]
fn run_test_cases() {
use lightning_fuzz::utils::test_logger::StringBuffer;
use std::fs;
use std::io::Read;
use lightning_fuzz::utils::test_logger::StringBuffer;

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

let thread_count_ref = Arc::clone(&threads_running);
let main_thread_ref = std::thread::current();
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
threads.push((
path.file_name().unwrap().to_str().unwrap().to_string(),
std::thread::spawn(move || {
let string_logger = StringBuffer::new();

let panic_logger = string_logger.clone();
let res = if ::std::panic::catch_unwind(move || {
chanmon_consistency_test(&data, panic_logger);
}).is_err() {
})
.is_err()
{
Some(string_logger.into_string())
} else { None };
} else {
None
};
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
main_thread_ref.unpark();
res
})
}),
));
while threads_running.load(atomic::Ordering::Acquire) > 32 {
std::thread::park();
Expand Down
24 changes: 16 additions & 8 deletions fuzz/src/bin/chanmon_deser_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ extern crate lightning_fuzz;
use lightning_fuzz::chanmon_deser::*;

#[cfg(feature = "afl")]
#[macro_use] extern crate afl;
#[macro_use]
extern crate afl;
#[cfg(feature = "afl")]
fn main() {
fuzz!(|data| {
Expand All @@ -16,7 +17,8 @@ fn main() {
}

#[cfg(feature = "honggfuzz")]
#[macro_use] extern crate honggfuzz;
#[macro_use]
extern crate honggfuzz;
#[cfg(feature = "honggfuzz")]
fn main() {
loop {
Expand All @@ -27,7 +29,8 @@ fn main() {
}

#[cfg(feature = "libfuzzer_fuzz")]
#[macro_use] extern crate libfuzzer_sys;
#[macro_use]
extern crate libfuzzer_sys;
#[cfg(feature = "libfuzzer_fuzz")]
fuzz_target!(|data: &[u8]| {
chanmon_deser_run(data.as_ptr(), data.len());
Expand All @@ -44,9 +47,9 @@ fn main() {

#[test]
fn run_test_cases() {
use lightning_fuzz::utils::test_logger::StringBuffer;
use std::fs;
use std::io::Read;
use lightning_fuzz::utils::test_logger::StringBuffer;

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

let thread_count_ref = Arc::clone(&threads_running);
let main_thread_ref = std::thread::current();
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
threads.push((
path.file_name().unwrap().to_str().unwrap().to_string(),
std::thread::spawn(move || {
let string_logger = StringBuffer::new();

let panic_logger = string_logger.clone();
let res = if ::std::panic::catch_unwind(move || {
chanmon_deser_test(&data, panic_logger);
}).is_err() {
})
.is_err()
{
Some(string_logger.into_string())
} else { None };
} else {
None
};
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
main_thread_ref.unpark();
res
})
}),
));
while threads_running.load(atomic::Ordering::Acquire) > 32 {
std::thread::park();
Expand Down
24 changes: 16 additions & 8 deletions fuzz/src/bin/full_stack_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ extern crate lightning_fuzz;
use lightning_fuzz::full_stack::*;

#[cfg(feature = "afl")]
#[macro_use] extern crate afl;
#[macro_use]
extern crate afl;
#[cfg(feature = "afl")]
fn main() {
fuzz!(|data| {
Expand All @@ -16,7 +17,8 @@ fn main() {
}

#[cfg(feature = "honggfuzz")]
#[macro_use] extern crate honggfuzz;
#[macro_use]
extern crate honggfuzz;
#[cfg(feature = "honggfuzz")]
fn main() {
loop {
Expand All @@ -27,7 +29,8 @@ fn main() {
}

#[cfg(feature = "libfuzzer_fuzz")]
#[macro_use] extern crate libfuzzer_sys;
#[macro_use]
extern crate libfuzzer_sys;
#[cfg(feature = "libfuzzer_fuzz")]
fuzz_target!(|data: &[u8]| {
full_stack_run(data.as_ptr(), data.len());
Expand All @@ -44,9 +47,9 @@ fn main() {

#[test]
fn run_test_cases() {
use lightning_fuzz::utils::test_logger::StringBuffer;
use std::fs;
use std::io::Read;
use lightning_fuzz::utils::test_logger::StringBuffer;

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

let thread_count_ref = Arc::clone(&threads_running);
let main_thread_ref = std::thread::current();
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
threads.push((
path.file_name().unwrap().to_str().unwrap().to_string(),
std::thread::spawn(move || {
let string_logger = StringBuffer::new();

let panic_logger = string_logger.clone();
let res = if ::std::panic::catch_unwind(move || {
full_stack_test(&data, panic_logger);
}).is_err() {
})
.is_err()
{
Some(string_logger.into_string())
} else { None };
} else {
None
};
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
main_thread_ref.unpark();
res
})
}),
));
while threads_running.load(atomic::Ordering::Acquire) > 32 {
std::thread::park();
Expand Down
24 changes: 16 additions & 8 deletions fuzz/src/bin/msg_accept_channel_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ extern crate lightning_fuzz;
use lightning_fuzz::msg_targets::msg_accept_channel::*;

#[cfg(feature = "afl")]
#[macro_use] extern crate afl;
#[macro_use]
extern crate afl;
#[cfg(feature = "afl")]
fn main() {
fuzz!(|data| {
Expand All @@ -16,7 +17,8 @@ fn main() {
}

#[cfg(feature = "honggfuzz")]
#[macro_use] extern crate honggfuzz;
#[macro_use]
extern crate honggfuzz;
#[cfg(feature = "honggfuzz")]
fn main() {
loop {
Expand All @@ -27,7 +29,8 @@ fn main() {
}

#[cfg(feature = "libfuzzer_fuzz")]
#[macro_use] extern crate libfuzzer_sys;
#[macro_use]
extern crate libfuzzer_sys;
#[cfg(feature = "libfuzzer_fuzz")]
fuzz_target!(|data: &[u8]| {
msg_accept_channel_run(data.as_ptr(), data.len());
Expand All @@ -44,9 +47,9 @@ fn main() {

#[test]
fn run_test_cases() {
use lightning_fuzz::utils::test_logger::StringBuffer;
use std::fs;
use std::io::Read;
use lightning_fuzz::utils::test_logger::StringBuffer;

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

let thread_count_ref = Arc::clone(&threads_running);
let main_thread_ref = std::thread::current();
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
threads.push((
path.file_name().unwrap().to_str().unwrap().to_string(),
std::thread::spawn(move || {
let string_logger = StringBuffer::new();

let panic_logger = string_logger.clone();
let res = if ::std::panic::catch_unwind(move || {
msg_accept_channel_test(&data, panic_logger);
}).is_err() {
})
.is_err()
{
Some(string_logger.into_string())
} else { None };
} else {
None
};
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
main_thread_ref.unpark();
res
})
}),
));
while threads_running.load(atomic::Ordering::Acquire) > 32 {
std::thread::park();
Expand Down
24 changes: 16 additions & 8 deletions fuzz/src/bin/msg_announcement_signatures_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ extern crate lightning_fuzz;
use lightning_fuzz::msg_targets::msg_announcement_signatures::*;

#[cfg(feature = "afl")]
#[macro_use] extern crate afl;
#[macro_use]
extern crate afl;
#[cfg(feature = "afl")]
fn main() {
fuzz!(|data| {
Expand All @@ -16,7 +17,8 @@ fn main() {
}

#[cfg(feature = "honggfuzz")]
#[macro_use] extern crate honggfuzz;
#[macro_use]
extern crate honggfuzz;
#[cfg(feature = "honggfuzz")]
fn main() {
loop {
Expand All @@ -27,7 +29,8 @@ fn main() {
}

#[cfg(feature = "libfuzzer_fuzz")]
#[macro_use] extern crate libfuzzer_sys;
#[macro_use]
extern crate libfuzzer_sys;
#[cfg(feature = "libfuzzer_fuzz")]
fuzz_target!(|data: &[u8]| {
msg_announcement_signatures_run(data.as_ptr(), data.len());
Expand All @@ -44,9 +47,9 @@ fn main() {

#[test]
fn run_test_cases() {
use lightning_fuzz::utils::test_logger::StringBuffer;
use std::fs;
use std::io::Read;
use lightning_fuzz::utils::test_logger::StringBuffer;

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

let thread_count_ref = Arc::clone(&threads_running);
let main_thread_ref = std::thread::current();
threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
threads.push((
path.file_name().unwrap().to_str().unwrap().to_string(),
std::thread::spawn(move || {
let string_logger = StringBuffer::new();

let panic_logger = string_logger.clone();
let res = if ::std::panic::catch_unwind(move || {
msg_announcement_signatures_test(&data, panic_logger);
}).is_err() {
})
.is_err()
{
Some(string_logger.into_string())
} else { None };
} else {
None
};
thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
main_thread_ref.unpark();
res
})
}),
));
while threads_running.load(atomic::Ordering::Acquire) > 32 {
std::thread::park();
Expand Down
Loading