Skip to content

Commit 06fd382

Browse files
committed
Merge remote-tracking branch 'upstream/master' into allocator_api
2 parents c870a37 + f1393ae commit 06fd382

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

.github/bors.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Continuous integration
79

.github/workflows/clippy.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request_target:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Clippy check
79

.github/workflows/rustfmt.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Code formatting check
79

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ fn main() -> ! {
4646

4747
For a full usage example, see [`examples/global_alloc.rs`](https://github.com/rust-embedded/embedded-alloc/blob/master/examples/global_alloc.rs).
4848

49+
For this to work, an implementation of [`critical-section`](https://github.com/rust-embedded/critical-section) must be provided.
50+
51+
For simple use cases you may enable the `critical-section-single-core` feature in the [cortex-m](https://github.com/rust-embedded/cortex-m) crate.
52+
Please refer to the documentation of [`critical-section`](https://docs.rs/critical-section) for further guidance.
53+
54+
4955
## License
5056

5157
Licensed under either of

0 commit comments

Comments
 (0)