tylerwhall
diff --git a/‎.gitmodules
Lines changed: 4 additions & 4 deletions b/‎.gitmodules
Lines changed: 4 additions & 4 deletions
diff --git a/‎CMakeLists.txt
Lines changed: 2 additions & 2 deletions b/‎CMakeLists.txt
Lines changed: 2 additions & 2 deletions
diff --git a/‎rust-app/zephyr/src/msgq.rs
Lines changed: 0 additions & 21 deletions b/‎rust-app/zephyr/src/msgq.rs
Lines changed: 0 additions & 21 deletions
diff --git a/‎rust-app/.gitignore renamed to ‎rust/.gitignore b/‎rust-app/.gitignore renamed to ‎rust/.gitignore
diff --git a/‎rust-app/build.sh renamed to ‎rust/build.sh b/‎rust-app/build.sh renamed to ‎rust/build.sh
diff --git a/‎rust-app/compiler_builtins/.gitignore renamed to ‎rust/compiler_builtins/.gitignore b/‎rust-app/compiler_builtins/.gitignore renamed to ‎rust/compiler_builtins/.gitignore
diff --git a/‎rust-app/compiler_builtins/Cargo.toml renamed to ‎rust/compiler_builtins/Cargo.toml b/‎rust-app/compiler_builtins/Cargo.toml renamed to ‎rust/compiler_builtins/Cargo.toml
diff --git a/‎rust-app/compiler_builtins/src/lib.rs renamed to ‎rust/compiler_builtins/src/lib.rs b/‎rust-app/compiler_builtins/src/lib.rs renamed to ‎rust/compiler_builtins/src/lib.rs
diff --git a/‎rust-app/i686-unknown-zephyr.json renamed to ‎rust/i686-unknown-zephyr.json b/‎rust-app/i686-unknown-zephyr.json renamed to ‎rust/i686-unknown-zephyr.json
diff --git a/‎rust-app/libc renamed to ‎rust/libc b/‎rust-app/libc renamed to ‎rust/libc
@@ -1,6 +1,6 @@
-[submodule "rust-app/libc"]
-	path = rust-app/libc
+[submodule "rust/libc"]
+	path = rust/libc
 	url = https://github.com/tylerwhall/libc.git
-[submodule "rust-app/rust"]
-	path = rust-app/rust
+[submodule "rust/rust"]
+	path = rust/rust
 	url = https://github.com/tylerwhall/rust.git
@@ -36,7 +36,7 @@ add_custom_command(OUTPUT ${zephyr_bindgen}
           cargo -v build --release --target-dir=${rust_build_dir}
 )
 
-set(rust_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/rust-app)
+set(rust_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/rust)
 set(rust_sysroot ${CMAKE_CURRENT_BINARY_DIR}/sysroot)
 set(rust_sysroot_build ${CMAKE_CURRENT_BINARY_DIR}/sysroot-build)
 set(rust_app_build ${CMAKE_CURRENT_BINARY_DIR}/app)
@@ -110,4 +110,4 @@ add_custom_command(
 )
 add_custom_target(rust_final DEPENDS ${rust_obj})
 zephyr_library_import(rust ${rust_obj})
-add_dependencies(rust rust_final)
+add_dependencies(rust rust_final)
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ add_custom_command(OUTPUT ${zephyr_bindgen}`
`36`	`36`	`cargo -v build --release --target-dir=${rust_build_dir}`
`37`	`37`	`)`
`38`	`38`
`39`		`-set(rust_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/rust-app)`
	`39`	`+set(rust_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/rust)`
`40`	`40`	`set(rust_sysroot ${CMAKE_CURRENT_BINARY_DIR}/sysroot)`
`41`	`41`	`set(rust_sysroot_build ${CMAKE_CURRENT_BINARY_DIR}/sysroot-build)`
`42`	`42`	`set(rust_app_build ${CMAKE_CURRENT_BINARY_DIR}/app)`
`@@ -110,4 +110,4 @@ add_custom_command(`
`110`	`110`	`)`
`111`	`111`	`add_custom_target(rust_final DEPENDS ${rust_obj})`
`112`	`112`	`zephyr_library_import(rust ${rust_obj})`
`113`		`-add_dependencies(rust rust_final)`
	`113`	`+add_dependencies(rust rust_final)`