diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2022-02-08 18:09:45 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-02-08 18:09:45 +0000 |
| commit | ab26a1e185f0c18d09937e9e7296a67ca5ad1baf (patch) | |
| tree | c7860677b852ac61e489c95f07d912605cc96063 | |
| parent | 5adee8d3f913888047eca00ba26b593510142275 (diff) | |
| parent | 7af09cb1262fa60d31164662966dcb851f0bc314 (diff) | |
| download | rtic-ab26a1e185f0c18d09937e9e7296a67ca5ad1baf.tar.gz rtic-ab26a1e185f0c18d09937e9e7296a67ca5ad1baf.tar.zst rtic-ab26a1e185f0c18d09937e9e7296a67ca5ad1baf.zip | |
Merge #602
602: book: Restore accidentally removed files r=korken89 a=AfoHT
- book: Restore accidentally removed files
- Update changelog
Co-authored-by: Henrik Tjäder <henrik@grepit.se>
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | book/en/src/by-example/tips_from_ram.md | 4 | ||||
| -rw-r--r-- | ci/expected/ramfunc.run.grep.bar | 1 | ||||
| -rw-r--r-- | ci/expected/ramfunc.run.grep.foo | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 618a00b4..112491dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). - `examples/periodic-at2.rs`, an example of a periodic process with two tasks, with offset timing. Here we depict two alternative usages of the timer type, explicit and trait based. - book: Update `Monotonic` tips. +### Fixed + +- Readded missing ramfunc output to book + ## [v1.0.0] - 2021-12-25 ### Changed diff --git a/book/en/src/by-example/tips_from_ram.md b/book/en/src/by-example/tips_from_ram.md index ecb5dde1..fc47803f 100644 --- a/book/en/src/by-example/tips_from_ram.md +++ b/book/en/src/by-example/tips_from_ram.md @@ -35,10 +35,10 @@ One can look at the output of `cargo-nm` to confirm that `bar` ended in RAM ``` console $ cargo nm --example ramfunc --release | grep ' foo::' -{{#include ../../../../ci/expected/ramfunc.grep.foo}} +{{#include ../../../../ci/expected/ramfunc.run.grep.foo}} ``` ``` console $ cargo nm --example ramfunc --release | grep ' bar::' -{{#include ../../../../ci/expected/ramfunc.grep.bar}} +{{#include ../../../../ci/expected/ramfunc.run.grep.bar}} ``` diff --git a/ci/expected/ramfunc.run.grep.bar b/ci/expected/ramfunc.run.grep.bar new file mode 100644 index 00000000..33e002fe --- /dev/null +++ b/ci/expected/ramfunc.run.grep.bar @@ -0,0 +1 @@ +20000000 t ramfunc::bar::h9d6714fe5a3b0c89 diff --git a/ci/expected/ramfunc.run.grep.foo b/ci/expected/ramfunc.run.grep.foo new file mode 100644 index 00000000..44e88226 --- /dev/null +++ b/ci/expected/ramfunc.run.grep.foo @@ -0,0 +1 @@ +00000162 t ramfunc::foo::h30e7789b08c08e19 |