From a93034c229d21bd4a40b8b15bd56b22b68cf2886 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 3 Oct 2020 23:36:14 +0300
Subject: [PATCH] test suite: Normalize dashes to underscores in test names

---
 .../{asserted-cast.both.c => asserted_cast.both.c}  |  0
 ...st.both.compat.c => asserted_cast.both.compat.c} |  0
 .../{asserted-cast.c => asserted_cast.c}            |  0
 ...sserted-cast.compat.c => asserted_cast.compat.c} |  0
 .../{asserted-cast.cpp => asserted_cast.cpp}        |  0
 .../{asserted-cast.tag.c => asserted_cast.tag.c}    |  0
 ...cast.tag.compat.c => asserted_cast.tag.compat.c} |  0
 tests/expectations/{cfg-2.both.c => cfg_2.both.c}   |  0
 .../{cfg-2.both.compat.c => cfg_2.both.compat.c}    |  0
 tests/expectations/{cfg-2.c => cfg_2.c}             |  0
 .../expectations/{cfg-2.compat.c => cfg_2.compat.c} |  0
 tests/expectations/{cfg-2.cpp => cfg_2.cpp}         |  0
 tests/expectations/{cfg-2.tag.c => cfg_2.tag.c}     |  0
 .../{cfg-2.tag.compat.c => cfg_2.tag.compat.c}      |  0
 .../{cfg-field.compat.c => cfg_field.compat.c}      |  0
 tests/expectations/{cfg-field.cpp => cfg_field.cpp} |  0
 .../{derive-eq.both.c => derive_eq.both.c}          |  0
 ...ive-eq.both.compat.c => derive_eq.both.compat.c} |  0
 tests/expectations/{derive-eq.c => derive_eq.c}     |  0
 .../{derive-eq.compat.c => derive_eq.compat.c}      |  0
 tests/expectations/{derive-eq.cpp => derive_eq.cpp} |  0
 .../{derive-eq.tag.c => derive_eq.tag.c}            |  0
 ...erive-eq.tag.compat.c => derive_eq.tag.compat.c} |  0
 ...-ctor.both.c => destructor_and_copy_ctor.both.c} |  0
 ...pat.c => destructor_and_copy_ctor.both.compat.c} |  0
 ...r-and-copy-ctor.c => destructor_and_copy_ctor.c} |  0
 ...r.compat.c => destructor_and_copy_ctor.compat.c} |  0
 ...d-copy-ctor.cpp => destructor_and_copy_ctor.cpp} |  0
 ...py-ctor.tag.c => destructor_and_copy_ctor.tag.c} |  0
 ...mpat.c => destructor_and_copy_ctor.tag.compat.c} |  0
 tests/expectations/{extern-2.c => extern_2.c}       |  0
 .../{extern-2.compat.c => extern_2.compat.c}        |  0
 tests/expectations/{extern-2.cpp => extern_2.cpp}   |  0
 ...eneric-pointer.both.c => generic_pointer.both.c} |  0
 ....both.compat.c => generic_pointer.both.compat.c} |  0
 .../{generic-pointer.c => generic_pointer.c}        |  0
 ...ic-pointer.compat.c => generic_pointer.compat.c} |  0
 .../{generic-pointer.cpp => generic_pointer.cpp}    |  0
 ...{generic-pointer.tag.c => generic_pointer.tag.c} |  0
 ...er.tag.compat.c => generic_pointer.tag.compat.c} |  0
 .../{monomorph-1.both.c => monomorph_1.both.c}      |  0
 ...ph-1.both.compat.c => monomorph_1.both.compat.c} |  0
 tests/expectations/{monomorph-1.c => monomorph_1.c} |  0
 .../{monomorph-1.compat.c => monomorph_1.compat.c}  |  0
 .../{monomorph-1.cpp => monomorph_1.cpp}            |  0
 .../{monomorph-1.tag.c => monomorph_1.tag.c}        |  0
 ...orph-1.tag.compat.c => monomorph_1.tag.compat.c} |  0
 .../{monomorph-2.both.c => monomorph_2.both.c}      |  0
 ...ph-2.both.compat.c => monomorph_2.both.compat.c} |  0
 tests/expectations/{monomorph-2.c => monomorph_2.c} |  0
 .../{monomorph-2.compat.c => monomorph_2.compat.c}  |  0
 .../{monomorph-2.cpp => monomorph_2.cpp}            |  0
 .../{monomorph-2.tag.c => monomorph_2.tag.c}        |  0
 ...orph-2.tag.compat.c => monomorph_2.tag.compat.c} |  0
 .../{monomorph-3.both.c => monomorph_3.both.c}      |  0
 ...ph-3.both.compat.c => monomorph_3.both.compat.c} |  0
 tests/expectations/{monomorph-3.c => monomorph_3.c} |  0
 .../{monomorph-3.compat.c => monomorph_3.compat.c}  |  0
 .../{monomorph-3.cpp => monomorph_3.cpp}            |  0
 .../{monomorph-3.tag.c => monomorph_3.tag.c}        |  0
 ...orph-3.tag.compat.c => monomorph_3.tag.compat.c} |  0
 .../{must-use.both.c => must_use.both.c}            |  0
 ...ust-use.both.compat.c => must_use.both.compat.c} |  0
 tests/expectations/{must-use.c => must_use.c}       |  0
 .../{must-use.compat.c => must_use.compat.c}        |  0
 tests/expectations/{must-use.cpp => must_use.cpp}   |  0
 .../expectations/{must-use.tag.c => must_use.tag.c} |  0
 ...{must-use.tag.compat.c => must_use.tag.compat.c} |  0
 .../{rename-crate.both.c => rename_crate.both.c}    |  0
 ...ate.both.compat.c => rename_crate.both.compat.c} |  0
 .../expectations/{rename-crate.c => rename_crate.c} |  0
 ...{rename-crate.compat.c => rename_crate.compat.c} |  0
 .../{rename-crate.cpp => rename_crate.cpp}          |  0
 .../{rename-crate.tag.c => rename_crate.tag.c}      |  0
 ...crate.tag.compat.c => rename_crate.tag.compat.c} |  0
 ...g.both.c => renaming_overrides_prefixing.both.c} |  0
 ...c => renaming_overrides_prefixing.both.compat.c} |  0
 ...s-prefixing.c => renaming_overrides_prefixing.c} |  0
 ...mpat.c => renaming_overrides_prefixing.compat.c} |  0
 ...efixing.cpp => renaming_overrides_prefixing.cpp} |  0
 ...ing.tag.c => renaming_overrides_prefixing.tag.c} |  0
 ....c => renaming_overrides_prefixing.tag.compat.c} |  0
 ...option-ptr.both.c => simplify_option_ptr.both.c} |  0
 ...h.compat.c => simplify_option_ptr.both.compat.c} |  0
 ...{simplify-option-ptr.c => simplify_option_ptr.c} |  0
 ...on-ptr.compat.c => simplify_option_ptr.compat.c} |  0
 ...plify-option-ptr.cpp => simplify_option_ptr.cpp} |  0
 ...y-option-ptr.tag.c => simplify_option_ptr.tag.c} |  0
 ...ag.compat.c => simplify_option_ptr.tag.compat.c} |  0
 tests/expectations/{size-types.c => size_types.c}   |  0
 .../{size-types.compat.c => size_types.compat.c}    |  0
 .../expectations/{size-types.cpp => size_types.cpp} |  0
 .../{style-crash.compat.c => style_crash.compat.c}  |  0
 .../{style-crash.cpp => style_crash.cpp}            |  0
 .../{transform-op.both.c => transform_op.both.c}    |  0
 ...-op.both.compat.c => transform_op.both.compat.c} |  0
 .../expectations/{transform-op.c => transform_op.c} |  0
 ...{transform-op.compat.c => transform_op.compat.c} |  0
 .../{transform-op.cpp => transform_op.cpp}          |  0
 .../{transform-op.tag.c => transform_op.tag.c}      |  0
 ...rm-op.tag.compat.c => transform_op.tag.compat.c} |  0
 tests/rust/{asserted-cast.rs => asserted_cast.rs}   |  0
 .../rust/{asserted-cast.toml => asserted_cast.toml} |  0
 tests/rust/{cfg-2.rs => cfg_2.rs}                   |  0
 tests/rust/{cfg-2.toml => cfg_2.toml}               |  0
 tests/rust/{cfg-field.rs => cfg_field.rs}           |  0
 tests/rust/{derive-eq => derive_eq}/Cargo.lock      |  0
 tests/rust/{derive-eq => derive_eq}/Cargo.toml      |  0
 tests/rust/{derive-eq => derive_eq}/cbindgen.toml   |  0
 tests/rust/{derive-eq => derive_eq}/src/lib.rs      |  0
 ...and-copy-ctor.rs => destructor_and_copy_ctor.rs} |  0
 ...copy-ctor.toml => destructor_and_copy_ctor.toml} |  0
 tests/rust/{extern-2.rs => extern_2.rs}             |  0
 .../rust/{generic-pointer.rs => generic_pointer.rs} |  0
 tests/rust/{monomorph-1.rs => monomorph_1.rs}       |  0
 tests/rust/{monomorph-2.rs => monomorph_2.rs}       |  0
 tests/rust/{monomorph-3.rs => monomorph_3.rs}       |  0
 tests/rust/{must-use.rs => must_use.rs}             |  0
 tests/rust/{must-use.toml => must_use.toml}         |  0
 .../rust/{rename-crate => rename_crate}/Cargo.lock  | 13 ++++++-------
 .../rust/{rename-crate => rename_crate}/Cargo.toml  |  4 ++--
 .../{rename-crate => rename_crate}/cbindgen.toml    |  0
 .../dependency/Cargo.toml                           |  0
 .../dependency/src/lib.rs                           |  0
 .../no-extern => rename_crate/no_extern}/Cargo.lock |  0
 .../no-extern => rename_crate/no_extern}/Cargo.toml |  2 +-
 .../no-extern => rename_crate/no_extern}/src/lib.rs |  0
 .../old-dep => rename_crate/old_dep}/Cargo.lock     |  0
 .../old-dep => rename_crate/old_dep}/Cargo.toml     |  4 ++--
 .../old-dep => rename_crate/old_dep}/src/lib.rs     |  0
 .../rust/{rename-crate => rename_crate}/src/lib.rs  |  0
 ...prefixing.rs => renaming_overrides_prefixing.rs} |  0
 ...ixing.toml => renaming_overrides_prefixing.toml} |  0
 ...implify-option-ptr.rs => simplify_option_ptr.rs} |  0
 tests/rust/{size-types.rs => size_types.rs}         |  0
 tests/rust/{size-types.toml => size_types.toml}     |  0
 tests/rust/{style-crash.rs => style_crash.rs}       |  0
 tests/rust/{transform-op.rs => transform_op.rs}     |  0
 tests/rust/{transform-op.toml => transform_op.toml} |  0
 139 files changed, 11 insertions(+), 12 deletions(-)
 rename tests/expectations/{asserted-cast.both.c => asserted_cast.both.c} (100%)
 rename tests/expectations/{asserted-cast.both.compat.c => asserted_cast.both.compat.c} (100%)
 rename tests/expectations/{asserted-cast.c => asserted_cast.c} (100%)
 rename tests/expectations/{asserted-cast.compat.c => asserted_cast.compat.c} (100%)
 rename tests/expectations/{asserted-cast.cpp => asserted_cast.cpp} (100%)
 rename tests/expectations/{asserted-cast.tag.c => asserted_cast.tag.c} (100%)
 rename tests/expectations/{asserted-cast.tag.compat.c => asserted_cast.tag.compat.c} (100%)
 rename tests/expectations/{cfg-2.both.c => cfg_2.both.c} (100%)
 rename tests/expectations/{cfg-2.both.compat.c => cfg_2.both.compat.c} (100%)
 rename tests/expectations/{cfg-2.c => cfg_2.c} (100%)
 rename tests/expectations/{cfg-2.compat.c => cfg_2.compat.c} (100%)
 rename tests/expectations/{cfg-2.cpp => cfg_2.cpp} (100%)
 rename tests/expectations/{cfg-2.tag.c => cfg_2.tag.c} (100%)
 rename tests/expectations/{cfg-2.tag.compat.c => cfg_2.tag.compat.c} (100%)
 rename tests/expectations/{cfg-field.compat.c => cfg_field.compat.c} (100%)
 rename tests/expectations/{cfg-field.cpp => cfg_field.cpp} (100%)
 rename tests/expectations/{derive-eq.both.c => derive_eq.both.c} (100%)
 rename tests/expectations/{derive-eq.both.compat.c => derive_eq.both.compat.c} (100%)
 rename tests/expectations/{derive-eq.c => derive_eq.c} (100%)
 rename tests/expectations/{derive-eq.compat.c => derive_eq.compat.c} (100%)
 rename tests/expectations/{derive-eq.cpp => derive_eq.cpp} (100%)
 rename tests/expectations/{derive-eq.tag.c => derive_eq.tag.c} (100%)
 rename tests/expectations/{derive-eq.tag.compat.c => derive_eq.tag.compat.c} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.both.c => destructor_and_copy_ctor.both.c} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.both.compat.c => destructor_and_copy_ctor.both.compat.c} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.c => destructor_and_copy_ctor.c} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.compat.c => destructor_and_copy_ctor.compat.c} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.cpp => destructor_and_copy_ctor.cpp} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.tag.c => destructor_and_copy_ctor.tag.c} (100%)
 rename tests/expectations/{destructor-and-copy-ctor.tag.compat.c => destructor_and_copy_ctor.tag.compat.c} (100%)
 rename tests/expectations/{extern-2.c => extern_2.c} (100%)
 rename tests/expectations/{extern-2.compat.c => extern_2.compat.c} (100%)
 rename tests/expectations/{extern-2.cpp => extern_2.cpp} (100%)
 rename tests/expectations/{generic-pointer.both.c => generic_pointer.both.c} (100%)
 rename tests/expectations/{generic-pointer.both.compat.c => generic_pointer.both.compat.c} (100%)
 rename tests/expectations/{generic-pointer.c => generic_pointer.c} (100%)
 rename tests/expectations/{generic-pointer.compat.c => generic_pointer.compat.c} (100%)
 rename tests/expectations/{generic-pointer.cpp => generic_pointer.cpp} (100%)
 rename tests/expectations/{generic-pointer.tag.c => generic_pointer.tag.c} (100%)
 rename tests/expectations/{generic-pointer.tag.compat.c => generic_pointer.tag.compat.c} (100%)
 rename tests/expectations/{monomorph-1.both.c => monomorph_1.both.c} (100%)
 rename tests/expectations/{monomorph-1.both.compat.c => monomorph_1.both.compat.c} (100%)
 rename tests/expectations/{monomorph-1.c => monomorph_1.c} (100%)
 rename tests/expectations/{monomorph-1.compat.c => monomorph_1.compat.c} (100%)
 rename tests/expectations/{monomorph-1.cpp => monomorph_1.cpp} (100%)
 rename tests/expectations/{monomorph-1.tag.c => monomorph_1.tag.c} (100%)
 rename tests/expectations/{monomorph-1.tag.compat.c => monomorph_1.tag.compat.c} (100%)
 rename tests/expectations/{monomorph-2.both.c => monomorph_2.both.c} (100%)
 rename tests/expectations/{monomorph-2.both.compat.c => monomorph_2.both.compat.c} (100%)
 rename tests/expectations/{monomorph-2.c => monomorph_2.c} (100%)
 rename tests/expectations/{monomorph-2.compat.c => monomorph_2.compat.c} (100%)
 rename tests/expectations/{monomorph-2.cpp => monomorph_2.cpp} (100%)
 rename tests/expectations/{monomorph-2.tag.c => monomorph_2.tag.c} (100%)
 rename tests/expectations/{monomorph-2.tag.compat.c => monomorph_2.tag.compat.c} (100%)
 rename tests/expectations/{monomorph-3.both.c => monomorph_3.both.c} (100%)
 rename tests/expectations/{monomorph-3.both.compat.c => monomorph_3.both.compat.c} (100%)
 rename tests/expectations/{monomorph-3.c => monomorph_3.c} (100%)
 rename tests/expectations/{monomorph-3.compat.c => monomorph_3.compat.c} (100%)
 rename tests/expectations/{monomorph-3.cpp => monomorph_3.cpp} (100%)
 rename tests/expectations/{monomorph-3.tag.c => monomorph_3.tag.c} (100%)
 rename tests/expectations/{monomorph-3.tag.compat.c => monomorph_3.tag.compat.c} (100%)
 rename tests/expectations/{must-use.both.c => must_use.both.c} (100%)
 rename tests/expectations/{must-use.both.compat.c => must_use.both.compat.c} (100%)
 rename tests/expectations/{must-use.c => must_use.c} (100%)
 rename tests/expectations/{must-use.compat.c => must_use.compat.c} (100%)
 rename tests/expectations/{must-use.cpp => must_use.cpp} (100%)
 rename tests/expectations/{must-use.tag.c => must_use.tag.c} (100%)
 rename tests/expectations/{must-use.tag.compat.c => must_use.tag.compat.c} (100%)
 rename tests/expectations/{rename-crate.both.c => rename_crate.both.c} (100%)
 rename tests/expectations/{rename-crate.both.compat.c => rename_crate.both.compat.c} (100%)
 rename tests/expectations/{rename-crate.c => rename_crate.c} (100%)
 rename tests/expectations/{rename-crate.compat.c => rename_crate.compat.c} (100%)
 rename tests/expectations/{rename-crate.cpp => rename_crate.cpp} (100%)
 rename tests/expectations/{rename-crate.tag.c => rename_crate.tag.c} (100%)
 rename tests/expectations/{rename-crate.tag.compat.c => rename_crate.tag.compat.c} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.both.c => renaming_overrides_prefixing.both.c} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.both.compat.c => renaming_overrides_prefixing.both.compat.c} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.c => renaming_overrides_prefixing.c} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.compat.c => renaming_overrides_prefixing.compat.c} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.cpp => renaming_overrides_prefixing.cpp} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.tag.c => renaming_overrides_prefixing.tag.c} (100%)
 rename tests/expectations/{renaming-overrides-prefixing.tag.compat.c => renaming_overrides_prefixing.tag.compat.c} (100%)
 rename tests/expectations/{simplify-option-ptr.both.c => simplify_option_ptr.both.c} (100%)
 rename tests/expectations/{simplify-option-ptr.both.compat.c => simplify_option_ptr.both.compat.c} (100%)
 rename tests/expectations/{simplify-option-ptr.c => simplify_option_ptr.c} (100%)
 rename tests/expectations/{simplify-option-ptr.compat.c => simplify_option_ptr.compat.c} (100%)
 rename tests/expectations/{simplify-option-ptr.cpp => simplify_option_ptr.cpp} (100%)
 rename tests/expectations/{simplify-option-ptr.tag.c => simplify_option_ptr.tag.c} (100%)
 rename tests/expectations/{simplify-option-ptr.tag.compat.c => simplify_option_ptr.tag.compat.c} (100%)
 rename tests/expectations/{size-types.c => size_types.c} (100%)
 rename tests/expectations/{size-types.compat.c => size_types.compat.c} (100%)
 rename tests/expectations/{size-types.cpp => size_types.cpp} (100%)
 rename tests/expectations/{style-crash.compat.c => style_crash.compat.c} (100%)
 rename tests/expectations/{style-crash.cpp => style_crash.cpp} (100%)
 rename tests/expectations/{transform-op.both.c => transform_op.both.c} (100%)
 rename tests/expectations/{transform-op.both.compat.c => transform_op.both.compat.c} (100%)
 rename tests/expectations/{transform-op.c => transform_op.c} (100%)
 rename tests/expectations/{transform-op.compat.c => transform_op.compat.c} (100%)
 rename tests/expectations/{transform-op.cpp => transform_op.cpp} (100%)
 rename tests/expectations/{transform-op.tag.c => transform_op.tag.c} (100%)
 rename tests/expectations/{transform-op.tag.compat.c => transform_op.tag.compat.c} (100%)
 rename tests/rust/{asserted-cast.rs => asserted_cast.rs} (100%)
 rename tests/rust/{asserted-cast.toml => asserted_cast.toml} (100%)
 rename tests/rust/{cfg-2.rs => cfg_2.rs} (100%)
 rename tests/rust/{cfg-2.toml => cfg_2.toml} (100%)
 rename tests/rust/{cfg-field.rs => cfg_field.rs} (100%)
 rename tests/rust/{derive-eq => derive_eq}/Cargo.lock (100%)
 rename tests/rust/{derive-eq => derive_eq}/Cargo.toml (100%)
 rename tests/rust/{derive-eq => derive_eq}/cbindgen.toml (100%)
 rename tests/rust/{derive-eq => derive_eq}/src/lib.rs (100%)
 rename tests/rust/{destructor-and-copy-ctor.rs => destructor_and_copy_ctor.rs} (100%)
 rename tests/rust/{destructor-and-copy-ctor.toml => destructor_and_copy_ctor.toml} (100%)
 rename tests/rust/{extern-2.rs => extern_2.rs} (100%)
 rename tests/rust/{generic-pointer.rs => generic_pointer.rs} (100%)
 rename tests/rust/{monomorph-1.rs => monomorph_1.rs} (100%)
 rename tests/rust/{monomorph-2.rs => monomorph_2.rs} (100%)
 rename tests/rust/{monomorph-3.rs => monomorph_3.rs} (100%)
 rename tests/rust/{must-use.rs => must_use.rs} (100%)
 rename tests/rust/{must-use.toml => must_use.toml} (100%)
 rename tests/rust/{rename-crate => rename_crate}/Cargo.lock (68%)
 rename tests/rust/{rename-crate => rename_crate}/Cargo.toml (59%)
 rename tests/rust/{rename-crate => rename_crate}/cbindgen.toml (100%)
 rename tests/rust/{rename-crate => rename_crate}/dependency/Cargo.toml (100%)
 rename tests/rust/{rename-crate => rename_crate}/dependency/src/lib.rs (100%)
 rename tests/rust/{rename-crate/no-extern => rename_crate/no_extern}/Cargo.lock (100%)
 rename tests/rust/{rename-crate/no-extern => rename_crate/no_extern}/Cargo.toml (81%)
 rename tests/rust/{rename-crate/no-extern => rename_crate/no_extern}/src/lib.rs (100%)
 rename tests/rust/{rename-crate/old-dep => rename_crate/old_dep}/Cargo.lock (100%)
 rename tests/rust/{rename-crate/old-dep => rename_crate/old_dep}/Cargo.toml (67%)
 rename tests/rust/{rename-crate/old-dep => rename_crate/old_dep}/src/lib.rs (100%)
 rename tests/rust/{rename-crate => rename_crate}/src/lib.rs (100%)
 rename tests/rust/{renaming-overrides-prefixing.rs => renaming_overrides_prefixing.rs} (100%)
 rename tests/rust/{renaming-overrides-prefixing.toml => renaming_overrides_prefixing.toml} (100%)
 rename tests/rust/{simplify-option-ptr.rs => simplify_option_ptr.rs} (100%)
 rename tests/rust/{size-types.rs => size_types.rs} (100%)
 rename tests/rust/{size-types.toml => size_types.toml} (100%)
 rename tests/rust/{style-crash.rs => style_crash.rs} (100%)
 rename tests/rust/{transform-op.rs => transform_op.rs} (100%)
 rename tests/rust/{transform-op.toml => transform_op.toml} (100%)

diff --git a/tests/expectations/asserted-cast.both.c b/tests/expectations/asserted_cast.both.c
similarity index 100%
rename from tests/expectations/asserted-cast.both.c
rename to tests/expectations/asserted_cast.both.c
diff --git a/tests/expectations/asserted-cast.both.compat.c b/tests/expectations/asserted_cast.both.compat.c
similarity index 100%
rename from tests/expectations/asserted-cast.both.compat.c
rename to tests/expectations/asserted_cast.both.compat.c
diff --git a/tests/expectations/asserted-cast.c b/tests/expectations/asserted_cast.c
similarity index 100%
rename from tests/expectations/asserted-cast.c
rename to tests/expectations/asserted_cast.c
diff --git a/tests/expectations/asserted-cast.compat.c b/tests/expectations/asserted_cast.compat.c
similarity index 100%
rename from tests/expectations/asserted-cast.compat.c
rename to tests/expectations/asserted_cast.compat.c
diff --git a/tests/expectations/asserted-cast.cpp b/tests/expectations/asserted_cast.cpp
similarity index 100%
rename from tests/expectations/asserted-cast.cpp
rename to tests/expectations/asserted_cast.cpp
diff --git a/tests/expectations/asserted-cast.tag.c b/tests/expectations/asserted_cast.tag.c
similarity index 100%
rename from tests/expectations/asserted-cast.tag.c
rename to tests/expectations/asserted_cast.tag.c
diff --git a/tests/expectations/asserted-cast.tag.compat.c b/tests/expectations/asserted_cast.tag.compat.c
similarity index 100%
rename from tests/expectations/asserted-cast.tag.compat.c
rename to tests/expectations/asserted_cast.tag.compat.c
diff --git a/tests/expectations/cfg-2.both.c b/tests/expectations/cfg_2.both.c
similarity index 100%
rename from tests/expectations/cfg-2.both.c
rename to tests/expectations/cfg_2.both.c
diff --git a/tests/expectations/cfg-2.both.compat.c b/tests/expectations/cfg_2.both.compat.c
similarity index 100%
rename from tests/expectations/cfg-2.both.compat.c
rename to tests/expectations/cfg_2.both.compat.c
diff --git a/tests/expectations/cfg-2.c b/tests/expectations/cfg_2.c
similarity index 100%
rename from tests/expectations/cfg-2.c
rename to tests/expectations/cfg_2.c
diff --git a/tests/expectations/cfg-2.compat.c b/tests/expectations/cfg_2.compat.c
similarity index 100%
rename from tests/expectations/cfg-2.compat.c
rename to tests/expectations/cfg_2.compat.c
diff --git a/tests/expectations/cfg-2.cpp b/tests/expectations/cfg_2.cpp
similarity index 100%
rename from tests/expectations/cfg-2.cpp
rename to tests/expectations/cfg_2.cpp
diff --git a/tests/expectations/cfg-2.tag.c b/tests/expectations/cfg_2.tag.c
similarity index 100%
rename from tests/expectations/cfg-2.tag.c
rename to tests/expectations/cfg_2.tag.c
diff --git a/tests/expectations/cfg-2.tag.compat.c b/tests/expectations/cfg_2.tag.compat.c
similarity index 100%
rename from tests/expectations/cfg-2.tag.compat.c
rename to tests/expectations/cfg_2.tag.compat.c
diff --git a/tests/expectations/cfg-field.compat.c b/tests/expectations/cfg_field.compat.c
similarity index 100%
rename from tests/expectations/cfg-field.compat.c
rename to tests/expectations/cfg_field.compat.c
diff --git a/tests/expectations/cfg-field.cpp b/tests/expectations/cfg_field.cpp
similarity index 100%
rename from tests/expectations/cfg-field.cpp
rename to tests/expectations/cfg_field.cpp
diff --git a/tests/expectations/derive-eq.both.c b/tests/expectations/derive_eq.both.c
similarity index 100%
rename from tests/expectations/derive-eq.both.c
rename to tests/expectations/derive_eq.both.c
diff --git a/tests/expectations/derive-eq.both.compat.c b/tests/expectations/derive_eq.both.compat.c
similarity index 100%
rename from tests/expectations/derive-eq.both.compat.c
rename to tests/expectations/derive_eq.both.compat.c
diff --git a/tests/expectations/derive-eq.c b/tests/expectations/derive_eq.c
similarity index 100%
rename from tests/expectations/derive-eq.c
rename to tests/expectations/derive_eq.c
diff --git a/tests/expectations/derive-eq.compat.c b/tests/expectations/derive_eq.compat.c
similarity index 100%
rename from tests/expectations/derive-eq.compat.c
rename to tests/expectations/derive_eq.compat.c
diff --git a/tests/expectations/derive-eq.cpp b/tests/expectations/derive_eq.cpp
similarity index 100%
rename from tests/expectations/derive-eq.cpp
rename to tests/expectations/derive_eq.cpp
diff --git a/tests/expectations/derive-eq.tag.c b/tests/expectations/derive_eq.tag.c
similarity index 100%
rename from tests/expectations/derive-eq.tag.c
rename to tests/expectations/derive_eq.tag.c
diff --git a/tests/expectations/derive-eq.tag.compat.c b/tests/expectations/derive_eq.tag.compat.c
similarity index 100%
rename from tests/expectations/derive-eq.tag.compat.c
rename to tests/expectations/derive_eq.tag.compat.c
diff --git a/tests/expectations/destructor-and-copy-ctor.both.c b/tests/expectations/destructor_and_copy_ctor.both.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.both.c
rename to tests/expectations/destructor_and_copy_ctor.both.c
diff --git a/tests/expectations/destructor-and-copy-ctor.both.compat.c b/tests/expectations/destructor_and_copy_ctor.both.compat.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.both.compat.c
rename to tests/expectations/destructor_and_copy_ctor.both.compat.c
diff --git a/tests/expectations/destructor-and-copy-ctor.c b/tests/expectations/destructor_and_copy_ctor.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.c
rename to tests/expectations/destructor_and_copy_ctor.c
diff --git a/tests/expectations/destructor-and-copy-ctor.compat.c b/tests/expectations/destructor_and_copy_ctor.compat.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.compat.c
rename to tests/expectations/destructor_and_copy_ctor.compat.c
diff --git a/tests/expectations/destructor-and-copy-ctor.cpp b/tests/expectations/destructor_and_copy_ctor.cpp
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.cpp
rename to tests/expectations/destructor_and_copy_ctor.cpp
diff --git a/tests/expectations/destructor-and-copy-ctor.tag.c b/tests/expectations/destructor_and_copy_ctor.tag.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.tag.c
rename to tests/expectations/destructor_and_copy_ctor.tag.c
diff --git a/tests/expectations/destructor-and-copy-ctor.tag.compat.c b/tests/expectations/destructor_and_copy_ctor.tag.compat.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.tag.compat.c
rename to tests/expectations/destructor_and_copy_ctor.tag.compat.c
diff --git a/tests/expectations/extern-2.c b/tests/expectations/extern_2.c
similarity index 100%
rename from tests/expectations/extern-2.c
rename to tests/expectations/extern_2.c
diff --git a/tests/expectations/extern-2.compat.c b/tests/expectations/extern_2.compat.c
similarity index 100%
rename from tests/expectations/extern-2.compat.c
rename to tests/expectations/extern_2.compat.c
diff --git a/tests/expectations/extern-2.cpp b/tests/expectations/extern_2.cpp
similarity index 100%
rename from tests/expectations/extern-2.cpp
rename to tests/expectations/extern_2.cpp
diff --git a/tests/expectations/generic-pointer.both.c b/tests/expectations/generic_pointer.both.c
similarity index 100%
rename from tests/expectations/generic-pointer.both.c
rename to tests/expectations/generic_pointer.both.c
diff --git a/tests/expectations/generic-pointer.both.compat.c b/tests/expectations/generic_pointer.both.compat.c
similarity index 100%
rename from tests/expectations/generic-pointer.both.compat.c
rename to tests/expectations/generic_pointer.both.compat.c
diff --git a/tests/expectations/generic-pointer.c b/tests/expectations/generic_pointer.c
similarity index 100%
rename from tests/expectations/generic-pointer.c
rename to tests/expectations/generic_pointer.c
diff --git a/tests/expectations/generic-pointer.compat.c b/tests/expectations/generic_pointer.compat.c
similarity index 100%
rename from tests/expectations/generic-pointer.compat.c
rename to tests/expectations/generic_pointer.compat.c
diff --git a/tests/expectations/generic-pointer.cpp b/tests/expectations/generic_pointer.cpp
similarity index 100%
rename from tests/expectations/generic-pointer.cpp
rename to tests/expectations/generic_pointer.cpp
diff --git a/tests/expectations/generic-pointer.tag.c b/tests/expectations/generic_pointer.tag.c
similarity index 100%
rename from tests/expectations/generic-pointer.tag.c
rename to tests/expectations/generic_pointer.tag.c
diff --git a/tests/expectations/generic-pointer.tag.compat.c b/tests/expectations/generic_pointer.tag.compat.c
similarity index 100%
rename from tests/expectations/generic-pointer.tag.compat.c
rename to tests/expectations/generic_pointer.tag.compat.c
diff --git a/tests/expectations/monomorph-1.both.c b/tests/expectations/monomorph_1.both.c
similarity index 100%
rename from tests/expectations/monomorph-1.both.c
rename to tests/expectations/monomorph_1.both.c
diff --git a/tests/expectations/monomorph-1.both.compat.c b/tests/expectations/monomorph_1.both.compat.c
similarity index 100%
rename from tests/expectations/monomorph-1.both.compat.c
rename to tests/expectations/monomorph_1.both.compat.c
diff --git a/tests/expectations/monomorph-1.c b/tests/expectations/monomorph_1.c
similarity index 100%
rename from tests/expectations/monomorph-1.c
rename to tests/expectations/monomorph_1.c
diff --git a/tests/expectations/monomorph-1.compat.c b/tests/expectations/monomorph_1.compat.c
similarity index 100%
rename from tests/expectations/monomorph-1.compat.c
rename to tests/expectations/monomorph_1.compat.c
diff --git a/tests/expectations/monomorph-1.cpp b/tests/expectations/monomorph_1.cpp
similarity index 100%
rename from tests/expectations/monomorph-1.cpp
rename to tests/expectations/monomorph_1.cpp
diff --git a/tests/expectations/monomorph-1.tag.c b/tests/expectations/monomorph_1.tag.c
similarity index 100%
rename from tests/expectations/monomorph-1.tag.c
rename to tests/expectations/monomorph_1.tag.c
diff --git a/tests/expectations/monomorph-1.tag.compat.c b/tests/expectations/monomorph_1.tag.compat.c
similarity index 100%
rename from tests/expectations/monomorph-1.tag.compat.c
rename to tests/expectations/monomorph_1.tag.compat.c
diff --git a/tests/expectations/monomorph-2.both.c b/tests/expectations/monomorph_2.both.c
similarity index 100%
rename from tests/expectations/monomorph-2.both.c
rename to tests/expectations/monomorph_2.both.c
diff --git a/tests/expectations/monomorph-2.both.compat.c b/tests/expectations/monomorph_2.both.compat.c
similarity index 100%
rename from tests/expectations/monomorph-2.both.compat.c
rename to tests/expectations/monomorph_2.both.compat.c
diff --git a/tests/expectations/monomorph-2.c b/tests/expectations/monomorph_2.c
similarity index 100%
rename from tests/expectations/monomorph-2.c
rename to tests/expectations/monomorph_2.c
diff --git a/tests/expectations/monomorph-2.compat.c b/tests/expectations/monomorph_2.compat.c
similarity index 100%
rename from tests/expectations/monomorph-2.compat.c
rename to tests/expectations/monomorph_2.compat.c
diff --git a/tests/expectations/monomorph-2.cpp b/tests/expectations/monomorph_2.cpp
similarity index 100%
rename from tests/expectations/monomorph-2.cpp
rename to tests/expectations/monomorph_2.cpp
diff --git a/tests/expectations/monomorph-2.tag.c b/tests/expectations/monomorph_2.tag.c
similarity index 100%
rename from tests/expectations/monomorph-2.tag.c
rename to tests/expectations/monomorph_2.tag.c
diff --git a/tests/expectations/monomorph-2.tag.compat.c b/tests/expectations/monomorph_2.tag.compat.c
similarity index 100%
rename from tests/expectations/monomorph-2.tag.compat.c
rename to tests/expectations/monomorph_2.tag.compat.c
diff --git a/tests/expectations/monomorph-3.both.c b/tests/expectations/monomorph_3.both.c
similarity index 100%
rename from tests/expectations/monomorph-3.both.c
rename to tests/expectations/monomorph_3.both.c
diff --git a/tests/expectations/monomorph-3.both.compat.c b/tests/expectations/monomorph_3.both.compat.c
similarity index 100%
rename from tests/expectations/monomorph-3.both.compat.c
rename to tests/expectations/monomorph_3.both.compat.c
diff --git a/tests/expectations/monomorph-3.c b/tests/expectations/monomorph_3.c
similarity index 100%
rename from tests/expectations/monomorph-3.c
rename to tests/expectations/monomorph_3.c
diff --git a/tests/expectations/monomorph-3.compat.c b/tests/expectations/monomorph_3.compat.c
similarity index 100%
rename from tests/expectations/monomorph-3.compat.c
rename to tests/expectations/monomorph_3.compat.c
diff --git a/tests/expectations/monomorph-3.cpp b/tests/expectations/monomorph_3.cpp
similarity index 100%
rename from tests/expectations/monomorph-3.cpp
rename to tests/expectations/monomorph_3.cpp
diff --git a/tests/expectations/monomorph-3.tag.c b/tests/expectations/monomorph_3.tag.c
similarity index 100%
rename from tests/expectations/monomorph-3.tag.c
rename to tests/expectations/monomorph_3.tag.c
diff --git a/tests/expectations/monomorph-3.tag.compat.c b/tests/expectations/monomorph_3.tag.compat.c
similarity index 100%
rename from tests/expectations/monomorph-3.tag.compat.c
rename to tests/expectations/monomorph_3.tag.compat.c
diff --git a/tests/expectations/must-use.both.c b/tests/expectations/must_use.both.c
similarity index 100%
rename from tests/expectations/must-use.both.c
rename to tests/expectations/must_use.both.c
diff --git a/tests/expectations/must-use.both.compat.c b/tests/expectations/must_use.both.compat.c
similarity index 100%
rename from tests/expectations/must-use.both.compat.c
rename to tests/expectations/must_use.both.compat.c
diff --git a/tests/expectations/must-use.c b/tests/expectations/must_use.c
similarity index 100%
rename from tests/expectations/must-use.c
rename to tests/expectations/must_use.c
diff --git a/tests/expectations/must-use.compat.c b/tests/expectations/must_use.compat.c
similarity index 100%
rename from tests/expectations/must-use.compat.c
rename to tests/expectations/must_use.compat.c
diff --git a/tests/expectations/must-use.cpp b/tests/expectations/must_use.cpp
similarity index 100%
rename from tests/expectations/must-use.cpp
rename to tests/expectations/must_use.cpp
diff --git a/tests/expectations/must-use.tag.c b/tests/expectations/must_use.tag.c
similarity index 100%
rename from tests/expectations/must-use.tag.c
rename to tests/expectations/must_use.tag.c
diff --git a/tests/expectations/must-use.tag.compat.c b/tests/expectations/must_use.tag.compat.c
similarity index 100%
rename from tests/expectations/must-use.tag.compat.c
rename to tests/expectations/must_use.tag.compat.c
diff --git a/tests/expectations/rename-crate.both.c b/tests/expectations/rename_crate.both.c
similarity index 100%
rename from tests/expectations/rename-crate.both.c
rename to tests/expectations/rename_crate.both.c
diff --git a/tests/expectations/rename-crate.both.compat.c b/tests/expectations/rename_crate.both.compat.c
similarity index 100%
rename from tests/expectations/rename-crate.both.compat.c
rename to tests/expectations/rename_crate.both.compat.c
diff --git a/tests/expectations/rename-crate.c b/tests/expectations/rename_crate.c
similarity index 100%
rename from tests/expectations/rename-crate.c
rename to tests/expectations/rename_crate.c
diff --git a/tests/expectations/rename-crate.compat.c b/tests/expectations/rename_crate.compat.c
similarity index 100%
rename from tests/expectations/rename-crate.compat.c
rename to tests/expectations/rename_crate.compat.c
diff --git a/tests/expectations/rename-crate.cpp b/tests/expectations/rename_crate.cpp
similarity index 100%
rename from tests/expectations/rename-crate.cpp
rename to tests/expectations/rename_crate.cpp
diff --git a/tests/expectations/rename-crate.tag.c b/tests/expectations/rename_crate.tag.c
similarity index 100%
rename from tests/expectations/rename-crate.tag.c
rename to tests/expectations/rename_crate.tag.c
diff --git a/tests/expectations/rename-crate.tag.compat.c b/tests/expectations/rename_crate.tag.compat.c
similarity index 100%
rename from tests/expectations/rename-crate.tag.compat.c
rename to tests/expectations/rename_crate.tag.compat.c
diff --git a/tests/expectations/renaming-overrides-prefixing.both.c b/tests/expectations/renaming_overrides_prefixing.both.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.both.c
rename to tests/expectations/renaming_overrides_prefixing.both.c
diff --git a/tests/expectations/renaming-overrides-prefixing.both.compat.c b/tests/expectations/renaming_overrides_prefixing.both.compat.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.both.compat.c
rename to tests/expectations/renaming_overrides_prefixing.both.compat.c
diff --git a/tests/expectations/renaming-overrides-prefixing.c b/tests/expectations/renaming_overrides_prefixing.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.c
rename to tests/expectations/renaming_overrides_prefixing.c
diff --git a/tests/expectations/renaming-overrides-prefixing.compat.c b/tests/expectations/renaming_overrides_prefixing.compat.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.compat.c
rename to tests/expectations/renaming_overrides_prefixing.compat.c
diff --git a/tests/expectations/renaming-overrides-prefixing.cpp b/tests/expectations/renaming_overrides_prefixing.cpp
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.cpp
rename to tests/expectations/renaming_overrides_prefixing.cpp
diff --git a/tests/expectations/renaming-overrides-prefixing.tag.c b/tests/expectations/renaming_overrides_prefixing.tag.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.tag.c
rename to tests/expectations/renaming_overrides_prefixing.tag.c
diff --git a/tests/expectations/renaming-overrides-prefixing.tag.compat.c b/tests/expectations/renaming_overrides_prefixing.tag.compat.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.tag.compat.c
rename to tests/expectations/renaming_overrides_prefixing.tag.compat.c
diff --git a/tests/expectations/simplify-option-ptr.both.c b/tests/expectations/simplify_option_ptr.both.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.both.c
rename to tests/expectations/simplify_option_ptr.both.c
diff --git a/tests/expectations/simplify-option-ptr.both.compat.c b/tests/expectations/simplify_option_ptr.both.compat.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.both.compat.c
rename to tests/expectations/simplify_option_ptr.both.compat.c
diff --git a/tests/expectations/simplify-option-ptr.c b/tests/expectations/simplify_option_ptr.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.c
rename to tests/expectations/simplify_option_ptr.c
diff --git a/tests/expectations/simplify-option-ptr.compat.c b/tests/expectations/simplify_option_ptr.compat.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.compat.c
rename to tests/expectations/simplify_option_ptr.compat.c
diff --git a/tests/expectations/simplify-option-ptr.cpp b/tests/expectations/simplify_option_ptr.cpp
similarity index 100%
rename from tests/expectations/simplify-option-ptr.cpp
rename to tests/expectations/simplify_option_ptr.cpp
diff --git a/tests/expectations/simplify-option-ptr.tag.c b/tests/expectations/simplify_option_ptr.tag.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.tag.c
rename to tests/expectations/simplify_option_ptr.tag.c
diff --git a/tests/expectations/simplify-option-ptr.tag.compat.c b/tests/expectations/simplify_option_ptr.tag.compat.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.tag.compat.c
rename to tests/expectations/simplify_option_ptr.tag.compat.c
diff --git a/tests/expectations/size-types.c b/tests/expectations/size_types.c
similarity index 100%
rename from tests/expectations/size-types.c
rename to tests/expectations/size_types.c
diff --git a/tests/expectations/size-types.compat.c b/tests/expectations/size_types.compat.c
similarity index 100%
rename from tests/expectations/size-types.compat.c
rename to tests/expectations/size_types.compat.c
diff --git a/tests/expectations/size-types.cpp b/tests/expectations/size_types.cpp
similarity index 100%
rename from tests/expectations/size-types.cpp
rename to tests/expectations/size_types.cpp
diff --git a/tests/expectations/style-crash.compat.c b/tests/expectations/style_crash.compat.c
similarity index 100%
rename from tests/expectations/style-crash.compat.c
rename to tests/expectations/style_crash.compat.c
diff --git a/tests/expectations/style-crash.cpp b/tests/expectations/style_crash.cpp
similarity index 100%
rename from tests/expectations/style-crash.cpp
rename to tests/expectations/style_crash.cpp
diff --git a/tests/expectations/transform-op.both.c b/tests/expectations/transform_op.both.c
similarity index 100%
rename from tests/expectations/transform-op.both.c
rename to tests/expectations/transform_op.both.c
diff --git a/tests/expectations/transform-op.both.compat.c b/tests/expectations/transform_op.both.compat.c
similarity index 100%
rename from tests/expectations/transform-op.both.compat.c
rename to tests/expectations/transform_op.both.compat.c
diff --git a/tests/expectations/transform-op.c b/tests/expectations/transform_op.c
similarity index 100%
rename from tests/expectations/transform-op.c
rename to tests/expectations/transform_op.c
diff --git a/tests/expectations/transform-op.compat.c b/tests/expectations/transform_op.compat.c
similarity index 100%
rename from tests/expectations/transform-op.compat.c
rename to tests/expectations/transform_op.compat.c
diff --git a/tests/expectations/transform-op.cpp b/tests/expectations/transform_op.cpp
similarity index 100%
rename from tests/expectations/transform-op.cpp
rename to tests/expectations/transform_op.cpp
diff --git a/tests/expectations/transform-op.tag.c b/tests/expectations/transform_op.tag.c
similarity index 100%
rename from tests/expectations/transform-op.tag.c
rename to tests/expectations/transform_op.tag.c
diff --git a/tests/expectations/transform-op.tag.compat.c b/tests/expectations/transform_op.tag.compat.c
similarity index 100%
rename from tests/expectations/transform-op.tag.compat.c
rename to tests/expectations/transform_op.tag.compat.c
diff --git a/tests/rust/asserted-cast.rs b/tests/rust/asserted_cast.rs
similarity index 100%
rename from tests/rust/asserted-cast.rs
rename to tests/rust/asserted_cast.rs
diff --git a/tests/rust/asserted-cast.toml b/tests/rust/asserted_cast.toml
similarity index 100%
rename from tests/rust/asserted-cast.toml
rename to tests/rust/asserted_cast.toml
diff --git a/tests/rust/cfg-2.rs b/tests/rust/cfg_2.rs
similarity index 100%
rename from tests/rust/cfg-2.rs
rename to tests/rust/cfg_2.rs
diff --git a/tests/rust/cfg-2.toml b/tests/rust/cfg_2.toml
similarity index 100%
rename from tests/rust/cfg-2.toml
rename to tests/rust/cfg_2.toml
diff --git a/tests/rust/cfg-field.rs b/tests/rust/cfg_field.rs
similarity index 100%
rename from tests/rust/cfg-field.rs
rename to tests/rust/cfg_field.rs
diff --git a/tests/rust/derive-eq/Cargo.lock b/tests/rust/derive_eq/Cargo.lock
similarity index 100%
rename from tests/rust/derive-eq/Cargo.lock
rename to tests/rust/derive_eq/Cargo.lock
diff --git a/tests/rust/derive-eq/Cargo.toml b/tests/rust/derive_eq/Cargo.toml
similarity index 100%
rename from tests/rust/derive-eq/Cargo.toml
rename to tests/rust/derive_eq/Cargo.toml
diff --git a/tests/rust/derive-eq/cbindgen.toml b/tests/rust/derive_eq/cbindgen.toml
similarity index 100%
rename from tests/rust/derive-eq/cbindgen.toml
rename to tests/rust/derive_eq/cbindgen.toml
diff --git a/tests/rust/derive-eq/src/lib.rs b/tests/rust/derive_eq/src/lib.rs
similarity index 100%
rename from tests/rust/derive-eq/src/lib.rs
rename to tests/rust/derive_eq/src/lib.rs
diff --git a/tests/rust/destructor-and-copy-ctor.rs b/tests/rust/destructor_and_copy_ctor.rs
similarity index 100%
rename from tests/rust/destructor-and-copy-ctor.rs
rename to tests/rust/destructor_and_copy_ctor.rs
diff --git a/tests/rust/destructor-and-copy-ctor.toml b/tests/rust/destructor_and_copy_ctor.toml
similarity index 100%
rename from tests/rust/destructor-and-copy-ctor.toml
rename to tests/rust/destructor_and_copy_ctor.toml
diff --git a/tests/rust/extern-2.rs b/tests/rust/extern_2.rs
similarity index 100%
rename from tests/rust/extern-2.rs
rename to tests/rust/extern_2.rs
diff --git a/tests/rust/generic-pointer.rs b/tests/rust/generic_pointer.rs
similarity index 100%
rename from tests/rust/generic-pointer.rs
rename to tests/rust/generic_pointer.rs
diff --git a/tests/rust/monomorph-1.rs b/tests/rust/monomorph_1.rs
similarity index 100%
rename from tests/rust/monomorph-1.rs
rename to tests/rust/monomorph_1.rs
diff --git a/tests/rust/monomorph-2.rs b/tests/rust/monomorph_2.rs
similarity index 100%
rename from tests/rust/monomorph-2.rs
rename to tests/rust/monomorph_2.rs
diff --git a/tests/rust/monomorph-3.rs b/tests/rust/monomorph_3.rs
similarity index 100%
rename from tests/rust/monomorph-3.rs
rename to tests/rust/monomorph_3.rs
diff --git a/tests/rust/must-use.rs b/tests/rust/must_use.rs
similarity index 100%
rename from tests/rust/must-use.rs
rename to tests/rust/must_use.rs
diff --git a/tests/rust/must-use.toml b/tests/rust/must_use.toml
similarity index 100%
rename from tests/rust/must-use.toml
rename to tests/rust/must_use.toml
diff --git a/tests/rust/rename-crate/Cargo.lock b/tests/rust/rename_crate/Cargo.lock
similarity index 68%
rename from tests/rust/rename-crate/Cargo.lock
rename to tests/rust/rename_crate/Cargo.lock
index 21cc81d..2499b6d 100644
--- a/tests/rust/rename-crate/Cargo.lock
+++ b/tests/rust/rename_crate/Cargo.lock
@@ -5,21 +5,20 @@ name = "dependency"
 version = "0.1.0"
 
 [[package]]
-name = "no-extern"
+name = "no_extern"
 version = "0.1.0"
 
 [[package]]
-name = "old-dep-name"
+name = "old_dep_name"
 version = "0.1.0"
 dependencies = [
- "no-extern 0.1.0",
+ "no_extern",
 ]
 
 [[package]]
-name = "rename-crate"
+name = "rename_crate"
 version = "0.1.0"
 dependencies = [
- "dependency 0.1.0",
- "old-dep-name 0.1.0",
+ "dependency",
+ "old_dep_name",
 ]
-
diff --git a/tests/rust/rename-crate/Cargo.toml b/tests/rust/rename_crate/Cargo.toml
similarity index 59%
rename from tests/rust/rename-crate/Cargo.toml
rename to tests/rust/rename_crate/Cargo.toml
index a1af1a8..5927f4d 100644
--- a/tests/rust/rename-crate/Cargo.toml
+++ b/tests/rust/rename_crate/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "rename-crate"
+name = "rename_crate"
 version = "0.1.0"
 authors = ["Ryan Hunt <rhunt@eqrion.net>"]
 
 [dependencies]
 dependency = { path = "./dependency/" }
-renamed_dep = { path = "./old-dep", package = "old-dep-name" }
+renamed_dep = { path = "./old_dep", package = "old_dep_name" }
diff --git a/tests/rust/rename-crate/cbindgen.toml b/tests/rust/rename_crate/cbindgen.toml
similarity index 100%
rename from tests/rust/rename-crate/cbindgen.toml
rename to tests/rust/rename_crate/cbindgen.toml
diff --git a/tests/rust/rename-crate/dependency/Cargo.toml b/tests/rust/rename_crate/dependency/Cargo.toml
similarity index 100%
rename from tests/rust/rename-crate/dependency/Cargo.toml
rename to tests/rust/rename_crate/dependency/Cargo.toml
diff --git a/tests/rust/rename-crate/dependency/src/lib.rs b/tests/rust/rename_crate/dependency/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/dependency/src/lib.rs
rename to tests/rust/rename_crate/dependency/src/lib.rs
diff --git a/tests/rust/rename-crate/no-extern/Cargo.lock b/tests/rust/rename_crate/no_extern/Cargo.lock
similarity index 100%
rename from tests/rust/rename-crate/no-extern/Cargo.lock
rename to tests/rust/rename_crate/no_extern/Cargo.lock
diff --git a/tests/rust/rename-crate/no-extern/Cargo.toml b/tests/rust/rename_crate/no_extern/Cargo.toml
similarity index 81%
rename from tests/rust/rename-crate/no-extern/Cargo.toml
rename to tests/rust/rename_crate/no_extern/Cargo.toml
index a33672e..d328ba8 100644
--- a/tests/rust/rename-crate/no-extern/Cargo.toml
+++ b/tests/rust/rename_crate/no_extern/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "no-extern"
+name = "no_extern"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
diff --git a/tests/rust/rename-crate/no-extern/src/lib.rs b/tests/rust/rename_crate/no_extern/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/no-extern/src/lib.rs
rename to tests/rust/rename_crate/no_extern/src/lib.rs
diff --git a/tests/rust/rename-crate/old-dep/Cargo.lock b/tests/rust/rename_crate/old_dep/Cargo.lock
similarity index 100%
rename from tests/rust/rename-crate/old-dep/Cargo.lock
rename to tests/rust/rename_crate/old_dep/Cargo.lock
diff --git a/tests/rust/rename-crate/old-dep/Cargo.toml b/tests/rust/rename_crate/old_dep/Cargo.toml
similarity index 67%
rename from tests/rust/rename-crate/old-dep/Cargo.toml
rename to tests/rust/rename_crate/old_dep/Cargo.toml
index f560eb3..1414262 100644
--- a/tests/rust/rename-crate/old-dep/Cargo.toml
+++ b/tests/rust/rename_crate/old_dep/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "old-dep-name"
+name = "old_dep_name"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
 
 [target.'cfg(not(target_os = "freebsd"))'.dependencies]
-no-extern = { path = "../no-extern/" }
+no_extern = { path = "../no_extern/" }
diff --git a/tests/rust/rename-crate/old-dep/src/lib.rs b/tests/rust/rename_crate/old_dep/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/old-dep/src/lib.rs
rename to tests/rust/rename_crate/old_dep/src/lib.rs
diff --git a/tests/rust/rename-crate/src/lib.rs b/tests/rust/rename_crate/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/src/lib.rs
rename to tests/rust/rename_crate/src/lib.rs
diff --git a/tests/rust/renaming-overrides-prefixing.rs b/tests/rust/renaming_overrides_prefixing.rs
similarity index 100%
rename from tests/rust/renaming-overrides-prefixing.rs
rename to tests/rust/renaming_overrides_prefixing.rs
diff --git a/tests/rust/renaming-overrides-prefixing.toml b/tests/rust/renaming_overrides_prefixing.toml
similarity index 100%
rename from tests/rust/renaming-overrides-prefixing.toml
rename to tests/rust/renaming_overrides_prefixing.toml
diff --git a/tests/rust/simplify-option-ptr.rs b/tests/rust/simplify_option_ptr.rs
similarity index 100%
rename from tests/rust/simplify-option-ptr.rs
rename to tests/rust/simplify_option_ptr.rs
diff --git a/tests/rust/size-types.rs b/tests/rust/size_types.rs
similarity index 100%
rename from tests/rust/size-types.rs
rename to tests/rust/size_types.rs
diff --git a/tests/rust/size-types.toml b/tests/rust/size_types.toml
similarity index 100%
rename from tests/rust/size-types.toml
rename to tests/rust/size_types.toml
diff --git a/tests/rust/style-crash.rs b/tests/rust/style_crash.rs
similarity index 100%
rename from tests/rust/style-crash.rs
rename to tests/rust/style_crash.rs
diff --git a/tests/rust/transform-op.rs b/tests/rust/transform_op.rs
similarity index 100%
rename from tests/rust/transform-op.rs
rename to tests/rust/transform_op.rs
diff --git a/tests/rust/transform-op.toml b/tests/rust/transform_op.toml
similarity index 100%
rename from tests/rust/transform-op.toml
rename to tests/rust/transform_op.toml