Skip to content

Commit b941c8e

Browse files
Rollup merge of #53271 - llogiq:simplify-maybe-map, r=joshtriplett
use ? to simplify `TransitiveRelation.maybe_map` I think this looks much clearer than the original.
2 parents d8815cf + 05ddad3 commit b941c8e

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/librustc_data_structures/transitive_relation.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,7 @@ impl<T: Clone + Debug + Eq + Hash> TransitiveRelation<T> {
9797
{
9898
let mut result = TransitiveRelation::new();
9999
for edge in &self.edges {
100-
f(&self.elements[edge.source.0]).and_then(|source| {
101-
f(&self.elements[edge.target.0]).and_then(|target| {
102-
result.add(source, target);
103-
Some(())
104-
})
105-
})?;
100+
result.add(f(&self.elements[edge.source.0])?, f(&self.elements[edge.target.0])?);
106101
}
107102
Some(result)
108103
}

0 commit comments

Comments
 (0)