Skip to content

Commit 95b1fe5

Browse files
borsbors
committed
Auto merge of #62789 - GuillaumeGomez:update-pulldown-cmark, r=Manishearth
Update pulldown-cmark version Fixes #62571. Fixes #62770. Fixes #62552. cc @rust-lang/rustdoc @Centril @pietroalbini
2 parents f69b071 + 9d6b29a commit 95b1fe5

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎Cargo.lock

+27-27
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ dependencies = [
137137

138138
[[package]]
139139
name = "bitflags"
140-
version = "1.0.4"
140+
version = "1.1.0"
141141
source = "registry+https://github.com/rust-lang/crates.io-index"
142142

143143
[[package]]
@@ -373,7 +373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
373373
dependencies = [
374374
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
375375
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
376-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
376+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
377377
"strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
378378
"textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
379379
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -411,7 +411,7 @@ dependencies = [
411411
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
412412
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
413413
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
414-
"pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
414+
"pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
415415
"quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
416416
"regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
417417
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -427,7 +427,7 @@ name = "cloudabi"
427427
version = "0.0.3"
428428
source = "registry+https://github.com/rust-lang/crates.io-index"
429429
dependencies = [
430-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
430+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
431431
]
432432

433433
[[package]]
@@ -996,7 +996,7 @@ name = "fuchsia-zircon"
996996
version = "0.3.3"
997997
source = "registry+https://github.com/rust-lang/crates.io-index"
998998
dependencies = [
999-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
999+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
10001000
"fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
10011001
]
10021002

@@ -1058,7 +1058,7 @@ name = "git2"
10581058
version = "0.9.1"
10591059
source = "registry+https://github.com/rust-lang/crates.io-index"
10601060
dependencies = [
1061-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
1061+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
10621062
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
10631063
"libgit2-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
10641064
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1535,7 +1535,7 @@ name = "lsp-types"
15351535
version = "0.57.2"
15361536
source = "registry+https://github.com/rust-lang/crates.io-index"
15371537
dependencies = [
1538-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
1538+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
15391539
"num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
15401540
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
15411541
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1608,7 +1608,7 @@ dependencies = [
16081608
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
16091609
"memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
16101610
"open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
1611-
"pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
1611+
"pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
16121612
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
16131613
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
16141614
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1629,7 +1629,7 @@ dependencies = [
16291629
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
16301630
"mdbook 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
16311631
"memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1632-
"pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
1632+
"pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
16331633
"rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
16341634
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
16351635
"reqwest 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1891,7 +1891,7 @@ name = "openssl"
18911891
version = "0.10.16"
18921892
source = "registry+https://github.com/rust-lang/crates.io-index"
18931893
dependencies = [
1894-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
1894+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
18951895
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
18961896
"foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
18971897
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2143,10 +2143,10 @@ dependencies = [
21432143

21442144
[[package]]
21452145
name = "pulldown-cmark"
2146-
version = "0.5.2"
2146+
version = "0.5.3"
21472147
source = "registry+https://github.com/rust-lang/crates.io-index"
21482148
dependencies = [
2149-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2149+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
21502150
"getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
21512151
"memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
21522152
"unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2180,7 +2180,7 @@ name = "racer"
21802180
version = "2.1.23"
21812181
source = "registry+https://github.com/rust-lang/crates.io-index"
21822182
dependencies = [
2183-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2183+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
21842184
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
21852185
"derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
21862186
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2514,7 +2514,7 @@ version = "0.0.0"
25142514
dependencies = [
25152515
"arena 0.0.0",
25162516
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
2517-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2517+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
25182518
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
25192519
"chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
25202520
"fmt_macros 0.0.0",
@@ -2560,7 +2560,7 @@ name = "rustc-ap-rustc_cratesio_shim"
25602560
version = "491.0.0"
25612561
source = "registry+https://github.com/rust-lang/crates.io-index"
25622562
dependencies = [
2563-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2563+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
25642564
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
25652565
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
25662566
]
@@ -2620,7 +2620,7 @@ name = "rustc-ap-rustc_target"
26202620
version = "491.0.0"
26212621
source = "registry+https://github.com/rust-lang/crates.io-index"
26222622
dependencies = [
2623-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2623+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
26242624
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
26252625
"rustc-ap-rustc_cratesio_shim 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
26262626
"rustc-ap-rustc_data_structures 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2642,7 +2642,7 @@ name = "rustc-ap-syntax"
26422642
version = "491.0.0"
26432643
source = "registry+https://github.com/rust-lang/crates.io-index"
26442644
dependencies = [
2645-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2645+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
26462646
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
26472647
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
26482648
"rustc-ap-rustc_data_structures 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2769,7 +2769,7 @@ dependencies = [
27692769
name = "rustc_apfloat"
27702770
version = "0.0.0"
27712771
dependencies = [
2772-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2772+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
27732773
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
27742774
]
27752775

@@ -2813,7 +2813,7 @@ dependencies = [
28132813
name = "rustc_codegen_ssa"
28142814
version = "0.0.0"
28152815
dependencies = [
2816-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2816+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
28172817
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
28182818
"jobserver 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
28192819
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3108,7 +3108,7 @@ name = "rustc_resolve"
31083108
version = "0.0.0"
31093109
dependencies = [
31103110
"arena 0.0.0",
3111-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
3111+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
31123112
"indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
31133113
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
31143114
"rustc 0.0.0",
@@ -3141,7 +3141,7 @@ dependencies = [
31413141
name = "rustc_target"
31423142
version = "0.0.0"
31433143
dependencies = [
3144-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
3144+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
31453145
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
31463146
"rustc_data_structures 0.0.0",
31473147
"serialize 0.0.0",
@@ -3161,7 +3161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31613161
name = "rustc_traits"
31623162
version = "0.0.0"
31633163
dependencies = [
3164-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
3164+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
31653165
"chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
31663166
"graphviz 0.0.0",
31673167
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3213,7 +3213,7 @@ version = "0.0.0"
32133213
dependencies = [
32143214
"minifier 0.0.30 (registry+https://github.com/rust-lang/crates.io-index)",
32153215
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
3216-
"pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
3216+
"pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
32173217
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
32183218
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
32193219
]
@@ -3617,7 +3617,7 @@ dependencies = [
36173617
name = "syntax"
36183618
version = "0.0.0"
36193619
dependencies = [
3620-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
3620+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
36213621
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
36223622
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
36233623
"rustc_data_structures 0.0.0",
@@ -4175,7 +4175,7 @@ name = "vergen"
41754175
version = "3.0.4"
41764176
source = "registry+https://github.com/rust-lang/crates.io-index"
41774177
dependencies = [
4178-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
4178+
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
41794179
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
41804180
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
41814181
]
@@ -4304,7 +4304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43044304
"checksum backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)" = "2d631cd7af21b7ff796293f1990104e3cdb606852863bac32f000c193aa35dfb"
43054305
"checksum backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea90dd7b012b3d1a2cb6bec16670a0db2c95d4e931e84f4047e0460c1b34c8d"
43064306
"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
4307-
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
4307+
"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
43084308
"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
43094309
"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
43104310
"checksum bstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "853b090ce0f45d0265902666bf88039ea3da825e33796716c511a1ec9c170036"
@@ -4495,7 +4495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
44954495
"checksum pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a029430f0d744bc3d15dd474d591bed2402b645d024583082b9f63bb936dac6"
44964496
"checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
44974497
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
4498-
"checksum pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "051e60ace841b3bfecd402fe5051c06cb3bec4a6e6fdd060a37aa8eb829a1db3"
4498+
"checksum pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357"
44994499
"checksum punycode 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ddd112cca70a4d30883b2d21568a1d376ff8be4758649f64f973c6845128ad3"
45004500
"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
45014501
"checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"

‎src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name = "rustdoc"
99
path = "lib.rs"
1010

1111
[dependencies]
12-
pulldown-cmark = { version = "0.5.2", default-features = false }
12+
pulldown-cmark = { version = "0.5.3", default-features = false }
1313
minifier = "0.0.30"
1414
rayon = { version = "0.2.0", package = "rustc-rayon" }
1515
tempfile = "3"

0 commit comments

Comments
 (0)