From 039a2df5fe59ffd54fad1889b3195ccfdafe5871 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 28 Dec 2023 17:02:47 -0500 Subject: [PATCH 1/4] cmm: Fix handling of top-level arrays of tables Signed-off-by: Nick Spinale --- .../tool/crates/toml-normalize/src/format.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs index 3d4e5eef5..545cd1ec8 100644 --- a/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs +++ b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs @@ -159,14 +159,17 @@ impl<'a, P: AbstractPolicy> FormatterState<'a, P> { .map(Option::unwrap) .enumerate() { - let inline_table = - self.with_index(i, |this| this.format_table_to_inline_table(x))?; - if self.is_inline_table_too_wide_for_array(&inline_table) { - inline_tables = None; - break; - } else { - inline_tables.as_mut().unwrap().push(inline_table); + match self.with_index(i, |this| this.format_table_to_inline_table(x)) { + Err(Error::CannotInlineTable(_)) => {} + Ok(inline_table) => { + if !self.is_inline_table_too_wide_for_array(&inline_table) { + inline_tables.as_mut().unwrap().push(inline_table); + continue; + } + } } + inline_tables = None; + break; } inline_tables.map(|inline_tables| { let mut array = Array::new(); @@ -236,6 +239,7 @@ impl<'a, P: AbstractPolicy> FormatterState<'a, P> { fn current_key(&self) -> Option<&str> { self.current_path().last()?.as_key() } + fn push(&mut self, seg: PathSegment) { self.current_path.push(seg); } From 6fcf76d7443048509065d8bcfa67ae3748b46f38 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 2 Jan 2024 11:21:20 +0000 Subject: [PATCH 2/4] cmm: Update manual manifest notes Signed-off-by: Nick Spinale --- hacking/cargo-manifest-management/manual-manifests.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hacking/cargo-manifest-management/manual-manifests.nix b/hacking/cargo-manifest-management/manual-manifests.nix index 85c330655..5bccfbfbf 100644 --- a/hacking/cargo-manifest-management/manual-manifests.nix +++ b/hacking/cargo-manifest-management/manual-manifests.nix @@ -8,11 +8,9 @@ let relativeToWorkspaceRoot = relativePath: "${toString ../..}/${relativePath}"; + relativeToTmpSrc = relativePath: relativeToWorkspaceRoot "tmp/src/${relativePath}"; + in { - # "virtio-drivers" = relativeToWorkspaceRoot "tmp/virtio-drivers"; - # "mbedtls" = relativeToWorkspaceRoot "tmp/rust-mbedtls/mbedtls"; - # "mbedtls-sys-auto" = relativeToWorkspaceRoot "tmp/rust-mbedtls/mbedtls-sys"; - # "mbedtls-platform-support" = relativeToWorkspaceRoot "tmp/rust-mbedtls/mbedtls-platform-support"; - # "embedded-fat" = relativeToWorkspaceRoot "tmp/rust-embedded-fat"; - # "volatile" = relativeToWorkspaceRoot "tmp/volatile"; + # ring = relativeToTmpSrc "ring"; + # rustls = relativeToTmpSrc "rustls/rustls"; } From 859211482579c3354dab981bddf82e77f7ad8203 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 7 Nov 2023 11:34:32 +0000 Subject: [PATCH 3/4] cmm: Fix Makefile clean target Signed-off-by: Nick Spinale --- hacking/cargo-manifest-management/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hacking/cargo-manifest-management/Makefile b/hacking/cargo-manifest-management/Makefile index 3d3e1feaf..e35f3fff3 100644 --- a/hacking/cargo-manifest-management/Makefile +++ b/hacking/cargo-manifest-management/Makefile @@ -13,7 +13,7 @@ none: .PHONY: clean clean: - rm -rf $(target_dir) $(blueprint) + rm -rf tool/target $(blueprint) .PHONY: $(blueprint) $(blueprint): From 9a6644cdf73dad2184baaf1f6624f7fd93457a18 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 2 Jan 2024 11:44:12 +0000 Subject: [PATCH 4/4] cmm: Add note Signed-off-by: Nick Spinale --- .../tool/crates/manage-cargo-manifests/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs b/hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs index 3dd661201..7954182db 100644 --- a/hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs +++ b/hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs @@ -40,6 +40,7 @@ pub struct Blueprint { pub entries: Vec, } +// TODO these rename attributes cause a mix of caml and snake case #[derive(Debug, Deserialize)] pub struct Entry { #[serde(rename = "absolutePath")]