Skip to content

Commit 995cb7c

Browse files
committed
Move embedded to sub-dir with-allocator
In preparation for adding a no-allocator embedded test crate; move the `embedded` crate (which uses a global allocator) to a subdirectory called `with-allocator`.
1 parent 68c3351 commit 995cb7c

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/rust.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ jobs:
6464
command: clippy
6565
args: -- -D warnings
6666

67-
Embedded:
67+
EmbeddedWithAlloc:
68+
name: no_std with alloc
6869
runs-on: ubuntu-latest
6970
steps:
7071
- name: Checkout
@@ -83,4 +84,4 @@ jobs:
8384
env:
8485
RUSTFLAGS: "-C link-arg=-Tlink.x"
8586
CARGO_TARGET_THUMBV7M_NONE_EABI_RUNNER: "qemu-system-arm -cpu cortex-m3 -machine mps2-an385 -nographic -semihosting-config enable=on,target=native -kernel"
86-
run: cd embedded && cargo run --target thumbv7m-none-eabi
87+
run: cd embedded/with-allocator && cargo run --target thumbv7m-none-eabi

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
*.o
33
/Cargo.lock
44

5-
/embedded/Cargo.lock
6-
/embedded/.cargo
5+
/embedded/with-allocator/Cargo.lock
6+
/embedded/with-allocator/.cargo

embedded/Cargo.toml renamed to embedded/with-allocator/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["Riccardo Casatta <[email protected]>"]
33
edition = "2018"
44
readme = "README.md"
5-
name = "embedded"
5+
name = "with-allocator"
66
version = "0.1.0"
77

88
[dependencies]
@@ -11,10 +11,10 @@ cortex-m-rt = "0.6.10"
1111
cortex-m-semihosting = "0.3.3"
1212
panic-halt = "0.2.0"
1313
alloc-cortex-m = "0.4.1"
14-
bech32 = { path="../", default-features = false }
14+
bech32 = { path="../../", default-features = false }
1515

1616
[[bin]]
17-
name = "embedded"
17+
name = "with-allocator"
1818
test = false
1919
bench = false
2020

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)