Skip to content

Commit 2550d5b

Browse files
committed
Update Cargo
Output of `git log --oneline c68432f1e..970bc67c3`: 970bc67c3 (HEAD, origin/master, origin/auto-cargo, origin/HEAD) Auto merge of rust-lang#9243 - wickerwaka:configurable-env-doc, r=ehuss 4d7a29b75 Document the configurable-env usntable option f7a7a3f91 Auto merge of rust-lang#9229 - alexcrichton:fix-borrow-mut, r=ehuss 3f2ece7a9 Fix a `BorrowMut` error when stdout is closed 7441e8c23 Auto merge of rust-lang#8825 - Aaron1011:feature/report-future-incompat, r=ehuss 139ed73f5 Add future-incompat tracking issue number. 9ea350368 Fix some minor formatting issues. f03d47ce4 Address review comments 6177c6584 Implement future incompatibility report support c69409658 Auto merge of rust-lang#9022 - nagisa:nagisa/manifest_path, r=alexcrichton 548300b20 Add the path to the manifest in json output 99e714c05 Auto merge of rust-lang#9230 - kornelski:nobinaries, r=alexcrichton 61a31bc5f Auto merge of rust-lang#9236 - kornelski:track-assert, r=Eh2406 3f7f0942c track_caller on custom assert functions 6977dee10 Explain `cargo install` is not for libraries e4aebf0a0 Auto merge of rust-lang#9231 - joshtriplett:clear-to-eol-if-color, r=alexcrichton b219f0eb7 Auto merge of rust-lang#9181 - jyn514:computer-says-no, r=ehuss 0b1816578 Remove unhelpful link to Cargo book ea46f5ce3 Use ANSI clear-to-EOL if color is force-enabled a6394bcc1 Remove unnecessary `config` argument to `Features::add` 3a86ecf2d Fix TODO about nightly features 09677c83c Be less unix-centric in error messages ecfdced0d Fix test that assumed tests always were run on the stable channel eba541994 Update comment in build_script_env a5720117f Make `nightly_features_allowed` a field instead of a function 169b09ce7 Compute `enable_nightly_features` once instead of on each call 8fc86e155 Remove unused thread_locals 4b096beae Fix `masquerade_as_nightly_cargo` in work threads e56417c8c Suggest RUSTC_BOOTSTRAP=crate instead of RUSTC_BOOTSTRAP=1 418129dae Downgrade error to a warning when `RUSTC_BOOTSTRAP` is set or this is the nightly channel 6c422a2c0 Restrict RUSTC_BOOTSTRAP in build.rs
1 parent 234781a commit 2550d5b

File tree

2 files changed

+62
-21
lines changed

2 files changed

+62
-21
lines changed

Cargo.lock

+61-20
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ version = "0.0.0"
3737
dependencies = [
3838
"compiler_builtins",
3939
"core",
40-
"rand",
40+
"rand 0.7.3",
4141
"rand_xorshift",
4242
]
4343

@@ -325,6 +325,7 @@ dependencies = [
325325
"openssl",
326326
"percent-encoding 2.1.0",
327327
"pretty_env_logger",
328+
"rand 0.8.3",
328329
"rustc-workspace-hack",
329330
"rustfix",
330331
"same-file",
@@ -757,7 +758,7 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
757758
name = "core"
758759
version = "0.0.0"
759760
dependencies = [
760-
"rand",
761+
"rand 0.7.3",
761762
]
762763

763764
[[package]]
@@ -1662,7 +1663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
16621663
checksum = "3ca8957e71f04a205cb162508f9326aea04676c8dfd0711220190d6b83664f3f"
16631664
dependencies = [
16641665
"bitmaps",
1665-
"rand_core",
1666+
"rand_core 0.5.1",
16661667
"rand_xoshiro",
16671668
"sized-chunks",
16681669
"typenum",
@@ -1867,7 +1868,7 @@ dependencies = [
18671868
"lazy_static",
18681869
"log",
18691870
"parking_lot",
1870-
"rand",
1871+
"rand 0.7.3",
18711872
"serde",
18721873
]
18731874

@@ -2308,7 +2309,7 @@ dependencies = [
23082309
"hex 0.4.2",
23092310
"libc",
23102311
"log",
2311-
"rand",
2312+
"rand 0.7.3",
23122313
"rustc-workspace-hack",
23132314
"rustc_version",
23142315
"shell-escape",
@@ -2508,7 +2509,7 @@ dependencies = [
25082509
"log",
25092510
"mio-named-pipes",
25102511
"miow 0.3.6",
2511-
"rand",
2512+
"rand 0.7.3",
25122513
"tokio",
25132514
"winapi 0.3.9",
25142515
]
@@ -2645,7 +2646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
26452646
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
26462647
dependencies = [
26472648
"phf_shared",
2648-
"rand",
2649+
"rand 0.7.3",
26492650
]
26502651

26512652
[[package]]
@@ -2892,20 +2893,42 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
28922893
dependencies = [
28932894
"getrandom 0.1.14",
28942895
"libc",
2895-
"rand_chacha",
2896-
"rand_core",
2897-
"rand_hc",
2896+
"rand_chacha 0.2.2",
2897+
"rand_core 0.5.1",
2898+
"rand_hc 0.2.0",
28982899
"rand_pcg",
28992900
]
29002901

2902+
[[package]]
2903+
name = "rand"
2904+
version = "0.8.3"
2905+
source = "registry+https://github.com/rust-lang/crates.io-index"
2906+
checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
2907+
dependencies = [
2908+
"libc",
2909+
"rand_chacha 0.3.0",
2910+
"rand_core 0.6.2",
2911+
"rand_hc 0.3.0",
2912+
]
2913+
29012914
[[package]]
29022915
name = "rand_chacha"
29032916
version = "0.2.2"
29042917
source = "registry+https://github.com/rust-lang/crates.io-index"
29052918
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
29062919
dependencies = [
29072920
"ppv-lite86",
2908-
"rand_core",
2921+
"rand_core 0.5.1",
2922+
]
2923+
2924+
[[package]]
2925+
name = "rand_chacha"
2926+
version = "0.3.0"
2927+
source = "registry+https://github.com/rust-lang/crates.io-index"
2928+
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
2929+
dependencies = [
2930+
"ppv-lite86",
2931+
"rand_core 0.6.2",
29092932
]
29102933

29112934
[[package]]
@@ -2917,13 +2940,31 @@ dependencies = [
29172940
"getrandom 0.1.14",
29182941
]
29192942

2943+
[[package]]
2944+
name = "rand_core"
2945+
version = "0.6.2"
2946+
source = "registry+https://github.com/rust-lang/crates.io-index"
2947+
checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
2948+
dependencies = [
2949+
"getrandom 0.2.0",
2950+
]
2951+
29202952
[[package]]
29212953
name = "rand_hc"
29222954
version = "0.2.0"
29232955
source = "registry+https://github.com/rust-lang/crates.io-index"
29242956
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
29252957
dependencies = [
2926-
"rand_core",
2958+
"rand_core 0.5.1",
2959+
]
2960+
2961+
[[package]]
2962+
name = "rand_hc"
2963+
version = "0.3.0"
2964+
source = "registry+https://github.com/rust-lang/crates.io-index"
2965+
checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
2966+
dependencies = [
2967+
"rand_core 0.6.2",
29272968
]
29282969

29292970
[[package]]
@@ -2932,7 +2973,7 @@ version = "0.2.1"
29322973
source = "registry+https://github.com/rust-lang/crates.io-index"
29332974
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
29342975
dependencies = [
2935-
"rand_core",
2976+
"rand_core 0.5.1",
29362977
]
29372978

29382979
[[package]]
@@ -2941,7 +2982,7 @@ version = "0.2.0"
29412982
source = "registry+https://github.com/rust-lang/crates.io-index"
29422983
checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
29432984
dependencies = [
2944-
"rand_core",
2985+
"rand_core 0.5.1",
29452986
]
29462987

29472988
[[package]]
@@ -2950,7 +2991,7 @@ version = "0.4.0"
29502991
source = "registry+https://github.com/rust-lang/crates.io-index"
29512992
checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004"
29522993
dependencies = [
2953-
"rand_core",
2994+
"rand_core 0.5.1",
29542995
]
29552996

29562997
[[package]]
@@ -3082,7 +3123,7 @@ dependencies = [
30823123
"num_cpus",
30833124
"ordslice",
30843125
"racer",
3085-
"rand",
3126+
"rand 0.7.3",
30863127
"rayon",
30873128
"regex",
30883129
"rls-analysis",
@@ -3153,7 +3194,7 @@ dependencies = [
31533194
"env_logger 0.7.1",
31543195
"futures 0.3.12",
31553196
"log",
3156-
"rand",
3197+
"rand 0.7.3",
31573198
"rls-data",
31583199
"rls-ipc",
31593200
"serde",
@@ -3933,7 +3974,7 @@ dependencies = [
39333974
name = "rustc_incremental"
39343975
version = "0.0.0"
39353976
dependencies = [
3936-
"rand",
3977+
"rand 0.7.3",
39373978
"rustc_ast",
39383979
"rustc_data_structures",
39393980
"rustc_fs_util",
@@ -4974,7 +5015,7 @@ dependencies = [
49745015
"panic_abort",
49755016
"panic_unwind",
49765017
"profiler_builtins",
4977-
"rand",
5018+
"rand 0.7.3",
49785019
"rustc-demangle",
49795020
"unwind",
49805021
"wasi",
@@ -5105,7 +5146,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
51055146
dependencies = [
51065147
"cfg-if 0.1.10",
51075148
"libc",
5108-
"rand",
5149+
"rand 0.7.3",
51095150
"redox_syscall 0.1.57",
51105151
"remove_dir_all",
51115152
"winapi 0.3.9",

src/tools/cargo

Submodule cargo updated 45 files

0 commit comments

Comments
 (0)