Skip to content

Commit 6740895

Browse files
celinvaltedinski
celinval
authored and
tedinski
committed
Merge rustc into rmc - 2022 week 02
Conflicts: - rustfmt.toml - src/tools/compiletest/src/header.rs
1 parent 6386eed commit 6740895

File tree

596 files changed

+10818
-6226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

596 files changed

+10818
-6226
lines changed

‎Cargo.lock

Lines changed: 93 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1919
checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
2020
dependencies = [
2121
"compiler_builtins",
22-
"gimli",
22+
"gimli 0.25.0",
2323
"rustc-std-workspace-alloc",
2424
"rustc-std-workspace-core",
2525
]
@@ -108,9 +108,9 @@ dependencies = [
108108

109109
[[package]]
110110
name = "anyhow"
111-
version = "1.0.34"
111+
version = "1.0.51"
112112
source = "registry+https://github.com/rust-lang/crates.io-index"
113-
checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
113+
checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
114114

115115
[[package]]
116116
name = "array_tool"
@@ -191,7 +191,7 @@ name = "bookrunner"
191191
version = "0.1.0"
192192
dependencies = [
193193
"Inflector",
194-
"pulldown-cmark",
194+
"pulldown-cmark 0.8.0",
195195
"rustdoc",
196196
"serde",
197197
"serde_json",
@@ -209,9 +209,7 @@ dependencies = [
209209
"filetime",
210210
"getopts",
211211
"ignore",
212-
"lazy_static",
213212
"libc",
214-
"merge",
215213
"num_cpus",
216214
"once_cell",
217215
"opener",
@@ -404,7 +402,7 @@ version = "0.1.0"
404402
dependencies = [
405403
"directories",
406404
"rustc-workspace-hack",
407-
"rustc_version 0.3.3",
405+
"rustc_version",
408406
"serde",
409407
"serde_json",
410408
"vergen",
@@ -671,7 +669,7 @@ dependencies = [
671669
"clippy_utils",
672670
"if_chain",
673671
"itertools 0.10.1",
674-
"pulldown-cmark",
672+
"pulldown-cmark 0.9.0",
675673
"quine-mc_cluskey",
676674
"regex-syntax",
677675
"rustc-semver",
@@ -1223,6 +1221,12 @@ version = "0.1.2"
12231221
source = "registry+https://github.com/rust-lang/crates.io-index"
12241222
checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
12251223

1224+
[[package]]
1225+
name = "fallible-iterator"
1226+
version = "0.2.0"
1227+
source = "registry+https://github.com/rust-lang/crates.io-index"
1228+
checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
1229+
12261230
[[package]]
12271231
name = "filetime"
12281232
version = "0.2.14"
@@ -1511,6 +1515,17 @@ dependencies = [
15111515
"rustc-std-workspace-core",
15121516
]
15131517

1518+
[[package]]
1519+
name = "gimli"
1520+
version = "0.26.1"
1521+
source = "registry+https://github.com/rust-lang/crates.io-index"
1522+
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
1523+
dependencies = [
1524+
"fallible-iterator",
1525+
"indexmap",
1526+
"stable_deref_trait",
1527+
]
1528+
15141529
[[package]]
15151530
name = "git2"
15161531
version = "0.13.23"
@@ -2018,9 +2033,9 @@ dependencies = [
20182033

20192034
[[package]]
20202035
name = "libssh2-sys"
2021-
version = "0.2.19"
2036+
version = "0.2.23"
20222037
source = "registry+https://github.com/rust-lang/crates.io-index"
2023-
checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
2038+
checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
20242039
dependencies = [
20252040
"cc",
20262041
"libc",
@@ -2218,7 +2233,7 @@ dependencies = [
22182233
"log",
22192234
"memchr",
22202235
"opener",
2221-
"pulldown-cmark",
2236+
"pulldown-cmark 0.8.0",
22222237
"regex",
22232238
"serde",
22242239
"serde_derive",
@@ -2285,28 +2300,6 @@ dependencies = [
22852300
"autocfg",
22862301
]
22872302

2288-
[[package]]
2289-
name = "merge"
2290-
version = "0.1.0"
2291-
source = "registry+https://github.com/rust-lang/crates.io-index"
2292-
checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9"
2293-
dependencies = [
2294-
"merge_derive",
2295-
"num-traits",
2296-
]
2297-
2298-
[[package]]
2299-
name = "merge_derive"
2300-
version = "0.1.0"
2301-
source = "registry+https://github.com/rust-lang/crates.io-index"
2302-
checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
2303-
dependencies = [
2304-
"proc-macro-error",
2305-
"proc-macro2",
2306-
"quote",
2307-
"syn",
2308-
]
2309-
23102303
[[package]]
23112304
name = "minifier"
23122305
version = "0.0.41"
@@ -2364,7 +2357,7 @@ dependencies = [
23642357
"measureme 9.1.2",
23652358
"rand 0.8.4",
23662359
"rustc-workspace-hack",
2367-
"rustc_version 0.4.0",
2360+
"rustc_version",
23682361
"shell-escape",
23692362
"smallvec",
23702363
]
@@ -2484,6 +2477,18 @@ dependencies = [
24842477
"rustc-std-workspace-core",
24852478
]
24862479

2480+
[[package]]
2481+
name = "object"
2482+
version = "0.27.1"
2483+
source = "registry+https://github.com/rust-lang/crates.io-index"
2484+
checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
2485+
dependencies = [
2486+
"crc32fast",
2487+
"flate2",
2488+
"indexmap",
2489+
"memchr",
2490+
]
2491+
24872492
[[package]]
24882493
name = "odht"
24892494
version = "0.3.1"
@@ -2934,6 +2939,17 @@ dependencies = [
29342939
"unicase",
29352940
]
29362941

2942+
[[package]]
2943+
name = "pulldown-cmark"
2944+
version = "0.9.0"
2945+
source = "registry+https://github.com/rust-lang/crates.io-index"
2946+
checksum = "acd16514d1af5f7a71f909a44ef253cdb712a376d7ebc8ae4a471a9be9743548"
2947+
dependencies = [
2948+
"bitflags",
2949+
"memchr",
2950+
"unicase",
2951+
]
2952+
29372953
[[package]]
29382954
name = "punycode"
29392955
version = "0.4.1"
@@ -3338,8 +3354,8 @@ dependencies = [
33383354
name = "rmc-link-restrictions"
33393355
version = "0.1.0"
33403356
dependencies = [
3357+
"cbmc",
33413358
"rmc_restrictions",
3342-
"rustc_data_structures",
33433359
"serde",
33443360
"serde_json",
33453361
]
@@ -3360,7 +3376,6 @@ name = "rmc_restrictions"
33603376
version = "0.1.0"
33613377
dependencies = [
33623378
"cbmc",
3363-
"rustc_data_structures",
33643379
"serde",
33653380
]
33663381

@@ -3926,10 +3941,11 @@ dependencies = [
39263941
"itertools 0.9.0",
39273942
"jobserver",
39283943
"libc",
3929-
"object",
3944+
"object 0.26.2",
39303945
"pathdiff",
39313946
"regex",
39323947
"rustc_apfloat",
3948+
"rustc_arena",
39333949
"rustc_ast",
39343950
"rustc_attr",
39353951
"rustc_data_structures",
@@ -3950,6 +3966,7 @@ dependencies = [
39503966
"smallvec",
39513967
"snap",
39523968
"tempfile",
3969+
"thorin-dwp",
39533970
"tracing",
39543971
]
39553972

@@ -4009,7 +4026,6 @@ dependencies = [
40094026
name = "rustc_driver"
40104027
version = "0.0.0"
40114028
dependencies = [
4012-
"atty",
40134029
"libc",
40144030
"rustc_ast",
40154031
"rustc_ast_pretty",
@@ -4023,6 +4039,7 @@ dependencies = [
40234039
"rustc_hir_pretty",
40244040
"rustc_interface",
40254041
"rustc_lint",
4042+
"rustc_log",
40264043
"rustc_metadata",
40274044
"rustc_middle",
40284045
"rustc_parse",
@@ -4034,8 +4051,6 @@ dependencies = [
40344051
"rustc_target",
40354052
"rustc_typeck",
40364053
"tracing",
4037-
"tracing-subscriber",
4038-
"tracing-tree",
40394054
"winapi",
40404055
]
40414056

@@ -4153,6 +4168,7 @@ dependencies = [
41534168
"arrayvec",
41544169
"rustc_macros",
41554170
"rustc_serialize",
4171+
"smallvec",
41564172
]
41574173

41584174
[[package]]
@@ -4277,6 +4293,17 @@ dependencies = [
42774293
"libc",
42784294
]
42794295

4296+
[[package]]
4297+
name = "rustc_log"
4298+
version = "0.0.0"
4299+
dependencies = [
4300+
"atty",
4301+
"rustc_span",
4302+
"tracing",
4303+
"tracing-subscriber",
4304+
"tracing-tree",
4305+
]
4306+
42804307
[[package]]
42814308
name = "rustc_macros"
42824309
version = "0.1.0"
@@ -4777,15 +4804,6 @@ dependencies = [
47774804
"tracing",
47784805
]
47794806

4780-
[[package]]
4781-
name = "rustc_version"
4782-
version = "0.3.3"
4783-
source = "registry+https://github.com/rust-lang/crates.io-index"
4784-
checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
4785-
dependencies = [
4786-
"semver 0.11.0",
4787-
]
4788-
47894807
[[package]]
47904808
name = "rustc_version"
47914809
version = "0.4.0"
@@ -4803,7 +4821,7 @@ dependencies = [
48034821
"expect-test",
48044822
"itertools 0.9.0",
48054823
"minifier",
4806-
"pulldown-cmark",
4824+
"pulldown-cmark 0.9.0",
48074825
"rayon",
48084826
"regex",
48094827
"rustdoc-json-types",
@@ -5202,7 +5220,7 @@ dependencies = [
52025220
"hermit-abi",
52035221
"libc",
52045222
"miniz_oxide",
5205-
"object",
5223+
"object 0.26.2",
52065224
"panic_abort",
52075225
"panic_unwind",
52085226
"profiler_builtins",
@@ -5277,9 +5295,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
52775295

52785296
[[package]]
52795297
name = "structopt"
5280-
version = "0.3.16"
5298+
version = "0.3.25"
52815299
source = "registry+https://github.com/rust-lang/crates.io-index"
5282-
checksum = "de5472fb24d7e80ae84a7801b7978f95a19ec32cb1876faea59ab711eb901976"
5300+
checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
52835301
dependencies = [
52845302
"clap",
52855303
"lazy_static",
@@ -5288,9 +5306,9 @@ dependencies = [
52885306

52895307
[[package]]
52905308
name = "structopt-derive"
5291-
version = "0.4.9"
5309+
version = "0.4.18"
52925310
source = "registry+https://github.com/rust-lang/crates.io-index"
5293-
checksum = "1e0eb37335aeeebe51be42e2dc07f031163fbabfa6ac67d7ea68b5c2f68d5f99"
5311+
checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
52945312
dependencies = [
52955313
"heck",
52965314
"proc-macro-error",
@@ -5469,24 +5487,36 @@ dependencies = [
54695487

54705488
[[package]]
54715489
name = "thiserror"
5472-
version = "1.0.20"
5490+
version = "1.0.30"
54735491
source = "registry+https://github.com/rust-lang/crates.io-index"
5474-
checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
5492+
checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
54755493
dependencies = [
54765494
"thiserror-impl",
54775495
]
54785496

54795497
[[package]]
54805498
name = "thiserror-impl"
5481-
version = "1.0.20"
5499+
version = "1.0.30"
54825500
source = "registry+https://github.com/rust-lang/crates.io-index"
5483-
checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
5501+
checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
54845502
dependencies = [
54855503
"proc-macro2",
54865504
"quote",
54875505
"syn",
54885506
]
54895507

5508+
[[package]]
5509+
name = "thorin-dwp"
5510+
version = "0.1.1"
5511+
source = "registry+https://github.com/rust-lang/crates.io-index"
5512+
checksum = "039d1fc0bfdb73910c2702893515580e38c192f47a987bc98ddd38a36f2d953a"
5513+
dependencies = [
5514+
"gimli 0.26.1",
5515+
"indexmap",
5516+
"object 0.27.1",
5517+
"tracing",
5518+
]
5519+
54905520
[[package]]
54915521
name = "thread_local"
54925522
version = "1.0.1"
@@ -5614,9 +5644,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
56145644

56155645
[[package]]
56165646
name = "tracing"
5617-
version = "0.1.28"
5647+
version = "0.1.29"
56185648
source = "registry+https://github.com/rust-lang/crates.io-index"
5619-
checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8"
5649+
checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
56205650
dependencies = [
56215651
"cfg-if 1.0.0",
56225652
"pin-project-lite",
@@ -5626,9 +5656,9 @@ dependencies = [
56265656

56275657
[[package]]
56285658
name = "tracing-attributes"
5629-
version = "0.1.17"
5659+
version = "0.1.18"
56305660
source = "registry+https://github.com/rust-lang/crates.io-index"
5631-
checksum = "c4f915eb6abf914599c200260efced9203504c4c37380af10cdf3b7d36970650"
5661+
checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
56325662
dependencies = [
56335663
"proc-macro2",
56345664
"quote",

0 commit comments

Comments
 (0)