@@ -1677,7 +1677,7 @@ impl Config {
16771677 !self . linkedProjects ( None ) . is_empty ( )
16781678 }
16791679
1680- pub fn linked_manifests ( & self ) -> impl Iterator < Item = & AbsPath > + ' _ {
1680+ pub fn linked_manifests ( & self ) -> impl Iterator < Item = & Utf8Path > + ' _ {
16811681 self . linkedProjects ( None ) . iter ( ) . filter_map ( |it| match it {
16821682 ManifestOrProjectJson :: Manifest ( p) => Some ( & * * p) ,
16831683 // despite having a buildfile, using this variant as a manifest
@@ -2273,11 +2273,7 @@ mod single_or_array {
22732273#[ derive( Serialize , Deserialize , Debug , Clone , PartialEq , Eq ) ]
22742274#[ serde( untagged) ]
22752275enum ManifestOrProjectJson {
2276- Manifest (
2277- #[ serde( serialize_with = "serialize_abs_pathbuf" ) ]
2278- #[ serde( deserialize_with = "deserialize_abs_pathbuf" ) ]
2279- AbsPathBuf ,
2280- ) ,
2276+ Manifest ( Utf8PathBuf ) ,
22812277 ProjectJson ( ProjectJsonData ) ,
22822278 DiscoveredProjectJson {
22832279 data : ProjectJsonData ,
@@ -2306,10 +2302,12 @@ where
23062302}
23072303
23082304impl ManifestOrProjectJson {
2309- fn manifest ( & self ) -> Option < & AbsPath > {
2305+ fn manifest ( & self ) -> Option < & Utf8Path > {
23102306 match self {
23112307 ManifestOrProjectJson :: Manifest ( manifest) => Some ( manifest) ,
2312- ManifestOrProjectJson :: DiscoveredProjectJson { buildfile, .. } => Some ( buildfile) ,
2308+ ManifestOrProjectJson :: DiscoveredProjectJson { buildfile, .. } => {
2309+ Some ( buildfile. as_ref ( ) )
2310+ }
23132311 ManifestOrProjectJson :: ProjectJson ( _) => None ,
23142312 }
23152313 }
0 commit comments