Fix utils usage in rustflags, update deps, bump support crates

boozook · Apr 12, 2024 · 138383d · 138383d
1 parent dbb9e1b
commit 138383d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo/src/build/rustflags.rs b/cargo/src/build/rustflags.rs
@@ -5,10 +5,11 @@ use std::ops::Add;
 use anyhow::Context;
 use cargo::core::compiler::CompileKind;
 use cargo::core::compiler::CompileTarget;
-use cargo::util;
+use cargo::util::Filesystem;
 use playdate::compile::RUSTFLAGS_BIN_PLAYDATE;
 use playdate::compile::RUSTFLAGS_LIB_HOST;
 use playdate::compile::RUSTFLAGS_LIB_PLAYDATE;
+use playdate::compile::LINK_MAP_BIN_SRC;
 use playdate::consts::DEVICE_TARGET;
 
 use crate::config::Config;
@@ -54,12 +55,12 @@ impl Rustflags {
 				                       .config()
 				                       .target_dir()
 				                       .unwrap_or_default()
-				                       .unwrap_or_else(|| util::Filesystem::new("target".into()))
+				                       .unwrap_or_else(|| Filesystem::new("target".into()))
 				                       .into_path_unlocked()
 				                       .canonicalize()?;
 				let map = target_dir.join("pd.x");
 				if !map.exists() {
-					std::fs::write(&map, build::compile::LINK_MAP_BIN_SRC)?;
+					std::fs::write(&map, LINK_MAP_BIN_SRC)?;
 				}
 				let link_map = format!("-Clink-arg=-T{}", map.display());
 				Self::rustflags_bin_playdate().into_iter()

diff --git a/support/build/Cargo.toml b/support/build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-build"
-version = "0.2.3"
+version = "0.2.4"
 readme = "README.md"
 description = "Utils that help to build package for Playdate"
 keywords = ["playdate", "package", "encoding", "manifest", "assets"]

diff --git a/support/sim-ctrl/Cargo.toml b/support/sim-ctrl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-simulator-utils"
-version = "0.1.2"
+version = "0.1.3"
 readme = "README.md"
 description = "Cross-platform utils to deal with Playdate Simulator."
 keywords = ["playdate", "sdk", "utils"]