@@ -17,6 +17,9 @@ use super::{
1717
1818#[ derive( Debug , PartialEq , Eq , Serialize , Deserialize , Clone ) ]
1919pub struct Pack {
20+ #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
21+ pub owner : Option < String > ,
22+
2023 #[ serde( skip) ]
2124 pub yml : PathBuf ,
2225
@@ -32,7 +35,7 @@ pub struct Pack {
3235 serialize_with = "serialize_checker_setting" ,
3336 deserialize_with = "deserialize_checker_setting"
3437 ) ]
35- pub enforce_dependencies : Option < CheckerSetting > ,
38+ pub enforce_folder_privacy : Option < CheckerSetting > ,
3639
3740 #[ serde(
3841 default ,
@@ -58,12 +61,17 @@ pub struct Pack {
5861 ) ]
5962 pub enforce_layers : Option < CheckerSetting > ,
6063
61- #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
62- pub owner : Option < String > ,
63-
6464 #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
6565 pub layer : Option < String > ,
6666
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+
6775 #[ serde(
6876 default ,
6977 skip_serializing_if = "HashSet::is_empty" ,
@@ -102,14 +110,6 @@ pub struct Pack {
102110 ) ]
103111 pub visible_to : Option < HashSet < String > > ,
104112
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-
113113 #[ serde(
114114 default ,
115115 skip_serializing_if = "Option::is_none" ,
@@ -513,8 +513,8 @@ foobar: true
513513 let actual = reserialize_pack ( pack_yml) ;
514514
515515 let expected = r#"
516- enforce_dependencies: strict
517516enforce_privacy: true
517+ enforce_dependencies: strict
518518dependencies:
519519- packs/a
520520- packs/b
@@ -626,8 +626,8 @@ enforce_dependencies: true
626626 let actual = reserialize_pack ( pack_yml) ;
627627
628628 let expected = r#"
629- enforce_dependencies: true
630629owner: Foobar
630+ enforce_dependencies: true
631631"#
632632 . trim_start ( ) ;
633633
0 commit comments