Skip to content

Commit 27845a9

Browse files
committed
Auto merge of #8274 - andrewarchi:master, r=camsteffen
Update markdown-it version Fixes improperly-escaped pipes in Markdown tables for the [documentation of bad_bit_mask](https://rust-lang.github.io/rust-clippy/master/index.html#bad_bit_mask) and [ineffective_bit_mask](https://rust-lang.github.io/rust-clippy/master/index.html#ineffective_bit_mask). A column pipe takes precedence over inline code markers, so some back ticks are displayed literally and the pipes need to be escaped. I found no other occurrences of the same problem when searching rust-clippy by ```\|.*`.*\|```. changelog: Update markdown-it version
2 parents 496f26c + 65c072d commit 27845a9

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

Diff for: clippy_lints/src/bit_mask.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ declare_clippy_lint! {
1818
/// {`!=`, `>=`, `>`, `!=`, `>=`, `>`}) can be determined from the following
1919
/// table:
2020
///
21-
/// |Comparison |Bit Op|Example |is always|Formula |
22-
/// |------------|------|------------|---------|----------------------|
23-
/// |`==` or `!=`| `&` |`x & 2 == 3`|`false` |`c & m != c` |
24-
/// |`<` or `>=`| `&` |`x & 2 < 3` |`true` |`m < c` |
25-
/// |`>` or `<=`| `&` |`x & 1 > 1` |`false` |`m <= c` |
26-
/// |`==` or `!=`| `|` |`x | 1 == 0`|`false` |`c | m != c` |
27-
/// |`<` or `>=`| `|` |`x | 1 < 1` |`false` |`m >= c` |
28-
/// |`<=` or `>` | `|` |`x | 1 > 0` |`true` |`m > c` |
21+
/// |Comparison |Bit Op|Example |is always|Formula |
22+
/// |------------|------|-------------|---------|----------------------|
23+
/// |`==` or `!=`| `&` |`x & 2 == 3` |`false` |`c & m != c` |
24+
/// |`<` or `>=`| `&` |`x & 2 < 3` |`true` |`m < c` |
25+
/// |`>` or `<=`| `&` |`x & 1 > 1` |`false` |`m <= c` |
26+
/// |`==` or `!=`| `\|` |`x \| 1 == 0`|`false` |`c \| m != c` |
27+
/// |`<` or `>=`| `\|` |`x \| 1 < 1` |`false` |`m >= c` |
28+
/// |`<=` or `>` | `\|` |`x \| 1 > 0` |`true` |`m > c` |
2929
///
3030
/// ### Why is this bad?
3131
/// If the bits that the comparison cares about are always
@@ -53,10 +53,10 @@ declare_clippy_lint! {
5353
/// without changing the outcome. The basic structure can be seen in the
5454
/// following table:
5555
///
56-
/// |Comparison| Bit Op |Example |equals |
57-
/// |----------|---------|-----------|-------|
58-
/// |`>` / `<=`|`|` / `^`|`x | 2 > 3`|`x > 3`|
59-
/// |`<` / `>=`|`|` / `^`|`x ^ 1 < 4`|`x < 4`|
56+
/// |Comparison| Bit Op |Example |equals |
57+
/// |----------|----------|------------|-------|
58+
/// |`>` / `<=`|`\|` / `^`|`x \| 2 > 3`|`x > 3`|
59+
/// |`<` / `>=`|`\|` / `^`|`x ^ 1 < 4` |`x < 4`|
6060
///
6161
/// ### Why is this bad?
6262
/// Not equally evil as [`bad_bit_mask`](#bad_bit_mask),

Diff for: util/gh-pages/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ <h2 class="panel-title">
368368
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on Github"/>
369369
</a>
370370

371-
<script src="https://cdnjs.cloudflare.com/ajax/libs/markdown-it/7.0.0/markdown-it.min.js"></script>
371+
<script src="https://cdnjs.cloudflare.com/ajax/libs/markdown-it/12.3.2/markdown-it.min.js"></script>
372372
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.5.0/highlight.min.js"></script>
373373
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.5.0/languages/rust.min.js"></script>
374374
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.12/angular.min.js"></script>

0 commit comments

Comments
 (0)