Skip to content

Commit d4ad4ff

Browse files
github-actions[bot]github-actions[bot]
authored
Format Rust code using rustfmt
1 parent b6a5f11 commit d4ad4ff

File tree

9 files changed

+263
-135
lines changed

9 files changed

+263
-135
lines changed

‎rar-common/src/database/actor.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,9 @@ impl<'de> Deserialize<'de> for SGroups {
317317
}
318318

319319
fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
320-
where
321-
D: serde::Deserializer<'de>, {
320+
where
321+
D: serde::Deserializer<'de>,
322+
{
322323
deserializer.deserialize_any(self)
323324
}
324325

‎rar-common/src/database/de.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use std::str::FromStr;
44
use log::debug;
55
use serde::{de::DeserializeSeed, Deserialize};
66

7-
use crate::database::{actor::SGroups, structs::{SCommand, SSetgidSet, SetBehavior}};
7+
use crate::database::{
8+
actor::SGroups,
9+
structs::{SCommand, SSetgidSet, SetBehavior},
10+
};
811

912
use super::{
1013
actor::SGenericActorType,
@@ -124,7 +127,7 @@ impl<'de> Deserialize<'de> for SCapabilities {
124127
#[serde(alias = "a")]
125128
Add,
126129
#[serde(alias = "del", alias = "s")]
127-
Sub
130+
Sub,
128131
}
129132

130133
impl<'de> Visitor<'de> for SCapabilitiesVisitor {
@@ -223,8 +226,9 @@ impl<'de> DeserializeSeed<'de> for CapSetDeserializer {
223226
Ok(CapSet::from_bitmask_truncate(v))
224227
}
225228
fn visit_seq<A>(self, seq: A) -> Result<Self::Value, A::Error>
226-
where
227-
A: SeqAccess<'de>, {
229+
where
230+
A: SeqAccess<'de>,
231+
{
228232
let mut capset = CapSet::default();
229233
let mut seq = seq;
230234
while let Some(cap) = seq.next_element_seed(CapDeserializer)? {
@@ -343,7 +347,6 @@ impl<'de> Deserialize<'de> for SSetgidSet {
343347
sub,
344348
})
345349
}
346-
347350
}
348351
debug!("de_ssetgidset: deserialize");
349352
deserializer.deserialize_any(SSetgidSetVisitor)

‎rar-common/src/database/mod.rs‎

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,17 @@ mod serde_tests {
363363
let cap = SCapabilities::builder(SetBehavior::None).build();
364364
assert_tokens(
365365
&cap.clone().compact(),
366-
&[
367-
Token::UnitVariant { name: "SetBehavior", variant: "none" },
368-
],
366+
&[Token::UnitVariant {
367+
name: "SetBehavior",
368+
variant: "none",
369+
}],
369370
);
370371
assert_tokens(
371372
&cap.readable(),
372-
&[Token::UnitVariant { name: "SetBehavior", variant: "none" },],
373+
&[Token::UnitVariant {
374+
name: "SetBehavior",
375+
variant: "none",
376+
}],
373377
);
374378
let cap = SCapabilities::builder(SetBehavior::All)
375379
.add_cap(Cap::NET_BIND_SERVICE)
@@ -457,7 +461,9 @@ mod serde_tests {
457461
],
458462
);
459463

460-
assert_tokens(&setuid.compact(), &[
464+
assert_tokens(
465+
&setuid.compact(),
466+
&[
461467
Token::Map { len: None },
462468
Token::Str("d"),
463469
Token::U32(HARDENED_ENUM_VALUE_1),
@@ -477,7 +483,8 @@ mod serde_tests {
477483
Token::U32(1003),
478484
Token::SeqEnd,
479485
Token::MapEnd,
480-
]);
486+
],
487+
);
481488
}
482489

483490
#[test]
@@ -510,7 +517,10 @@ mod serde_tests {
510517
SetBehavior::None,
511518
SGroups::Multiple(vec![1000.into(), 1001.into()]),
512519
)
513-
.add(vec![SGroups::Multiple(vec![1002.into(),1003.into()]), SGroups::Single(1003.into())])
520+
.add(vec![
521+
SGroups::Multiple(vec![1002.into(), 1003.into()]),
522+
SGroups::Single(1003.into()),
523+
])
514524
.sub(vec![1004.into(), 1005.into()])
515525
.build(),
516526
);
@@ -550,7 +560,9 @@ mod serde_tests {
550560
],
551561
);
552562

553-
assert_tokens(&groups.compact(), &[
563+
assert_tokens(
564+
&groups.compact(),
565+
&[
554566
Token::Map { len: None },
555567
Token::Str("d"),
556568
Token::U32(HARDENED_ENUM_VALUE_0),
@@ -580,15 +592,21 @@ mod serde_tests {
580592
Token::U32(1005),
581593
Token::SeqEnd,
582594
Token::MapEnd,
583-
]);
595+
],
596+
);
584597
}
585598

586599
#[test]
587600
fn test_scredentials() {
588601
let cred = SCredentials::builder()
589602
.setuid(SUserEither::MandatoryUser(1000.into()))
590603
.setgid(SGroupsEither::MandatoryGroup(1000.into()))
591-
.capabilities(SCapabilities::builder(SetBehavior::None).add_cap(Cap::BPF).sub_cap(Cap::CHOWN).build())
604+
.capabilities(
605+
SCapabilities::builder(SetBehavior::None)
606+
.add_cap(Cap::BPF)
607+
.sub_cap(Cap::CHOWN)
608+
.build(),
609+
)
592610
.build();
593611
assert_tokens(
594612
&cred.clone().readable(),
@@ -625,7 +643,9 @@ mod serde_tests {
625643
Token::MapEnd,
626644
],
627645
);
628-
assert_tokens(&cred.compact(), &[
646+
assert_tokens(
647+
&cred.compact(),
648+
&[
629649
Token::Map { len: None },
630650
Token::Str("u"),
631651
Token::Some,
@@ -641,9 +661,9 @@ mod serde_tests {
641661
Token::Str("d"),
642662
Token::U32(HARDENED_ENUM_VALUE_0),
643663
Token::Str("a"),
644-
Token::U64((1u64<<Cap::BPF as u8) as u64),
664+
Token::U64((1u64 << Cap::BPF as u8) as u64),
645665
Token::Str("s"),
646-
Token::U64((1u64<<Cap::CHOWN as u8) as u64),
666+
Token::U64((1u64 << Cap::CHOWN as u8) as u64),
647667
Token::MapEnd,
648668
Token::MapEnd,
649669
],
@@ -653,32 +673,26 @@ mod serde_tests {
653673
#[test]
654674
fn test_scommand() {
655675
let cmd = SCommand::Simple("/bin/true".into());
656-
assert_tokens(
657-
&cmd.clone().readable(),
658-
&[
659-
Token::Str("/bin/true"),
660-
],
661-
);
662-
assert_tokens(
663-
&cmd.compact(),
664-
&[
665-
Token::Str("/bin/true"),
666-
],
667-
);
676+
assert_tokens(&cmd.clone().readable(), &[Token::Str("/bin/true")]);
677+
assert_tokens(&cmd.compact(), &[Token::Str("/bin/true")]);
668678
}
669679

670680
#[test]
671681
fn test_scommands() {
672682
let cmds = SCommands::builder(SetBehavior::None).build();
673683
assert_tokens(
674684
&cmds.clone().readable(),
675-
&[
676-
Token::UnitVariant { name: "SetBehavior", variant: "none" },
677-
],
685+
&[Token::UnitVariant {
686+
name: "SetBehavior",
687+
variant: "none",
688+
}],
678689
);
679690
assert_tokens(
680691
&cmds.compact(),
681-
&[Token::UnitVariant { name: "SetBehavior", variant: "none" },],
692+
&[Token::UnitVariant {
693+
name: "SetBehavior",
694+
variant: "none",
695+
}],
682696
);
683697
let cmds = SCommands::builder(SetBehavior::None)
684698
.add(vec![
@@ -695,12 +709,15 @@ mod serde_tests {
695709
Token::SeqEnd,
696710
],
697711
);
698-
assert_tokens(&cmds.compact(), &[
712+
assert_tokens(
713+
&cmds.compact(),
714+
&[
699715
Token::Seq { len: Some(2) },
700716
Token::Str("/bin/true"),
701717
Token::Str("/bin/echo hello"),
702718
Token::SeqEnd,
703-
]);
719+
],
720+
);
704721
let cmds = SCommands::builder(SetBehavior::All)
705722
.add(vec![
706723
SCommand::Simple("/bin/true".into()),
@@ -726,7 +743,9 @@ mod serde_tests {
726743
Token::MapEnd,
727744
],
728745
);
729-
assert_tokens(&cmds.compact(), &[
746+
assert_tokens(
747+
&cmds.compact(),
748+
&[
730749
Token::Map { len: None },
731750
Token::Str("d"),
732751
Token::U32(HARDENED_ENUM_VALUE_1),
@@ -740,6 +759,7 @@ mod serde_tests {
740759
Token::Str("/bin/false"),
741760
Token::SeqEnd,
742761
Token::MapEnd,
743-
]);
762+
],
763+
);
744764
}
745765
}

‎rar-common/src/database/structs.rs‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,19 @@ pub struct STask {
115115
pub name: IdTask,
116116
#[serde(alias = "p", skip_serializing_if = "Option::is_none")]
117117
pub purpose: Option<String>,
118-
#[serde(alias = "i", alias = "credentials", default, skip_serializing_if = "is_default")]
118+
#[serde(
119+
alias = "i",
120+
alias = "credentials",
121+
default,
122+
skip_serializing_if = "is_default"
123+
)]
119124
pub cred: SCredentials,
120-
#[serde(alias = "c", alias = "cmds", default, skip_serializing_if = "cmds_is_default")]
125+
#[serde(
126+
alias = "c",
127+
alias = "cmds",
128+
default,
129+
skip_serializing_if = "cmds_is_default"
130+
)]
121131
pub commands: SCommands,
122132
#[serde(
123133
alias = "o",
@@ -826,10 +836,7 @@ mod tests {
826836
assert!(capabilities.add.has(Cap::NET_BIND_SERVICE));
827837
assert!(capabilities.sub.has(Cap::SYS_ADMIN));
828838
let commands = &as_borrow!(&role[0]).commands;
829-
assert_eq!(
830-
*commands.default.as_ref().unwrap(),
831-
SetBehavior::All
832-
);
839+
assert_eq!(*commands.default.as_ref().unwrap(), SetBehavior::All);
833840
assert_eq!(commands.add[0], SCommand::Simple("cmd1".into()));
834841
assert_eq!(commands.sub[0], SCommand::Simple("cmd2".into()));
835842
}
@@ -1073,10 +1080,7 @@ mod tests {
10731080
assert!(capabilities.add.has(Cap::NET_BIND_SERVICE));
10741081
assert!(capabilities.sub.is_empty());
10751082
let commands = &as_borrow!(&role[0]).commands;
1076-
assert_eq!(
1077-
*commands.default.as_ref().unwrap(),
1078-
SetBehavior::All
1079-
);
1083+
assert_eq!(*commands.default.as_ref().unwrap(), SetBehavior::All);
10801084
assert_eq!(commands.add[0], SCommand::Simple("cmd1".into()));
10811085
assert_eq!(commands.sub[0], SCommand::Simple("cmd2".into()));
10821086
}

0 commit comments

Comments
 (0)