@@ -1677,7 +1677,7 @@ impl Config {
1677
1677
!self . linkedProjects ( None ) . is_empty ( )
1678
1678
}
1679
1679
1680
- pub fn linked_manifests ( & self ) -> impl Iterator < Item = & AbsPath > + ' _ {
1680
+ pub fn linked_manifests ( & self ) -> impl Iterator < Item = & Utf8Path > + ' _ {
1681
1681
self . linkedProjects ( None ) . iter ( ) . filter_map ( |it| match it {
1682
1682
ManifestOrProjectJson :: Manifest ( p) => Some ( & * * p) ,
1683
1683
// despite having a buildfile, using this variant as a manifest
@@ -2273,11 +2273,7 @@ mod single_or_array {
2273
2273
#[ derive( Serialize , Deserialize , Debug , Clone , PartialEq , Eq ) ]
2274
2274
#[ serde( untagged) ]
2275
2275
enum ManifestOrProjectJson {
2276
- Manifest (
2277
- #[ serde( serialize_with = "serialize_abs_pathbuf" ) ]
2278
- #[ serde( deserialize_with = "deserialize_abs_pathbuf" ) ]
2279
- AbsPathBuf ,
2280
- ) ,
2276
+ Manifest ( Utf8PathBuf ) ,
2281
2277
ProjectJson ( ProjectJsonData ) ,
2282
2278
DiscoveredProjectJson {
2283
2279
data : ProjectJsonData ,
@@ -2306,10 +2302,12 @@ where
2306
2302
}
2307
2303
2308
2304
impl ManifestOrProjectJson {
2309
- fn manifest ( & self ) -> Option < & AbsPath > {
2305
+ fn manifest ( & self ) -> Option < & Utf8Path > {
2310
2306
match self {
2311
2307
ManifestOrProjectJson :: Manifest ( manifest) => Some ( manifest) ,
2312
- ManifestOrProjectJson :: DiscoveredProjectJson { buildfile, .. } => Some ( buildfile) ,
2308
+ ManifestOrProjectJson :: DiscoveredProjectJson { buildfile, .. } => {
2309
+ Some ( buildfile. as_ref ( ) )
2310
+ }
2313
2311
ManifestOrProjectJson :: ProjectJson ( _) => None ,
2314
2312
}
2315
2313
}
0 commit comments