aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--book/en/src/by-example/resources.md8
-rw-r--r--src/lib.rs2
2 files changed, 9 insertions, 1 deletions
diff --git a/book/en/src/by-example/resources.md b/book/en/src/by-example/resources.md
index 301961d0..3a3e0b76 100644
--- a/book/en/src/by-example/resources.md
+++ b/book/en/src/by-example/resources.md
@@ -64,6 +64,14 @@ $ cargo run --example lock
{{#include ../../../../ci/expected/lock.run}}
```
+## Multi-lock
+
+As an extension to `lock`, and to reduce rightward drift, locks can be taken as tuples. The following examples shows this in use:
+
+``` rust
+{{#include ../../../../examples/multilock.rs}}
+```
+
## Late resources
Late resources are resources that are not given an initial value at compile time using the `#[init]` attribute but instead are initialized at runtime using the `init::LateResources` values returned by the `init` function.
diff --git a/src/lib.rs b/src/lib.rs
index fc1991c6..9c2b252d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,7 @@ use cortex_m::{
};
use cortex_m_rt as _; // vector table
pub use cortex_m_rtic_macros::app;
-pub use rtic_core::{Exclusive, Mutex, prelude as mutex_prelude};
+pub use rtic_core::{prelude as mutex_prelude, Exclusive, Mutex};
#[cfg(armv7m)]
pub mod cyccnt;