From 138383dea1f6d3ce377c24f7d00e0560ab3aca04 Mon Sep 17 00:00:00 2001
From: Alexander Koz <a@koz.email>
Date: Fri, 12 Apr 2024 18:14:35 +0400
Subject: [PATCH] Fix utils usage in rustflags, update deps, bump support
 crates

---
 Cargo.lock                   | 8 ++++----
 cargo/src/build/rustflags.rs | 7 ++++---
 support/build/Cargo.toml     | 2 +-
 support/sim-ctrl/Cargo.toml  | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e36242e..af5c054d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,9 +51,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "annotate-snippets"
@@ -3806,7 +3806,7 @@ dependencies = [
 
 [[package]]
 name = "playdate-build"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "crate-metadata",
  "dirs",
@@ -3923,7 +3923,7 @@ dependencies = [
 
 [[package]]
 name = "playdate-simulator-utils"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "async-std",
  "log",
diff --git a/cargo/src/build/rustflags.rs b/cargo/src/build/rustflags.rs
index aa24c3c3..42323727 100644
--- 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
index 25c952b1..fc42218a 100644
--- 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
index 86aa8854..f7e45da6 100644
--- 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"]