Merge #68

68: v0.1.6 r=japaric a=japaric prepare for crates.io release Co-authored-by: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
knurling-rs · Mar 23, 2022 · 1e02534 · 1e02534
2 parents bb14947 + a4c797f
commit 1e02534
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-- [#60]: Update to Rust 2021 🎉
-- [#58] Print a message when linking normally fails
+## [v0.1.6] - 2022-03-23
+
+### Fixed
+
+- [#63]: Handles `memory.x` overrides by searching in the current working directory first.
+
+[#63]: https://github.com/knurling-rs/flip-link/pull/63
+
+### Changed
+
+- [#60]: Update to Rust 2021 🎉. Requires Rust 1.56+ to build
 
 [#60]: https://github.com/knurling-rs/flip-link/pull/60
+
+### Added
+
+- [#58] Print a message when linking normally fails. This makes it clearer that the failure is not due to `flip-link`.
+
 [#58]: https://github.com/knurling-rs/flip-link/pull/58
 
 ## [v0.1.5] - 2021-08-27

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["arm", "cortex-m", "stack-protection"]
 license = "MIT OR Apache-2.0"
 name = "flip-link"
 repository = "https://github.com/knurling-rs/flip-link"
-version = "0.1.5"
+version = "0.1.6"
 readme = "README.md"
 
 [dependencies]

diff --git a/src/main.rs b/src/main.rs
@@ -325,7 +325,7 @@ fn find_ram_in_linker_script(linker_script: &str) -> Option<MemoryEntry> {
         for segment in segments {
             let boundary_pos = segment
                 .find(|c| c == 'K' || c == 'M')
-                .unwrap_or_else(|| segment.len());
+                .unwrap_or(segment.len());
             let length: u64 = tryc!(segment[..boundary_pos].parse());
             let raw = &segment[boundary_pos..];
             let mut chars = raw.chars();