Skip to content
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.

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

v0.1.6 #68

Merged
merged 2 commits into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down