Rollup merge of #61720 - alexcrichton:libstd-cfg-if-dep, r=sfackler

std: Remove internal definitions of `cfg_if!` macro

This is duplicated in a few locations throughout the sysroot to work
around issues with not exporting a macro in libstd but still wanting it
available to sysroot crates to define blocks. Nowadays though we can
simply depend on the `cfg-if` crate on crates.io, allowing us to use it
from there!

diff --combined Cargo.lock
index 1b4a5d58cb15a240e32adba61508a1f0bc82b849,10cad11ea8ca03c5aa118ffaf53657e7ff358b65..d3c6be59b75df5c3498825be9e0df77146a6629b
--- 1/Cargo.lock
--- 2/Cargo.lock
+++ b/Cargo.lock
@@@ -33,7 -33,7 +33,7 @@@ dependencies = 
  
  [[package]]
  name = "ammonia"
 -version = "1.1.0"
 +version = "1.2.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -746,31 -746,20 +746,31 @@@ dependencies = 
  
  [[package]]
  name = "directories"
 -version = "1.0.2"
 +version = "2.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "dirs"
 +version = "1.0.5"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 + "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
 -name = "dirs"
 -version = "1.0.4"
 +name = "dirs-sys"
 +version = "0.3.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
 + "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 - "redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
@@@ -921,9 -910,6 +921,9 @@@ dependencies = 
  [[package]]
  name = "fmt_macros"
  version = "0.0.0"
 +dependencies = [
 + "syntax_pos 0.0.0",
 +]
  
  [[package]]
  name = "fnv"
@@@ -974,11 -960,6 +974,11 @@@ dependencies = 
   "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 +[[package]]
 +name = "fuchsia-cprng"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
  [[package]]
  name = "fuchsia-zircon"
  version = "0.3.3"
@@@ -1148,7 -1129,7 +1148,7 @@@ source = "registry+https://github.com/r
  dependencies = [
   "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
   "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 - "markup5ever 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
   "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
   "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1467,7 -1448,7 +1467,7 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "markup5ever"
 -version = "0.7.2"
 +version = "0.7.5"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "phf 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1490,7 -1471,7 +1490,7 @@@ name = "mdbook
  version = "0.1.7"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
 - "ammonia 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "ammonia 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
   "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "elasticlunr-rs 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1518,7 -1499,7 +1518,7 @@@ name = "mdbook
  version = "0.2.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
 - "ammonia 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "ammonia 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
   "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "elasticlunr-rs 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1670,10 -1651,10 +1670,10 @@@ name = "miri
  version = "0.1.0"
  dependencies = [
   "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 - "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 - "directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "directories 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1832,6 -1813,7 +1832,7 @@@ name = "panic_unwind
  version = "0.0.0"
  dependencies = [
   "alloc 0.0.0",
+  "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
   "core 0.0.0",
   "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1950,7 -1932,7 +1951,7 @@@ version = "0.7.22
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "phf_shared 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -2106,13 -2088,11 +2107,13 @@@ dependencies = 
  
  [[package]]
  name = "rand"
 -version = "0.4.3"
 +version = "0.4.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
 - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
@@@ -2148,11 -2128,6 +2149,11 @@@ name = "rand_core
  version = "0.3.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
 +[[package]]
 +name = "rand_core"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
  [[package]]
  name = "rand_hc"
  version = "0.1.0"
@@@ -2169,19 -2144,6 +2170,19 @@@ dependencies = 
   "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 +[[package]]
 +name = "rand_os"
 +version = "0.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "rand_pcg"
  version = "0.1.1"
@@@ -2205,26 -2167,19 +2206,26 @@@ version = "1.0.1
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rayon-core 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
  name = "rayon-core"
 -version = "1.4.0"
 +version = "1.4.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
   "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "rdrand"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -2242,12 -2197,12 +2243,12 @@@ dependencies = 
  
  [[package]]
  name = "redox_users"
 -version = "0.2.0"
 +version = "0.3.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
@@@ -2309,7 -2264,7 +2310,7 @@@ dependencies = 
  
  [[package]]
  name = "rls"
 -version = "1.36.0"
 +version = "1.37.0"
  dependencies = [
   "cargo 0.38.0",
   "cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -3176,7 -3131,7 +3177,7 @@@ dependencies = 
   "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
   "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 - "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -3384,6 -3339,7 +3385,7 @@@ dependencies = 
   "alloc 0.0.0",
   "backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
   "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
   "core 0.0.0",
   "dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -3982,6 -3938,7 +3984,7 @@@ name = "unwind
  version = "0.0.0"
  dependencies = [
   "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
   "core 0.0.0",
   "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -4157,7 -4114,7 +4160,7 @@@ source = "registry+https://github.com/r
  "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
  "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
  "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
 -"checksum ammonia 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd4c682378117e4186a492b2252b9537990e1617f44aed9788b9a1149de45477"
 +"checksum ammonia 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8b93ecb80665873703bf3b0a77f369c96b183d8e0afaf30a3ff5ff07dfc6409"
  "checksum annotate-snippets 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e8bcdcd5b291ce85a78f2b9d082a8de9676c12b1840d386d67bc5eea6f9d2b4e"
  "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
  "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
@@@ -4218,9 -4175,8 +4221,9 @@@
  "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
  "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
  "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
 -"checksum directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f"
 -"checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a"
 +"checksum directories 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccc83e029c3cebb4c8155c644d34e3a070ccdb4ff90d369c74cd73f7cb3c984"
 +"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 +"checksum dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "937756392ec77d1f2dd9dc3ac9d69867d109a2121479d72c364e42f4cab21e2d"
  "checksum dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f283302e035e61c23f2b86b3093e8c6273a4c3125742d6087e96ade001ca5e63"
  "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
  "checksum elasticlunr-rs 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a99a310cd1f9770e7bf8e48810c7bcbb0e078c8fb23a8c7bcf0da4c2bf61a455"
@@@ -4243,7 -4199,6 +4246,7 @@@
  "checksum fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
  "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
  "checksum fst 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d94485a00b1827b861dd9d1a2cc9764f9044d4c535514c0760a5a2012ef3399f"
 +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
  "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
  "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
  "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
@@@ -4296,7 -4251,7 +4299,7 @@@
  "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
  "checksum macro-utils 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2c4deaccc2ead6a28c16c0ba82f07d52b6475397415ce40876e559b0b0ea510"
  "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
 -"checksum markup5ever 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfedc97d5a503e96816d10fedcd5b42f760b2e525ce2f7ec71f6a41780548475"
 +"checksum markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "897636f9850c3eef4905a5540683ed53dc9393860f0846cab2c2ddf9939862ff"
  "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
  "checksum mdbook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "90b5a8d7e341ceee5db3882a06078d42661ddcfa2b3687319cc5da76ec4e782f"
  "checksum mdbook 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0ba0d44cb4089c741b9a91f3e5218298a40699c2f3a070a85014eed290c60819"
@@@ -4359,22 -4314,19 +4362,22 @@@
  "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
  "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
  "checksum racer 2.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4323343f25bc372dc9293ac6b5cd3034b32784af1e7de9366b4db71466d8c7"
 -"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
 +"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
  "checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a"
  "checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a"
  "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 +"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
  "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
  "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
  "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
  "checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3"
  "checksum rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80e811e76f1dbf68abf87a759083d34600017fc4e10b6bd5ad84a700f9dba4b1"
 -"checksum rayon-core 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d24ad214285a7729b174ed6d3bcfcb80177807f959d95fafd5bfc5c4f201ac8"
 +"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
 +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
  "checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d"
  "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 -"checksum redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26"
 +"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
  "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
  "checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
  "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"

diff --combined src/libstd/macros.rs
index ef1b549d1dcf4db4d467316b8236f596bf8ce5e4,92b9a16f3e316595fd9360868f5c5027d8ac04c9..d695141bef0b9496a10620be590fd96d1973f06c
--- 1/src/libstd/macros.rs
--- 2/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@@ -56,13 -56,13 +56,13 @@@
  #[allow_internal_unstable(__rust_unstable_column, libstd_sys_internals)]
  macro_rules! panic {
      () => ({
 -        panic!("explicit panic")
 +        $crate::panic!("explicit panic")
      });
      ($msg:expr) => ({
          $crate::rt::begin_panic($msg, &(file!(), line!(), __rust_unstable_column!()))
      });
      ($msg:expr,) => ({
 -        panic!($msg)
 +        $crate::panic!($msg)
      });
      ($fmt:expr, $($arg:tt)+) => ({
          $crate::rt::begin_panic_fmt(&format_args!($fmt, $($arg)+),
@@@ -145,7 -145,7 +145,7 @@@ macro_rules! print 
  #[stable(feature = "rust1", since = "1.0.0")]
  #[allow_internal_unstable(print_internals, format_args_nl)]
  macro_rules! println {
 -    () => (print!("\n"));
 +    () => ($crate::print!("\n"));
      ($($arg:tt)*) => ({
          $crate::io::_print(format_args_nl!($($arg)*));
      })
@@@ -204,7 -204,7 +204,7 @@@ macro_rules! eprint 
  #[stable(feature = "eprint", since = "1.19.0")]
  #[allow_internal_unstable(print_internals, format_args_nl)]
  macro_rules! eprintln {
 -    () => (eprint!("\n"));
 +    () => ($crate::eprint!("\n"));
      ($($arg:tt)*) => ({
          $crate::io::_eprint(format_args_nl!($($arg)*));
      })
@@@ -337,23 -337,23 +337,23 @@@
  #[stable(feature = "dbg_macro", since = "1.32.0")]
  macro_rules! dbg {
      () => {
 -        eprintln!("[{}:{}]", file!(), line!());
 +        $crate::eprintln!("[{}:{}]", file!(), line!());
      };
      ($val:expr) => {
          // Use of `match` here is intentional because it affects the lifetimes
          // of temporaries - https://stackoverflow.com/a/48732525/1063961
          match $val {
              tmp => {
 -                eprintln!("[{}:{}] {} = {:#?}",
 +                $crate::eprintln!("[{}:{}] {} = {:#?}",
                      file!(), line!(), stringify!($val), &tmp);
                  tmp
              }
          }
      };
      // Trailing comma with single argument is ignored
 -    ($val:expr,) => { dbg!($val) };
 +    ($val:expr,) => { $crate::dbg!($val) };
      ($($val:expr),+ $(,)?) => {
 -        ($(dbg!($val)),+,)
 +        ($($crate::dbg!($val)),+,)
      };
  }
  
@@@ -896,39 -896,3 +896,3 @@@ mod builtin 
          ($cond:expr, $($arg:tt)+) => ({ /* compiler built-in */ });
      }
  }
- 
- /// Defines `#[cfg]` if-else statements.
- ///
- /// This is similar to the `if/elif` C preprocessor macro by allowing definition
- /// of a cascade of `#[cfg]` cases, emitting the implementation which matches
- /// first.
- ///
- /// This allows you to conveniently provide a long list `#[cfg]`'d blocks of code
- /// without having to rewrite each clause multiple times.
- macro_rules! cfg_if {
-     ($(
-         if #[cfg($($meta:meta),*)] { $($it:item)* }
-     ) else * else {
-         $($it2:item)*
-     }) => {
-         __cfg_if_items! {
-             () ;
-             $( ( ($($meta),*) ($($it)*) ), )*
-             ( () ($($it2)*) ),
-         }
-     }
- }
- 
- macro_rules! __cfg_if_items {
-     (($($not:meta,)*) ; ) => {};
-     (($($not:meta,)*) ; ( ($($m:meta),*) ($($it:item)*) ), $($rest:tt)*) => {
-         __cfg_if_apply! { cfg(all(not(any($($not),*)), $($m,)*)), $($it)* }
-         __cfg_if_items! { ($($not,)* $($m,)*) ; $($rest)* }
-     }
- }
- 
- macro_rules! __cfg_if_apply {
-     ($m:meta, $($it:item)*) => {
-         $(#[$m] $it)*
-     }
- }