From 63b32b39e10fb0677d0a980930dc83ee792cd5ca Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 2 Aug 2021 13:29:06 -0400
Subject: [PATCH] Use an em bikeshed instead of an underscore bikeshed.

---
 embassy-stm32/Cargo.toml              |  2 +-
 examples/stm32f4/Cargo.toml           |  2 +-
 examples/stm32h7/Cargo.toml           |  2 +-
 stm32-metapac-gen/src/assets/build.rs | 12 +-----------
 stm32-metapac/Cargo.toml              |  2 +-
 stm32-metapac/build.rs                |  2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 65592b1d9..6f8691c3e 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -42,7 +42,7 @@ defmt-warn = [ ]
 defmt-error = [ ]
 sdmmc-rs = ["embedded-sdmmc"]
 net = ["embassy-net", "vcell"]
-memory_x = ["stm32-metapac/memory_x"]
+memory-x = ["stm32-metapac/memory-x"]
 
 # Reexport stm32-metapac at `embassy_stm32::pac`.
 # This is unstable because semver-minor (non-breaking) releases of embassy-stm32 may major-bump (breaking) the stm32-metapac version.
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml
index eb88ecc1c..84b1e30ee 100644
--- a/examples/stm32f4/Cargo.toml
+++ b/examples/stm32f4/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory_x"]  }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory-x"]  }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 
 defmt = "0.2.0"
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index 081e45a69..8bc6781e0 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory_x"] }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory-x"] }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
 stm32-metapac = { path = "../../stm32-metapac", features = ["stm32h743zi"] }
diff --git a/stm32-metapac-gen/src/assets/build.rs b/stm32-metapac-gen/src/assets/build.rs
index 0fe7c65e9..4110fe485 100644
--- a/stm32-metapac-gen/src/assets/build.rs
+++ b/stm32-metapac-gen/src/assets/build.rs
@@ -9,17 +9,7 @@ fn main() {
         .unwrap()
         .to_ascii_lowercase();
 
-    // Put `memory.x` in our output directory and ensure it's
-    // on the linker search path.
-    let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    //File::create(out.join("memory.x"))
-        //.unwrap()
-        //.write_all(include_bytes!("memory.x"))
-        //.unwrap();
-
-    println!("HOWDY");
-
-    #[cfg(feature = "memory_x")]
+    #[cfg(feature = "memory-x")]
     println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name);
 
     #[cfg(feature = "rt")]
diff --git a/stm32-metapac/Cargo.toml b/stm32-metapac/Cargo.toml
index 692acd8a8..fabd95664 100644
--- a/stm32-metapac/Cargo.toml
+++ b/stm32-metapac/Cargo.toml
@@ -17,7 +17,7 @@ regex = "1.5.4"
 
 [features]
 rt = ["cortex-m-rt/device"]
-memory_x = []
+memory-x = []
 
 # BEGIN GENERATED FEATURES
 # Generated by gen_features.py. DO NOT EDIT.
diff --git a/stm32-metapac/build.rs b/stm32-metapac/build.rs
index d922735a1..ca964c9ec 100644
--- a/stm32-metapac/build.rs
+++ b/stm32-metapac/build.rs
@@ -28,7 +28,7 @@ fn main() {
         chip_name.to_ascii_lowercase()
     );
 
-    #[cfg(feature = "memory_x")]
+    #[cfg(feature = "memory-x")]
     println!(
         "cargo:rustc-link-search={}/src/chips/{}/memory_x/",
         out_dir.display(),