git.iko.soy/htmlang
on master help sign in
Collapse nested if statements into match guards (clippy)
aa14347iko
src/convert.rs+6−12
compare with master
unifiedsplit
@@ -905,20 +905,14 @@ fn emit_element(
905
905
906 // Bold/italic for strong/em/b/i/u
906 // Bold/italic for strong/em/b/i/u
907 match tag {
907 match tag {
908− "b" | "strong" => {
909− if !hl_attrs.iter().any(|(k, _)| k == "bold") {
908+ "b" | "strong" if !hl_attrs.iter().any(|(k, _)| k == "bold") => {
910− hl_attrs.push(("bold".into(), None));
909+ hl_attrs.push(("bold".into(), None));
911− }
912 }
910 }
913− "i" | "em" => {
914− if !hl_attrs.iter().any(|(k, _)| k == "italic") {
911+ "i" | "em" if !hl_attrs.iter().any(|(k, _)| k == "italic") => {
915− hl_attrs.push(("italic".into(), None));
912+ hl_attrs.push(("italic".into(), None));
916− }
917 }
913 }
918− "u" => {
919− if !hl_attrs.iter().any(|(k, _)| k == "underline") {
914+ "u" if !hl_attrs.iter().any(|(k, _)| k == "underline") => {
920− hl_attrs.push(("underline".into(), None));
915+ hl_attrs.push(("underline".into(), None));
921− }
922 }
916 }
923 _ => {}
917 _ => {}
924 }
918 }
src/fmt.rs+6−5
@@ -175,13 +175,14 @@ fn split_trailing_comment(line: &str) -> (&str, Option<&str>) {
175 b'"' | b'\'' => in_str = Some(c),
175 b'"' | b'\'' => in_str = Some(c),
176 b'[' => bracket_depth += 1,
176 b'[' => bracket_depth += 1,
177 b']' => bracket_depth -= 1,
177 b']' => bracket_depth -= 1,
178+ b'-' if bytes[i + 1] == b'-'
178− b'-' if bytes[i + 1] == b'-' && bracket_depth == 0 => {
179+ && bracket_depth == 0
179 // Require a space (or start-of-line) before the `--` so we
180 // Require a space (or start-of-line) before the `--` so we
180 // don't split inside identifiers or CSS values like `a--b`.
181 // don't split inside identifiers or CSS values like `a--b`.
181− if i == 0 || bytes[i - 1] == b' ' || bytes[i - 1] == b'\t' {
182+ && (i == 0 || bytes[i - 1] == b' ' || bytes[i - 1] == b'\t') =>
183+ {
182− let (before, after) = line.split_at(i);
184+ let (before, after) = line.split_at(i);
183− return (before.trim_end(), Some(after));
185+ return (before.trim_end(), Some(after));
184− }
185 }
186 }
186 _ => {}
187 _ => {}
187 },
188 },