diff options
| author | LingMan <LingMan@users.noreply.github.com> | 2021-01-07 20:03:59 +0100 |
|---|---|---|
| committer | LingMan <LingMan@users.noreply.github.com> | 2021-01-07 20:03:59 +0100 |
| commit | 961f9ee6dfd21bfcbe75b68eb38ea86bce1dc1d1 (patch) | |
| tree | 99f7325370b0d25c52c8f5e87f02be2fd21720cb /src | |
| parent | b5c496de374407c0937cf5257d89230b5358d053 (diff) | |
| download | rust-961f9ee6dfd21bfcbe75b68eb38ea86bce1dc1d1.tar.gz rust-961f9ee6dfd21bfcbe75b68eb38ea86bce1dc1d1.zip | |
Use Option::map_or instead of `.map(..).unwrap_or(..)`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 0b979120ff9..93991870338 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -942,7 +942,7 @@ impl<'a> Clean<Arguments> for (&'a [hir::Ty<'a>], &'a [Ident]) { .iter() .enumerate() .map(|(i, ty)| { - let mut name = self.1.get(i).map(|ident| ident.name).unwrap_or(kw::Empty); + let mut name = self.1.get(i).map_or(kw::Empty, |ident| ident.name); if name.is_empty() { name = kw::Underscore; } @@ -1001,7 +1001,7 @@ impl<'tcx> Clean<FnDecl> for (DefId, ty::PolyFnSig<'tcx>) { .iter() .map(|t| Argument { type_: t.clean(cx), - name: names.next().map(|i| i.name).unwrap_or(kw::Empty), + name: names.next().map_or(kw::Empty, |i| i.name), }) .collect(), }, |