Inline ufmt do_as_formatter.

This modifies the ufmt package; upstream PR at
japaric/ufmt#59.

This significantly reduces the size of the uart ROM build.

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"

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" }

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]

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]

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 }
 

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 }

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]

runtime/Cargo.toml

@@ -11,7 +11,7 @@ caliptra-drivers = { path = "../drivers" }
 caliptra-registers = { path = "../registers" }
 caliptra_common = { path = "../common", default-features = false }
 caliptra-x509 = { path = "../x509", default-features = false }
-ufmt = "0.2.0"
+ufmt = { workspace = true }
 zerocopy = "0.6.1"
 
 [build-dependencies]