Post-rebase fixups:

- Use `read_file` from `composefs::fs`
- Always define `mod parsers`
- Re-alphabetize/group module definitions

Signed-off-by: John Eckersberg <[email protected]>

Author: jeckersb

crates/lib/src/install.rs

@@ -42,7 +42,7 @@ use cap_std_ext::cap_tempfile::TempDir;
 use cap_std_ext::cmdext::CapStdExtCommandExt;
 use cap_std_ext::prelude::CapStdExtDirExt;
 use clap::ValueEnum;
-use composefs_boot::bootloader::read_file;
+use composefs::fs::read_file;
 use fn_error_context::context;
 use ostree::gio;
 use ostree_ext::composefs::{

crates/lib/src/lib.rs

@@ -5,20 +5,24 @@
 //! bootable container images.
 
 pub(crate) mod bootc_kargs;
+mod bootloader;
 mod boundimage;
 mod cfsctl;
 pub mod cli;
 mod composefs_consts;
+mod containerenv;
 pub(crate) mod deploy;
 pub(crate) mod fsck;
 pub(crate) mod generator;
 mod glyph;
 mod image;
+mod install;
 pub(crate) mod journal;
 mod k8sapitypes;
 mod lints;
 mod lsm;
 pub(crate) mod metadata;
+mod parsers;
 mod podman;
 mod podstorage;
 mod progress_jsonl;
@@ -32,17 +36,8 @@ mod utils;
 #[cfg(feature = "docgen")]
 mod docgen;
 
-mod bootloader;
-mod containerenv;
-mod install;
-
-#[cfg(feature = "composefs-backend")]
-#[allow(dead_code)]
-pub(crate) mod parsers;
 #[cfg(feature = "rhsm")]
 mod rhsm;
 
-mod parsers;
-
 // Re-export blockdev crate for internal use
 pub(crate) use bootc_blockdev as blockdev;