rustdoc: Extract duplicated code into method

Author: yotamofek

src/librustdoc/clean/cfg.rs

@@ -390,6 +390,53 @@ fn write_with_opt_paren<T: fmt::Display>(
     Ok(())
 }
 
+impl Display<'_> {
+    fn display_quantified_sub_cfgs(
+        &self,
+        fmt: &mut fmt::Formatter<'_>,
+        sub_cfgs: &[Cfg],
+        separator: &str,
+    ) -> fmt::Result {
+        use fmt::Display as _;
+
+        let short_longhand = self.1.is_long() && {
+            let all_crate_features =
+                sub_cfgs.iter().all(|sub_cfg| matches!(sub_cfg, Cfg::Cfg(sym::feature, Some(_))));
+            let all_target_features = sub_cfgs
+                .iter()
+                .all(|sub_cfg| matches!(sub_cfg, Cfg::Cfg(sym::target_feature, Some(_))));
+
+            if all_crate_features {
+                fmt.write_str("crate features ")?;
+                true
+            } else if all_target_features {
+                fmt.write_str("target features ")?;
+                true
+            } else {
+                false
+            }
+        };
+
+        sub_cfgs
+            .iter()
+            .map(|sub_cfg| {
+                fmt::from_fn(move |f| {
+                    if let (true, Cfg::Cfg(_, Some(feat))) = (short_longhand, sub_cfg) {
+                        if self.1.is_html() {
+                            write!(f, "<code>{feat}</code>")
+                        } else {
+                            write!(f, "`{feat}`")
+                        }
+                    } else {
+                        write_with_opt_paren(f, !sub_cfg.is_all(), Display(sub_cfg, self.1))
+                    }
+                })
+            })
+            .format(separator)
+            .fmt(fmt)
+    }
+}
+
 impl fmt::Display for Display<'_> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self.0 {
@@ -418,91 +465,9 @@ impl fmt::Display for Display<'_> {
 
             Cfg::Any(ref sub_cfgs) => {
                 let separator = if sub_cfgs.iter().all(Cfg::is_simple) { " or " } else { ", or " };
-
-                let short_longhand = self.1.is_long() && {
-                    let all_crate_features = sub_cfgs
-                        .iter()
-                        .all(|sub_cfg| matches!(sub_cfg, Cfg::Cfg(sym::feature, Some(_))));
-                    let all_target_features = sub_cfgs
-                        .iter()
-                        .all(|sub_cfg| matches!(sub_cfg, Cfg::Cfg(sym::target_feature, Some(_))));
-
-                    if all_crate_features {
-                        fmt.write_str("crate features ")?;
-                        true
-                    } else if all_target_features {
-                        fmt.write_str("target features ")?;
-                        true
-                    } else {
-                        false
-                    }
-                };
-
-                sub_cfgs
-                    .iter()
-                    .map(|sub_cfg| {
-                        fmt::from_fn(move |fmt| {
-                            if let (true, Cfg::Cfg(_, Some(feat))) = (short_longhand, sub_cfg) {
-                                if self.1.is_html() {
-                                    write!(fmt, "<code>{feat}</code>")
-                                } else {
-                                    write!(fmt, "`{feat}`")
-                                }
-                            } else {
-                                write_with_opt_paren(
-                                    fmt,
-                                    !sub_cfg.is_all(),
-                                    Display(sub_cfg, self.1),
-                                )
-                            }
-                        })
-                    })
-                    .format(separator)
-                    .fmt(fmt)
-            }
-
-            Cfg::All(ref sub_cfgs) => {
-                let short_longhand = self.1.is_long() && {
-                    let all_crate_features = sub_cfgs
-                        .iter()
-                        .all(|sub_cfg| matches!(sub_cfg, Cfg::Cfg(sym::feature, Some(_))));
-                    let all_target_features = sub_cfgs
-                        .iter()
-                        .all(|sub_cfg| matches!(sub_cfg, Cfg::Cfg(sym::target_feature, Some(_))));
-
-                    if all_crate_features {
-                        fmt.write_str("crate features ")?;
-                        true
-                    } else if all_target_features {
-                        fmt.write_str("target features ")?;
-                        true
-                    } else {
-                        false
-                    }
-                };
-
-                sub_cfgs
-                    .iter()
-                    .map(|sub_cfg| {
-                        fmt::from_fn(move |fmt| {
-                            if let (true, Cfg::Cfg(_, Some(feat))) = (short_longhand, sub_cfg) {
-                                if self.1.is_html() {
-                                    write!(fmt, "<code>{feat}</code>")
-                                } else {
-                                    write!(fmt, "`{feat}`")
-                                }
-                            } else {
-                                write_with_opt_paren(
-                                    fmt,
-                                    !sub_cfg.is_simple(),
-                                    Display(sub_cfg, self.1),
-                                )
-                            }
-                        })
-                    })
-                    .format(" and ")
-                    .fmt(fmt)
+                self.display_quantified_sub_cfgs(fmt, sub_cfgs, separator)
             }
+            Cfg::All(ref sub_cfgs) => self.display_quantified_sub_cfgs(fmt, sub_cfgs, " and "),
 
             Cfg::True => fmt.write_str("everywhere"),
             Cfg::False => fmt.write_str("nowhere"),