From a00604a189c00ab9415400c391acc3a589beb6e7 Mon Sep 17 00:00:00 2001
From: Kor Nielsen <kor@google.com>
Date: Thu, 27 Jul 2023 17:05:33 -0700
Subject: [PATCH] Inline ufmt do_as_formatter (-372 bytes for ROM)

This modifies the ufmt package; upstream PR at
https://github.com/japaric/ufmt/pull/59.

This significantly reduces the size of the uart ROM build.
---
 Cargo.lock                        | 9 +++------
 Cargo.toml                        | 3 +++
 common/Cargo.toml                 | 2 +-
 fmc/Cargo.toml                    | 2 +-
 fmc/test-fw/test-rt/Cargo.toml    | 2 +-
 rom/dev/Cargo.toml                | 2 +-
 rom/dev/tools/test-fmc/Cargo.toml | 2 +-
 rom/dev/tools/test-rt/Cargo.toml  | 2 +-
 runtime/Cargo.toml                | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c60d48e51..c28ef351a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1717,8 +1717,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "ufmt"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a64846ec02b57e9108d6469d98d1648782ad6bb150a95a9baac26900bbeab9d"
+source = "git+https://github.com/korran/ufmt.git?rev=1d0743c1ffffc68bc05ca8eeb81c166192863f33#1d0743c1ffffc68bc05ca8eeb81c166192863f33"
 dependencies = [
  "ufmt-macros",
  "ufmt-write",
@@ -1727,8 +1726,7 @@ dependencies = [
 [[package]]
 name = "ufmt-macros"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d337d3be617449165cb4633c8dece429afd83f84051024079f97ad32a9663716"
+source = "git+https://github.com/korran/ufmt.git?rev=1d0743c1ffffc68bc05ca8eeb81c166192863f33#1d0743c1ffffc68bc05ca8eeb81c166192863f33"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1738,8 +1736,7 @@ dependencies = [
 [[package]]
 name = "ufmt-write"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69"
+source = "git+https://github.com/korran/ufmt.git?rev=1d0743c1ffffc68bc05ca8eeb81c166192863f33#1d0743c1ffffc68bc05ca8eeb81c166192863f33"
 
 [[package]]
 name = "uio"
diff --git a/Cargo.toml b/Cargo.toml
index 0ce8694ed4..279c37b436 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,6 +62,9 @@ members = [
   "test-harness/types",
 ]
 
+[workspace.dependencies]
+ufmt = { git = "https://github.com/korran/ufmt.git", rev = "1d0743c1ffffc68bc05ca8eeb81c166192863f33", features = ["inline"] }
+
 [profile.firmware]
 inherits = "release"
 panic = "abort"
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 92e8532ff6..521e6313a1 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 zerocopy = "0.6.1"
 caliptra-drivers = { path = "../drivers" }
 caliptra-registers = { path = "../registers" }
diff --git a/fmc/Cargo.toml b/fmc/Cargo.toml
index ac49dc7065..747aeb175f 100644
--- a/fmc/Cargo.toml
+++ b/fmc/Cargo.toml
@@ -13,7 +13,7 @@ caliptra-registers = { path = "../registers" }
 caliptra-x509 = { version = "0.1.0", path = "../x509" , default-features = false }
 caliptra_common = { path = "../common", default-features = false }
 caliptra-image-types = { path = "../image/types",  default-features = false  }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 zerocopy = "0.6.1"
 
 [build-dependencies]
diff --git a/fmc/test-fw/test-rt/Cargo.toml b/fmc/test-fw/test-rt/Cargo.toml
index d5a410bb60..4795204291 100644
--- a/fmc/test-fw/test-rt/Cargo.toml
+++ b/fmc/test-fw/test-rt/Cargo.toml
@@ -10,7 +10,7 @@ caliptra-cpu = { version = "0.1.0", path = "../../../cpu" }
 caliptra-drivers = { path = "../../../drivers" }
 caliptra-registers = { version = "0.1.0", path = "../../../registers" }
 caliptra_common = { path = "../../../common", default-features = false }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 zerocopy = "0.6.1"
 
 [build-dependencies]
diff --git a/rom/dev/Cargo.toml b/rom/dev/Cargo.toml
index d808487c2c..a84df257be 100644
--- a/rom/dev/Cargo.toml
+++ b/rom/dev/Cargo.toml
@@ -15,7 +15,7 @@ caliptra-image-types = { path = "../../image/types", default-features = false }
 caliptra-image-verify = { path = "../../image/verify", default-features = false }
 caliptra_common = { path = "../../common", default-features = false }
 caliptra-registers = { path = "../../registers" }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 zerocopy = "0.6.1"
 caliptra-error = { version = "0.1.0", path = "../../error", default_features = false }
 
diff --git a/rom/dev/tools/test-fmc/Cargo.toml b/rom/dev/tools/test-fmc/Cargo.toml
index edf66d5b6d..9ae5242580 100644
--- a/rom/dev/tools/test-fmc/Cargo.toml
+++ b/rom/dev/tools/test-fmc/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 caliptra-drivers = { path = "../../../../drivers" }
 caliptra_common = { path = "../../../../common", default-features = false }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 ureg = { path = "../../../../ureg" }
 zerocopy = "0.6.1"
 caliptra-x509 = { version = "0.1.0", path = "../../../../x509" , default-features = false }
diff --git a/rom/dev/tools/test-rt/Cargo.toml b/rom/dev/tools/test-rt/Cargo.toml
index 5012709dde..a0d0366ff9 100644
--- a/rom/dev/tools/test-rt/Cargo.toml
+++ b/rom/dev/tools/test-rt/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 caliptra-drivers = { path = "../../../../drivers" }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 caliptra-cpu = { version = "0.1.0", path = "../../../../cpu" }
 
 [build-dependencies]
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 31f037da38..48151fe1f3 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -12,7 +12,7 @@ caliptra-registers = { path = "../registers" }
 caliptra_common = { path = "../common", default-features = false }
 caliptra-x509 = { path = "../x509", default-features = false }
 caliptra-image-types = { path = "../image/types", default-features = false }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 zerocopy = "0.6.1"
 caliptra-kat = { version = "0.1.0", path = "../kat" }