@@ -17,6 +17,9 @@ use super::{
17
17
18
18
#[ derive( Debug , PartialEq , Eq , Serialize , Deserialize , Clone ) ]
19
19
pub struct Pack {
20
+ #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
21
+ pub owner : Option < String > ,
22
+
20
23
#[ serde( skip) ]
21
24
pub yml : PathBuf ,
22
25
@@ -32,7 +35,7 @@ pub struct Pack {
32
35
serialize_with = "serialize_checker_setting" ,
33
36
deserialize_with = "deserialize_checker_setting"
34
37
) ]
35
- pub enforce_dependencies : Option < CheckerSetting > ,
38
+ pub enforce_folder_privacy : Option < CheckerSetting > ,
36
39
37
40
#[ serde(
38
41
default ,
@@ -58,12 +61,17 @@ pub struct Pack {
58
61
) ]
59
62
pub enforce_layers : Option < CheckerSetting > ,
60
63
61
- #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
62
- pub owner : Option < String > ,
63
-
64
64
#[ serde( default , skip_serializing_if = "Option::is_none" ) ]
65
65
pub layer : Option < String > ,
66
66
67
+ #[ serde(
68
+ default ,
69
+ skip_serializing_if = "Option::is_none" ,
70
+ serialize_with = "serialize_checker_setting" ,
71
+ deserialize_with = "deserialize_checker_setting"
72
+ ) ]
73
+ pub enforce_dependencies : Option < CheckerSetting > ,
74
+
67
75
#[ serde(
68
76
default ,
69
77
skip_serializing_if = "HashSet::is_empty" ,
@@ -102,14 +110,6 @@ pub struct Pack {
102
110
) ]
103
111
pub visible_to : Option < HashSet < String > > ,
104
112
105
- #[ serde(
106
- default ,
107
- skip_serializing_if = "Option::is_none" ,
108
- serialize_with = "serialize_checker_setting" ,
109
- deserialize_with = "deserialize_checker_setting"
110
- ) ]
111
- pub enforce_folder_privacy : Option < CheckerSetting > ,
112
-
113
113
#[ serde(
114
114
default ,
115
115
skip_serializing_if = "Option::is_none" ,
@@ -513,8 +513,8 @@ foobar: true
513
513
let actual = reserialize_pack ( pack_yml) ;
514
514
515
515
let expected = r#"
516
- enforce_dependencies: strict
517
516
enforce_privacy: true
517
+ enforce_dependencies: strict
518
518
dependencies:
519
519
- packs/a
520
520
- packs/b
@@ -626,8 +626,8 @@ enforce_dependencies: true
626
626
let actual = reserialize_pack ( pack_yml) ;
627
627
628
628
let expected = r#"
629
- enforce_dependencies: true
630
629
owner: Foobar
630
+ enforce_dependencies: true
631
631
"#
632
632
. trim_start ( ) ;
633
633
0 commit comments