Skip to content

Commit 2018b17

Browse files
committed
Merge remote-tracking branch 'upstream/master' into allocator_api
2 parents 06fd382 + 0b8c442 commit 2018b17

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @rust-embedded/cortex-m
1+
* @rust-embedded/libs

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
## Conduct
44

5-
**Contact**: [Cortex-M team](https://github.com/rust-embedded/wg#the-cortex-m-team)
5+
**Contact**: [Libs team](https://github.com/rust-embedded/wg#the-libs-team)
66

77
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
88
* On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
99
* Please be kind and courteous. There's no need to be mean or rude.
1010
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
1111
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
1212
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
13-
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Cortex-M team][team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
13+
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Libs team][team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
1414
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
1515

1616
## Moderation
@@ -34,4 +34,4 @@ The enforcement policies listed above apply to all official embedded WG venues;
3434

3535
*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
3636

37-
[team]: https://github.com/rust-embedded/wg#the-cortex-m-team
37+
[team]: https://github.com/rust-embedded/wg#the-libs-team

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ critical-section = "1.0"
3232
[dependencies.linked_list_allocator]
3333
default-features = false
3434
version = "0.10.5"
35-
features = ["const_mut_refs"]
3635

3736
[dev-dependencies]
3837
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Note that using this as your global allocator requires Rust 1.68 or later.
1111
(With earlier versions, you need the unstable feature `#![feature(default_alloc_error_handler)]`)
1212

13-
This project is developed and maintained by the [Cortex-M team][team].
13+
This project is developed and maintained by the [libs team][team].
1414

1515
## Example
1616

@@ -71,8 +71,8 @@ dual licensed as above, without any additional terms or conditions.
7171
## Code of Conduct
7272

7373
Contribution to this crate is organized under the terms of the [Rust Code of
74-
Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team], promises
74+
Conduct][CoC], the maintainer of this crate, the [libs team][team], promises
7575
to intervene to uphold that code of conduct.
7676

7777
[CoC]: CODE_OF_CONDUCT.md
78-
[team]: https://github.com/rust-embedded/wg#the-cortex-m-team
78+
[team]: https://github.com/rust-embedded/wg#the-libs-team

0 commit comments

Comments
 (0)