Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmm: Fix handling of top-level arrays of tables #51

Merged
merged 4 commits into from
Jan 6, 2024
Merged

cmm: Fix handling of top-level arrays of tables #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
039a2df
cmm: Fix handling of top-level arrays of tables
nspin Dec 28, 2023
6fcf76d
cmm: Update manual manifest notes
nspin Jan 2, 2024
8592114
cmm: Fix Makefile clean target
nspin Nov 7, 2023
9a6644c
cmm: Add note
nspin Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hacking/cargo-manifest-management/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ none:

.PHONY: clean
clean:
rm -rf $(target_dir) $(blueprint)
rm -rf tool/target $(blueprint)

.PHONY: $(blueprint)
$(blueprint):
Expand Down
10 changes: 4 additions & 6 deletions hacking/cargo-manifest-management/manual-manifests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
1 change: 1 addition & 0 deletions hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub struct Blueprint {
pub entries: Vec<Entry>,
}

// TODO these rename attributes cause a mix of caml and snake case
#[derive(Debug, Deserialize)]
pub struct Entry {
#[serde(rename = "absolutePath")]
Expand Down
18 changes: 11 additions & 7 deletions hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}
Expand Down