From 474a81304b7d007c58e1792d749debc4ffd85be2 Mon Sep 17 00:00:00 2001 From: Julius Liu Date: Sat, 9 Dec 2023 16:11:51 -0800 Subject: [PATCH] fixup. cargo fmt --- src/constants.rs | 22 +++++++++++----------- src/rpm/headers/types.rs | 12 ++++++------ src/rpm/package.rs | 5 +---- src/tests.rs | 24 ++++++++++++------------ 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/constants.rs b/src/constants.rs index 932b635a..b7b8afe4 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -522,15 +522,15 @@ bitflags! { /// Macro expansion, /// /// Corresponds to RPMSCRIPT_FLAG_EXPAND - /// + /// const EXPAND = 1; /// Header queryformat expansion, - /// + /// /// Corresponds to RPMSCRIPT_FLAG_QFORMAT /// const QFORMAT = 1 << 1; /// Critical for success/failure, - /// + /// /// Corresponds to RPMSCRIPT_FLAG_CRITICAL /// const CRITICAL = 1 << 2; @@ -593,7 +593,7 @@ pub enum DigestAlgorithm { } /// Index tag values for the %prein scriptlet, -/// +/// pub(crate) const PREIN_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_PREIN, IndexTag::RPMTAG_PREINFLAGS, @@ -601,7 +601,7 @@ pub(crate) const PREIN_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %postin scriptlet, -/// +/// pub(crate) const POSTIN_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_POSTIN, IndexTag::RPMTAG_POSTINFLAGS, @@ -609,7 +609,7 @@ pub(crate) const POSTIN_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %preun scriptlet, -/// +/// pub(crate) const PREUN_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_PREUN, IndexTag::RPMTAG_PREUNFLAGS, @@ -617,7 +617,7 @@ pub(crate) const PREUN_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %postun scriptlet, -/// +/// pub(crate) const POSTUN_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_POSTUN, IndexTag::RPMTAG_POSTUNFLAGS, @@ -625,7 +625,7 @@ pub(crate) const POSTUN_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %pretrans scriptlet, -/// +/// pub(crate) const PRETRANS_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_PRETRANS, IndexTag::RPMTAG_PRETRANSFLAGS, @@ -633,7 +633,7 @@ pub(crate) const PRETRANS_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %posttrans scriptlet, -/// +/// pub(crate) const POSTTRANS_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_POSTTRANS, IndexTag::RPMTAG_POSTTRANSFLAGS, @@ -641,7 +641,7 @@ pub(crate) const POSTTRANS_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %preuntrans scriptlet, -/// +/// pub(crate) const PREUNTRANS_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_PREUNTRANS, IndexTag::RPMTAG_PREUNTRANSFLAGS, @@ -649,7 +649,7 @@ pub(crate) const PREUNTRANS_TAGS: ScriptletIndexTags = ( ); /// Index tag values for the %postuntrans scriptlet, -/// +/// pub(crate) const POSTUNTRANS_TAGS: ScriptletIndexTags = ( IndexTag::RPMTAG_POSTUNTRANS, IndexTag::RPMTAG_POSTUNTRANSFLAGS, diff --git a/src/rpm/headers/types.rs b/src/rpm/headers/types.rs index 67a1eb8f..85e27400 100644 --- a/src/rpm/headers/types.rs +++ b/src/rpm/headers/types.rs @@ -402,7 +402,7 @@ pub struct Scriptlet { impl Scriptlet { /// Returns a new scriplet, - /// + /// #[inline] pub fn new(script: impl Into) -> Scriptlet { Scriptlet { @@ -598,13 +598,13 @@ mod test { fn test_scriptlet_builder() { // Test full state let scriptlet = crate::Scriptlet::new( - r#" + r#" echo `hello world` "# - .trim(), - ) - .flags(crate::ScriptletFlags::EXPAND) - .prog(vec!["/usr/bin/blah", "-c"]); + .trim(), + ) + .flags(crate::ScriptletFlags::EXPAND) + .prog(vec!["/usr/bin/blah", "-c"]); let mut records = vec![]; let offset = 0i32; diff --git a/src/rpm/package.rs b/src/rpm/package.rs index b0e37a49..9902d89e 100644 --- a/src/rpm/package.rs +++ b/src/rpm/package.rs @@ -588,10 +588,7 @@ impl PackageMetadata { } } - fn get_scriptlet( - &self, - tags: ScriptletIndexTags, - ) -> Result { + fn get_scriptlet(&self, tags: ScriptletIndexTags) -> Result { let (scriptlet_tag, flags_tag, program_tag) = tags; let script = self diff --git a/src/tests.rs b/src/tests.rs index efa2230c..d8c13603 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -51,14 +51,8 @@ However, it does nothing.", .symlink("/usr/bin/awesome"), )? .pre_install_script("echo preinst") - .post_install_script( - Scriptlet::new("echo postinst") - .prog(vec!["/bin/blah/bash", "-c"]), - ) - .pre_trans_script( - Scriptlet::new("echo pretrans") - .flags(ScriptletFlags::EXPAND), - ) + .post_install_script(Scriptlet::new("echo postinst").prog(vec!["/bin/blah/bash", "-c"])) + .pre_trans_script(Scriptlet::new("echo pretrans").flags(ScriptletFlags::EXPAND)) .post_trans_script( Scriptlet::new("echo posttrans") .flags(ScriptletFlags::EXPAND) @@ -97,17 +91,20 @@ However, it does nothing.", assert_eq!(f.mode, FileMode::from(0o120644)); } }); - + // Test scriptlet builder fn branches let preinst = pkg.metadata.get_pre_install_script()?; assert_eq!(preinst.script.as_str(), "echo preinst"); assert!(preinst.flags.is_none()); assert!(preinst.program.is_none()); - + let postinst = pkg.metadata.get_post_install_script()?; assert_eq!(postinst.script.as_str(), "echo postinst"); assert!(postinst.flags.is_none()); - assert_eq!(postinst.program, Some(vec!["/bin/blah/bash".to_string(), "-c".to_string()])); + assert_eq!( + postinst.program, + Some(vec!["/bin/blah/bash".to_string(), "-c".to_string()]) + ); let pretrans = pkg.metadata.get_pre_trans_script()?; assert_eq!(pretrans.script.as_str(), "echo pretrans"); @@ -117,7 +114,10 @@ However, it does nothing.", let posttrans = pkg.metadata.get_post_trans_script()?; assert_eq!(posttrans.script.as_str(), "echo posttrans"); assert_eq!(posttrans.flags, Some(ScriptletFlags::EXPAND)); - assert_eq!(posttrans.program, Some(vec!["/bin/blah/bash".to_string(), "-c".to_string()])); + assert_eq!( + posttrans.program, + Some(vec!["/bin/blah/bash".to_string(), "-c".to_string()]) + ); assert!(pkg.metadata.get_pre_untrans_script().is_err());