diff options
| author | Jubilee <workingjubilee@gmail.com> | 2025-01-14 19:56:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 19:56:35 -0800 |
| commit | 4f25a31128e89619c3b6e696f7d9ec9458e3d225 (patch) | |
| tree | 723fb95da6a4b6782c9714d22052a20d8d238c06 | |
| parent | b52f2fab5980de0644eafc37c1fb915746311ad0 (diff) | |
| parent | 62d5562bc6ff3063f41e4712304484ab63399225 (diff) | |
| download | rust-4f25a31128e89619c3b6e696f7d9ec9458e3d225.tar.gz rust-4f25a31128e89619c3b6e696f7d9ec9458e3d225.zip | |
Rollup merge of #135505 - GuillaumeGomez:clippy, r=notriddle
Fix clippy lints in rustdoc Some more clippy lint fixes. r? `@notriddle`
| -rw-r--r-- | src/librustdoc/clean/cfg.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/clean/utils.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs index c59dce185f4..bfa789b1f39 100644 --- a/src/librustdoc/clean/cfg.rs +++ b/src/librustdoc/clean/cfg.rs @@ -90,11 +90,11 @@ impl Cfg { }, MetaItemKind::List(ref items) => { let orig_len = items.len(); - let sub_cfgs = + let mut sub_cfgs = items.iter().filter_map(|i| Cfg::parse_nested(i, exclude).transpose()); let ret = match name { - sym::all => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)), - sym::any => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)), + sym::all => sub_cfgs.try_fold(Cfg::True, |x, y| Ok(x & y?)), + sym::any => sub_cfgs.try_fold(Cfg::False, |x, y| Ok(x | y?)), sym::not => { if orig_len == 1 { let mut sub_cfgs = sub_cfgs.collect::<Vec<_>>(); diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs index 99e88f878fb..80dc6b7250c 100644 --- a/src/librustdoc/clean/utils.rs +++ b/src/librustdoc/clean/utils.rs @@ -320,7 +320,7 @@ pub(crate) fn name_from_pat(p: &hir::Pat<'_>) -> Symbol { ); return Symbol::intern("()"); } - PatKind::Guard(p, _) => return name_from_pat(&*p), + PatKind::Guard(p, _) => return name_from_pat(p), PatKind::Range(..) => return kw::Underscore, PatKind::Slice(begin, ref mid, end) => { let begin = begin.iter().map(|p| name_from_pat(p).to_string()); |
