Auto merge of #64254 - aleksijuvani:fix-macos-sysroot, r=alexcrichton
Fix sysroot on macOS when cross-compiling and SDKROOT is set
Fixes rust-lang/cargo#7283
Closes rust-lang/cargo#7284
r? @alexcrichton
diff --git a/Cargo.lock b/Cargo.lock
index 313fef1..f2eaf47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,9 +109,9 @@
[[package]]
name = "backtrace"
-version = "0.3.35"
+version = "0.3.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55"
+checksum = "5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2"
dependencies = [
"backtrace-sys",
"cfg-if",
@@ -223,9 +223,9 @@
[[package]]
name = "bytecount"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c"
+checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e"
dependencies = [
"packed_simd",
]
@@ -277,7 +277,7 @@
"crypto-hash",
"curl",
"curl-sys",
- "env_logger 0.6.0",
+ "env_logger",
"failure",
"filetime",
"flate2",
@@ -287,7 +287,7 @@
"git2-curl",
"glob",
"hex",
- "home 0.5.0",
+ "home",
"ignore",
"im-rc",
"jobserver",
@@ -309,7 +309,7 @@
"same-file",
"semver",
"serde",
- "serde_ignored 0.1.0",
+ "serde_ignored",
"serde_json",
"shell-escape",
"strip-ansi-escapes",
@@ -392,9 +392,9 @@
[[package]]
name = "clap"
-version = "2.32.0"
+version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
dependencies = [
"ansi_term",
"atty",
@@ -507,7 +507,7 @@
version = "0.0.0"
dependencies = [
"diff",
- "env_logger 0.5.13",
+ "env_logger",
"getopts",
"lazy_static 1.3.0",
"libc",
@@ -753,9 +753,9 @@
dependencies = [
"fnv",
"ident_case",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -765,8 +765,8 @@
checksum = "244e8987bd4e174385240cde20a3657f607fb0797563c28255c353b5819a07b1"
dependencies = [
"darling_core",
- "quote",
- "syn",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -781,9 +781,9 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ca414e896ae072546f4d789f452daaecf60ddee4c9df5dc6d5936d769e3d87c"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -792,10 +792,10 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871"
dependencies = [
- "proc-macro2",
- "quote",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
"rustc_version",
- "syn",
+ "syn 0.15.35",
]
[[package]]
@@ -909,21 +909,9 @@
[[package]]
name = "env_logger"
-version = "0.5.13"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"
+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
dependencies = [
"atty",
"humantime",
@@ -965,9 +953,9 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"synstructure",
]
@@ -1151,12 +1139,13 @@
[[package]]
name = "getrandom"
-version = "0.1.8"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49"
+checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
dependencies = [
"cfg-if",
"libc",
+ "wasi",
]
[[package]]
@@ -1273,16 +1262,6 @@
[[package]]
name = "home"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80dff82fb58cfbbc617fb9a9184b010be0529201553cda50ad04372bc2333aff"
-dependencies = [
- "scopeguard 0.3.3",
- "winapi 0.3.6",
-]
-
-[[package]]
-name = "home"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07c315e106bd6f83f026a20ddaeef2706782e490db1dcdd37caad38a0e895b3"
@@ -1300,9 +1279,9 @@
"log",
"mac",
"markup5ever",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -1541,10 +1520,29 @@
checksum = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
[[package]]
-name = "jsonrpc-core"
-version = "12.0.0"
+name = "jsonrpc-client-transports"
+version = "13.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288dca7f9713710a29e485076b9340156cb701edb46a881f5d0c31aa4f5b9143"
+checksum = "39577db48b004cffb4c5b8e5c9b993c177c52599ecbee88711e815acf65144db"
+dependencies = [
+ "failure",
+ "futures",
+ "jsonrpc-core",
+ "jsonrpc-pubsub",
+ "jsonrpc-server-utils",
+ "log",
+ "parity-tokio-ipc",
+ "serde",
+ "serde_json",
+ "tokio",
+ "url 1.7.2",
+]
+
+[[package]]
+name = "jsonrpc-core"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd42951eb35079520ee29b7efbac654d85821b397ef88c8151600ef7e2d00217"
dependencies = [
"futures",
"log",
@@ -1554,6 +1552,70 @@
]
[[package]]
+name = "jsonrpc-core-client"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f047c10738edee7c3c6acf5241a0ce33df32ef9230c1a7fb03e4a77ee72c992f"
+dependencies = [
+ "jsonrpc-client-transports",
+]
+
+[[package]]
+name = "jsonrpc-derive"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29f9149f785deaae92a4c834a9a1a83a4313b8cfedccf15362cd4cf039a64501"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
+]
+
+[[package]]
+name = "jsonrpc-ipc-server"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "256c5e4292c17b4c2ecdf542299dc8e9d6b3939c075c54825570ad9317fe5751"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
+ "log",
+ "parity-tokio-ipc",
+ "parking_lot 0.9.0",
+ "tokio-service",
+]
+
+[[package]]
+name = "jsonrpc-pubsub"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2c08b444cc0ed70263798834343d0ac875e664257df8079160f23ac1ea79446"
+dependencies = [
+ "jsonrpc-core",
+ "log",
+ "parking_lot 0.9.0",
+ "serde",
+]
+
+[[package]]
+name = "jsonrpc-server-utils"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44561bfdd31401bad790527f1e951dde144f2341ddc3e1b859d32945e1a34eff"
+dependencies = [
+ "bytes",
+ "globset",
+ "jsonrpc-core",
+ "lazy_static 1.3.0",
+ "log",
+ "num_cpus",
+ "tokio",
+ "tokio-codec",
+ "unicase 2.4.0",
+]
+
+[[package]]
name = "kernel32-sys"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1583,9 +1645,9 @@
[[package]]
name = "libc"
-version = "0.2.61"
+version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa"
+checksum = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
dependencies = [
"rustc-std-workspace-core",
]
@@ -1668,6 +1730,15 @@
]
[[package]]
+name = "lock_api"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
+dependencies = [
+ "scopeguard 1.0.0",
+]
+
+[[package]]
name = "log"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1698,18 +1769,15 @@
[[package]]
name = "lsp-types"
-version = "0.57.2"
+version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62b77309737b1e262b3bbf37ff8faa740562c633b14702afe9be85dbcb6f88a"
+checksum = "fe3edefcd66dde1f7f1df706f46520a3c93adc5ca4bc5747da6621195e894efd"
dependencies = [
"bitflags",
- "num-derive",
- "num-traits",
"serde",
- "serde_derive",
"serde_json",
- "url 1.7.2",
- "url_serde",
+ "serde_repr",
+ "url 2.1.0",
]
[[package]]
@@ -1774,7 +1842,7 @@
"chrono",
"clap",
"elasticlunr-rs",
- "env_logger 0.6.0",
+ "env_logger",
"error-chain",
"handlebars",
"itertools 0.8.0",
@@ -1799,7 +1867,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77d1f0ba4d1e6b86fa18e8853d026d7d76a97eb7eb5eb052ed80901e43b7fc10"
dependencies = [
- "env_logger 0.6.0",
+ "env_logger",
"failure",
"log",
"mdbook",
@@ -1812,7 +1880,7 @@
"serde",
"serde_derive",
"serde_json",
- "structopt",
+ "structopt 0.2.18",
"url 1.7.2",
]
@@ -1992,7 +2060,7 @@
"colored",
"compiletest_rs",
"directories",
- "env_logger 0.6.0",
+ "env_logger",
"getrandom",
"hex",
"log",
@@ -2046,18 +2114,6 @@
checksum = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
[[package]]
-name = "num-derive"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d"
-dependencies = [
- "num-traits",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
name = "num-integer"
version = "0.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2082,6 +2138,12 @@
]
[[package]]
+name = "once_cell"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6a04cb71e910d0034815600180f62a95bf6e67942d7ab52a166a68c7d7e9cd0"
+
+[[package]]
name = "open"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2191,13 +2253,42 @@
]
[[package]]
+name = "parity-tokio-ipc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8281bf4f1d6429573f89589bf68d89451c46750977a8264f8ea3edbabeba7947"
+dependencies = [
+ "bytes",
+ "futures",
+ "log",
+ "mio-named-pipes",
+ "miow 0.3.3",
+ "rand 0.7.0",
+ "tokio",
+ "tokio-named-pipes",
+ "tokio-uds",
+ "winapi 0.3.6",
+]
+
+[[package]]
name = "parking_lot"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
dependencies = [
- "lock_api",
- "parking_lot_core",
+ "lock_api 0.1.3",
+ "parking_lot_core 0.4.0",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
+dependencies = [
+ "lock_api 0.3.1",
+ "parking_lot_core 0.6.2",
+ "rustc_version",
]
[[package]]
@@ -2214,6 +2305,21 @@
]
[[package]]
+name = "parking_lot_core"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
+dependencies = [
+ "cfg-if",
+ "cloudabi",
+ "libc",
+ "redox_syscall",
+ "rustc_version",
+ "smallvec",
+ "winapi 0.3.6",
+]
+
+[[package]]
name = "percent-encoding"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2252,9 +2358,9 @@
dependencies = [
"pest",
"pest_meta",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -2363,11 +2469,31 @@
checksum = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
dependencies = [
"chrono",
- "env_logger 0.6.0",
+ "env_logger",
"log",
]
[[package]]
+name = "proc-macro-crate"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e"
+dependencies = [
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
+dependencies = [
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.5",
+]
+
+[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2377,6 +2503,15 @@
]
[[package]]
+name = "proc-macro2"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8"
+dependencies = [
+ "unicode-xid 0.2.0",
+]
+
+[[package]]
name = "proc_macro"
version = "0.0.0"
dependencies = [
@@ -2428,19 +2563,28 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
dependencies = [
- "proc-macro2",
+ "proc-macro2 0.4.30",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+dependencies = [
+ "proc-macro2 1.0.3",
]
[[package]]
name = "racer"
-version = "2.1.25"
+version = "2.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0727b9d7baaf9e42851145545d7b980b5c1752bd16a4c77c925c5e573d0069d9"
+checksum = "dde22b84ab75220015cbd91240222402bf885cbe3a5dc856475771abb82533ae"
dependencies = [
"bitflags",
"clap",
"derive_more",
- "env_logger 0.6.0",
+ "env_logger",
"humantime",
"lazy_static 1.3.0",
"log",
@@ -2727,18 +2871,18 @@
[[package]]
name = "rls"
-version = "1.38.0"
+version = "1.39.0"
dependencies = [
"cargo",
"cargo_metadata",
"clippy_lints",
"crossbeam-channel",
"difference",
- "env_logger 0.6.0",
+ "env_logger",
"failure",
"futures",
"heck",
- "home 0.3.3",
+ "home",
"itertools 0.8.0",
"jsonrpc-core",
"lazy_static 1.3.0",
@@ -2753,6 +2897,7 @@
"regex",
"rls-analysis",
"rls-data",
+ "rls-ipc",
"rls-rustc",
"rls-span",
"rls-vfs",
@@ -2762,14 +2907,14 @@
"rustfmt-nightly",
"serde",
"serde_derive",
- "serde_ignored 0.0.4",
+ "serde_ignored",
"serde_json",
"tempfile",
"tokio",
"tokio-process",
"tokio-timer",
"toml",
- "url 1.7.2",
+ "url 2.1.0",
"walkdir",
]
@@ -2801,8 +2946,32 @@
]
[[package]]
+name = "rls-ipc"
+version = "0.1.0"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "jsonrpc-ipc-server",
+ "rls-data",
+ "serde",
+]
+
+[[package]]
name = "rls-rustc"
version = "0.6.0"
+dependencies = [
+ "clippy_lints",
+ "env_logger",
+ "failure",
+ "futures",
+ "log",
+ "rand 0.6.1",
+ "rls-data",
+ "rls-ipc",
+ "serde",
+ "tokio",
+]
[[package]]
name = "rls-span"
@@ -2849,7 +3018,7 @@
"log",
"measureme",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.7.1",
"polonius-engine",
"rustc-rayon",
"rustc-rayon-core",
@@ -2868,9 +3037,9 @@
[[package]]
name = "rustc-ap-arena"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc2e1e68b64268c543bfa6e63e3c0d9ea58074c71396f42f76931f35a9287f9"
+checksum = "f59b76d334bd533f3fdc5c651c27678c5e80fac67c6f7da22ba21a58878c55f5"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec",
@@ -2878,15 +3047,15 @@
[[package]]
name = "rustc-ap-graphviz"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c108d647ce0dd46477b048eafff5a6273b5652e02d47424b0cd684147379c811"
+checksum = "3e632ef08ca17458acfd46d2ead3d541a1c249586cd5329f5fe333dacfab6142"
[[package]]
name = "rustc-ap-rustc_data_structures"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "656771744e0783cb8e4481e3b8b1f975687610aaf18833b898018111a0e0e582"
+checksum = "e89e2c7be68185418f3cd56af3df8b29007a59a1cebefa63612d055f9bcb1a36"
dependencies = [
"cfg-if",
"crossbeam-utils 0.6.5",
@@ -2895,7 +3064,7 @@
"jobserver",
"lazy_static 1.3.0",
"log",
- "parking_lot",
+ "parking_lot 0.7.1",
"rustc-ap-graphviz",
"rustc-ap-serialize",
"rustc-hash",
@@ -2907,9 +3076,9 @@
[[package]]
name = "rustc-ap-rustc_errors"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37064f6624bc799bfaa2968b61ee6880926dea2a8bba69f18aef6c8e69c9604"
+checksum = "1e47cb380abeb72b01e42b2342d592f7eeea7d536c2f1f0d0e550dc509e46333"
dependencies = [
"annotate-snippets",
"atty",
@@ -2917,34 +3086,38 @@
"rustc-ap-rustc_data_structures",
"rustc-ap-serialize",
"rustc-ap-syntax_pos",
+ "term_size",
"termcolor",
"unicode-width",
]
[[package]]
name = "rustc-ap-rustc_lexer"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5bc0a971823637ea23a857f0ef1467f44b1e05d71968821f83a0abe53e0fe3"
+checksum = "494cfaf67f49217d67d0774eeecbba61ac89acf478db97ef11f113ed8a959305"
+dependencies = [
+ "unicode-xid 0.2.0",
+]
[[package]]
name = "rustc-ap-rustc_macros"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90037e3336fe8835f468db44d0848ae10d9cc8533ae89b55828883f905b7e80"
+checksum = "e2e5d36becc59b4497f9cbd3ae0610081de0207a1d0e95c066369167b14f486f"
dependencies = [
"itertools 0.8.0",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"synstructure",
]
[[package]]
name = "rustc-ap-rustc_target"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadf9ca07315eab3a7a21f63872f9cc81e250fd6ede0419c24f8926ade73a45d"
+checksum = "a7bfc5f96dfc3b9f8d5b57884f7f37467ecff6776cd4b8b491a7daece6fdd7c2"
dependencies = [
"bitflags",
"log",
@@ -2955,9 +3128,9 @@
[[package]]
name = "rustc-ap-serialize"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61673783f2089e01033ffa82d1988f55175402071b31253a358292e1624d4602"
+checksum = "2bb9ee231cf79eded39c56647499f83d6136ff5c8c0baaa9e21b6febee00f4f6"
dependencies = [
"indexmap",
"smallvec",
@@ -2965,9 +3138,9 @@
[[package]]
name = "rustc-ap-syntax"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f3dd1346d5b0269c07a4a78855e309a298ab569c9c1302d4d4f57f8eee4e84"
+checksum = "b3827fc208814efbde82d613e31d11b4250ce9e8cf8afe4a4d47bbbd099632c9"
dependencies = [
"bitflags",
"lazy_static 1.3.0",
@@ -2985,9 +3158,9 @@
[[package]]
name = "rustc-ap-syntax_pos"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e67b526dbda3a0c7dab91c8947d43685e7697f52686a4949da3c179cd7c979"
+checksum = "930ed81c34f325e512cc315c04d676fa84a373879d5c43bb54054a0522b05213"
dependencies = [
"cfg-if",
"rustc-ap-arena",
@@ -3058,21 +3231,21 @@
[[package]]
name = "rustc-std-workspace-alloc"
-version = "1.0.0"
+version = "1.99.0"
dependencies = [
"alloc",
]
[[package]]
name = "rustc-std-workspace-core"
-version = "1.0.0"
+version = "1.99.0"
dependencies = [
"core",
]
[[package]]
name = "rustc-std-workspace-std"
-version = "1.0.0"
+version = "1.99.0"
dependencies = [
"std",
]
@@ -3083,13 +3256,13 @@
dependencies = [
"byteorder",
"crossbeam-utils 0.6.5",
- "parking_lot",
+ "parking_lot 0.7.1",
"rand 0.6.1",
"scopeguard 0.3.3",
"serde",
"serde_json",
"smallvec",
- "syn",
+ "syn 0.15.35",
"winapi 0.3.6",
]
@@ -3129,11 +3302,7 @@
name = "rustc_codegen_llvm"
version = "0.0.0"
dependencies = [
- "cc",
- "memmap",
- "num_cpus",
"rustc_llvm",
- "tempfile",
]
[[package]]
@@ -3147,7 +3316,7 @@
"log",
"memmap",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.7.1",
"rustc",
"rustc_apfloat",
"rustc_codegen_utils",
@@ -3190,7 +3359,7 @@
"jobserver",
"lazy_static 1.3.0",
"log",
- "parking_lot",
+ "parking_lot 0.7.1",
"rustc-hash",
"rustc-rayon",
"rustc-rayon-core",
@@ -3203,7 +3372,7 @@
name = "rustc_driver"
version = "0.0.0"
dependencies = [
- "env_logger 0.5.13",
+ "env_logger",
"graphviz",
"log",
"rustc",
@@ -3248,7 +3417,7 @@
dependencies = [
"graphviz",
"log",
- "rand 0.6.1",
+ "rand 0.7.0",
"rustc",
"rustc_data_structures",
"rustc_fs_util",
@@ -3262,6 +3431,7 @@
version = "0.0.0"
dependencies = [
"log",
+ "once_cell",
"rustc",
"rustc-rayon",
"rustc_ast_borrowck",
@@ -3330,9 +3500,9 @@
version = "0.1.0"
dependencies = [
"itertools 0.8.0",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"synstructure",
]
@@ -3571,26 +3741,25 @@
[[package]]
name = "rustfmt-config_proc_macro"
-version = "0.1.2"
+version = "0.2.0"
dependencies = [
- "proc-macro2",
- "quote",
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
"serde",
- "syn",
+ "syn 1.0.5",
]
[[package]]
name = "rustfmt-nightly"
-version = "1.4.6"
+version = "1.4.8"
dependencies = [
"annotate-snippets",
- "atty",
"bytecount",
"cargo_metadata",
"derive-new",
"diff",
"dirs",
- "env_logger 0.6.0",
+ "env_logger",
"failure",
"getopts",
"ignore",
@@ -3605,7 +3774,7 @@
"rustfmt-config_proc_macro",
"serde",
"serde_json",
- "structopt",
+ "structopt 0.3.1",
"term 0.6.0",
"toml",
"unicode-segmentation",
@@ -3714,18 +3883,9 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "477b13b646f5b5b56fc95bedfc3b550d12141ce84f466f6c44b9a17589923885"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_ignored"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142"
-dependencies = [
- "serde",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -3749,6 +3909,17 @@
]
[[package]]
+name = "serde_repr"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573"
+dependencies = [
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.5",
+]
+
+[[package]]
name = "serde_urlencoded"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3864,7 +4035,7 @@
"panic_abort",
"panic_unwind",
"profiler_builtins",
- "rand 0.6.1",
+ "rand 0.7.0",
"rustc_asan",
"rustc_lsan",
"rustc_msan",
@@ -3905,8 +4076,8 @@
dependencies = [
"phf_generator",
"phf_shared",
- "proc-macro2",
- "quote",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
"string_cache_shared",
]
@@ -3927,9 +4098,9 @@
[[package]]
name = "strsim"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
@@ -3938,7 +4109,17 @@
checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
dependencies = [
"clap",
- "structopt-derive",
+ "structopt-derive 0.2.18",
+]
+
+[[package]]
+name = "structopt"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ac9d6e93dd792b217bf89cda5c14566e3043960c6f9da890c2ba5d09d07804c"
+dependencies = [
+ "clap",
+ "structopt-derive 0.3.1",
]
[[package]]
@@ -3948,9 +4129,22 @@
checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
dependencies = [
"heck",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ae9e5165d463a0dea76967d021f8d0f9316057bf5163aa2a4843790e842ff37"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.5",
]
[[package]]
@@ -3966,9 +4160,9 @@
checksum = "8baacebd7b7c9b864d83a6ba7a246232983e277b86fa5cdec77f565715a4b136"
dependencies = [
"heck",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -3977,20 +4171,31 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "641e117d55514d6d918490e47102f7e08d096fdde360247e4a10f7a91a8478d3"
dependencies = [
- "proc-macro2",
- "quote",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
"unicode-xid 0.1.0",
]
[[package]]
+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+dependencies = [
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "unicode-xid 0.2.0",
+]
+
+[[package]]
name = "synstructure"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"unicode-xid 0.1.0",
]
@@ -4170,9 +4375,9 @@
[[package]]
name = "textwrap"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
@@ -4296,6 +4501,19 @@
]
[[package]]
+name = "tokio-named-pipes"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
+dependencies = [
+ "bytes",
+ "futures",
+ "mio",
+ "mio-named-pipes",
+ "tokio",
+]
+
+[[package]]
name = "tokio-process"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4323,13 +4541,22 @@
"log",
"mio",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.7.1",
"slab",
"tokio-executor",
"tokio-io",
]
[[package]]
+name = "tokio-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
+dependencies = [
+ "futures",
+]
+
+[[package]]
name = "tokio-signal"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4452,8 +4679,8 @@
checksum = "3c99ca245ec273c7e75c8ee58f47b882d0146f3c2c8495158082c6671e8b5335"
dependencies = [
"darling",
- "quote",
- "syn",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -4591,16 +4818,6 @@
]
[[package]]
-name = "url_serde"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea"
-dependencies = [
- "serde",
- "url 1.7.2",
-]
-
-[[package]]
name = "utf-8"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/README.md b/README.md
index 724bc36..4c2e4ee 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@
* `cmake` 3.4.3 or later
* `curl`
* `git`
+ * `ssl` which comes in `libssl-dev` or `openssl-devel`
2. Clone the [source] with `git`:
@@ -56,6 +57,8 @@
an installation (using `./x.py install`) that you set the `prefix` value
in the `[install]` section to a directory that you have write permissions.
+ Create install directory if you are not installing in default directory
+
4. Build and install:
```sh
diff --git a/config.toml.example b/config.toml.example
index 30e2ee1..848147c 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -184,7 +184,7 @@
# default.
#extended = false
-# Installs chosen set of extended tools if enables. By default builds all.
+# Installs chosen set of extended tools if enabled. By default builds all.
# If chosen tool failed to build the installation fails.
#tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src"]
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 8cb48df..84415ba 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -119,17 +119,18 @@
cmd.arg(format!("-Cdebuginfo={}", debuginfo_level));
}
- if env::var_os("RUSTC_DENY_WARNINGS").is_some() &&
- env::var_os("RUSTC_EXTERNAL_TOOL").is_none() {
+ if env::var_os("RUSTC_EXTERNAL_TOOL").is_none() {
// When extending this list, add the new lints to the RUSTFLAGS of the
// build_bootstrap function of src/bootstrap/bootstrap.py as well as
// some code doesn't go through this `rustc` wrapper.
- cmd.arg("-Dwarnings");
- cmd.arg("-Drust_2018_idioms");
- cmd.arg("-Dunused_lifetimes");
+ cmd.arg("-Wrust_2018_idioms");
+ cmd.arg("-Wunused_lifetimes");
if use_internal_lints(crate_name) {
cmd.arg("-Zunstable-options");
- cmd.arg("-Drustc::internal");
+ cmd.arg("-Wrustc::internal");
+ }
+ if env::var_os("RUSTC_DENY_WARNINGS").is_some() {
+ cmd.arg("-Dwarnings");
}
}
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 179cd48..65129ee 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -523,6 +523,10 @@
'value2'
>>> rb.get_toml('key', 'c') is None
True
+
+ >>> rb.config_toml = 'key1 = true'
+ >>> rb.get_toml("key1")
+ 'true'
"""
cur_section = None
@@ -571,6 +575,12 @@
>>> RustBuild.get_string(' "devel" ')
'devel'
+ >>> RustBuild.get_string(" 'devel' ")
+ 'devel'
+ >>> RustBuild.get_string('devel') is None
+ True
+ >>> RustBuild.get_string(' "devel ')
+ ''
"""
start = line.find('"')
if start != -1:
@@ -631,8 +641,9 @@
target_linker = self.get_toml("linker", build_section)
if target_linker is not None:
env["RUSTFLAGS"] += "-C linker=" + target_linker + " "
+ env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes "
if self.get_toml("deny-warnings", "rust") != "false":
- env["RUSTFLAGS"] += "-Dwarnings -Drust_2018_idioms -Dunused_lifetimes "
+ env["RUSTFLAGS"] += "-Dwarnings "
env["PATH"] = os.path.join(self.bin_root(), "bin") + \
os.pathsep + env["PATH"]
@@ -697,6 +708,14 @@
if (not os.path.exists(os.path.join(self.rust_root, ".git"))) or \
self.get_toml('submodules') == "false":
return
+
+ # check the existence of 'git' command
+ try:
+ subprocess.check_output(['git', '--version'])
+ except (subprocess.CalledProcessError, OSError):
+ print("error: `git` is not found, please make sure it's installed and in the path.")
+ sys.exit(1)
+
slow_submodules = self.get_toml('fast-submodules') == "false"
start_time = time()
if slow_submodules:
@@ -821,13 +840,13 @@
except (OSError, IOError):
pass
- match = re.search(r'\nverbose = (\d+)', build.config_toml)
- if match is not None:
- build.verbose = max(build.verbose, int(match.group(1)))
+ config_verbose = build.get_toml('verbose', 'build')
+ if config_verbose is not None:
+ build.verbose = max(build.verbose, int(config_verbose))
- build.use_vendored_sources = '\nvendor = true' in build.config_toml
+ build.use_vendored_sources = build.get_toml('vendor', 'build') == 'true'
- build.use_locked_deps = '\nlocked-deps = true' in build.config_toml
+ build.use_locked_deps = build.get_toml('locked-deps', 'build') == 'true'
build.check_vendored_status()
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 4f5de1e..b7873fd 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1167,6 +1167,8 @@
cargo.arg("--frozen");
}
+ cargo.env("RUSTC_INSTALL_BINDIR", &self.config.bindir);
+
self.ci_env.force_coloring_in_ci(&mut cargo);
cargo
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 43d9264..52b5cd8 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -137,7 +137,7 @@
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
pub docdir: Option<PathBuf>,
- pub bindir: Option<PathBuf>,
+ pub bindir: PathBuf,
pub libdir: Option<PathBuf>,
pub mandir: Option<PathBuf>,
pub codegen_tests: bool,
@@ -400,6 +400,7 @@
config.incremental = flags.incremental;
config.dry_run = flags.dry_run;
config.keep_stage = flags.keep_stage;
+ config.bindir = "bin".into(); // default
if let Some(value) = flags.deny_warnings {
config.deny_warnings = value;
}
@@ -482,7 +483,7 @@
config.sysconfdir = install.sysconfdir.clone().map(PathBuf::from);
config.datadir = install.datadir.clone().map(PathBuf::from);
config.docdir = install.docdir.clone().map(PathBuf::from);
- config.bindir = install.bindir.clone().map(PathBuf::from);
+ set(&mut config.bindir, install.bindir.clone().map(PathBuf::from));
config.libdir = install.libdir.clone().map(PathBuf::from);
config.mandir = install.mandir.clone().map(PathBuf::from);
}
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 0f4ac63..500d576 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -808,6 +808,7 @@
"llvm-project/lld", "llvm-project\\lld",
"llvm-project/lldb", "llvm-project\\lldb",
"llvm-project/llvm", "llvm-project\\llvm",
+ "llvm-project/compiler-rt", "llvm-project\\compiler-rt",
];
if spath.contains("llvm-project") && !spath.ends_with("llvm-project")
&& !LLVM_PROJECTS.iter().any(|path| spath.contains(path))
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 828865f..d9580b5 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -36,7 +36,7 @@
// This overrides the deny-warnings configuation option,
// which passes -Dwarnings to the compiler invocations.
//
- // true => deny, false => allow
+ // true => deny, false => warn
pub deny_warnings: Option<bool>,
}
@@ -556,10 +556,10 @@
fn parse_deny_warnings(matches: &getopts::Matches) -> Option<bool> {
match matches.opt_str("warnings").as_ref().map(|v| v.as_str()) {
Some("deny") => Some(true),
- Some("allow") => Some(false),
+ Some("warn") => Some(false),
Some(value) => {
eprintln!(
- r#"invalid value for --warnings: {:?}, expected "allow" or "deny""#,
+ r#"invalid value for --warnings: {:?}, expected "warn" or "deny""#,
value,
);
process::exit(1);
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index 5575867..384219c 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -67,7 +67,6 @@
let sysconfdir_default = PathBuf::from("/etc");
let datadir_default = PathBuf::from("share");
let docdir_default = datadir_default.join("doc/rust");
- let bindir_default = PathBuf::from("bin");
let libdir_default = PathBuf::from("lib");
let mandir_default = datadir_default.join("man");
let prefix = builder.config.prefix.as_ref().map_or(prefix_default, |p| {
@@ -76,7 +75,7 @@
let sysconfdir = builder.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
let datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default);
let docdir = builder.config.docdir.as_ref().unwrap_or(&docdir_default);
- let bindir = builder.config.bindir.as_ref().unwrap_or(&bindir_default);
+ let bindir = &builder.config.bindir;
let libdir = builder.config.libdir.as_ref().unwrap_or(&libdir_default);
let mandir = builder.config.mandir.as_ref().unwrap_or(&mandir_default);
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 97b28ed..00d87f3 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1327,7 +1327,10 @@
cmd.env("RUSTC_PROFILER_SUPPORT", "1");
}
- cmd.env("RUST_TEST_TMPDIR", builder.out.join("tmp"));
+ let tmp = builder.out.join("tmp");
+ std::fs::create_dir_all(&tmp).unwrap();
+ cmd.env("RUST_TEST_TMPDIR", tmp);
+
cmd.arg("--adb-path").arg("adb");
cmd.arg("--adb-test-dir").arg(ADB_TEST_DIR);
diff --git a/src/doc/reference b/src/doc/reference
index 090c015..1944efe 160000
--- a/src/doc/reference
+++ b/src/doc/reference
@@ -1 +1 @@
-Subproject commit 090c015f7939665866432c334957bd536c811870
+Subproject commit 1944efed35989ba57fa397c0724c4921310311fc
diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide
index 6e25a3d..941968d 160000
--- a/src/doc/rustc-guide
+++ b/src/doc/rustc-guide
@@ -1 +1 @@
-Subproject commit 6e25a3d0d3573eb42b2e2339f1219e969d1b3dee
+Subproject commit 941968db2fd9c85788a4f971c8e425d46b4cb734
diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md
index 993fc84..49d05b5 100644
--- a/src/doc/rustdoc/src/unstable-features.md
+++ b/src/doc/rustdoc/src/unstable-features.md
@@ -471,3 +471,53 @@
Public items that are not documented can be seen with the built-in `missing_docs` lint. Private
items that are not documented can be seen with Clippy's `missing_docs_in_private_items` lint.
+
+### `--enable-per-target-ignores`: allow `ignore-foo` style filters for doctests
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --enable-per-target-ignores
+```
+
+This flag allows you to tag doctests with compiltest style `ignore-foo` filters that prevent
+rustdoc from running that test if the target triple string contains foo. For example:
+
+```rust
+///```ignore-foo,ignore-bar
+///assert!(2 == 2);
+///```
+struct Foo;
+```
+
+This will not be run when the build target is `super-awesome-foo` or `less-bar-awesome`.
+If the flag is not enabled, then rustdoc will consume the filter, but do nothing with it, and
+the above example will be run for all targets.
+If you want to preserve backwards compatibility for older versions of rustdoc, you can use
+
+```rust
+///```ignore,ignore-foo
+///assert!(2 == 2);
+///```
+struct Foo;
+```
+
+In older versions, this will be ignored on all targets, but on newer versions `ignore-gnu` will
+override `ignore`.
+
+### `--runtool`, `--runtool-arg`: program to run tests with; args to pass to it
+
+Using thses options looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --runtool runner --runtool-arg --do-thing --runtool-arg --do-other-thing
+```
+
+These options can be used to run the doctest under a program, and also pass arguments to
+that program. For example, if you want to run your doctests under valgrind you might run
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --runtool valgrind
+```
+
+Another use case would be to run a test inside an emulator, or through a Virtual Machine.
diff --git a/src/etc/lldb_batchmode.py b/src/etc/lldb_batchmode.py
index 537b419..7c2e914 100644
--- a/src/etc/lldb_batchmode.py
+++ b/src/etc/lldb_batchmode.py
@@ -45,7 +45,10 @@
def breakpoint_callback(frame, bp_loc, dict):
"""This callback is registered with every breakpoint and makes sure that the
- frame containing the breakpoint location is selected"""
+ frame containing the breakpoint location is selected """
+
+ # HACK(eddyb) print a newline to avoid continuing an unfinished line.
+ print("")
print("Hit breakpoint " + str(bp_loc))
# Select the frame and the thread containing it
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 4a48945..370e5cf 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -171,3 +171,9 @@
mod std {
pub use core::ops; // RangeFull
}
+
+#[doc(hidden)]
+#[unstable(feature = "liballoc_internals", issue = "0", reason = "implementation detail")]
+pub mod __export {
+ pub use core::format_args;
+}
diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs
index 0b5e186d..2f2cdc3 100644
--- a/src/liballoc/macros.rs
+++ b/src/liballoc/macros.rs
@@ -98,5 +98,5 @@
#[macro_export]
#[stable(feature = "rust1", since = "1.0.0")]
macro_rules! format {
- ($($arg:tt)*) => ($crate::fmt::format(::core::format_args!($($arg)*)))
+ ($($arg:tt)*) => ($crate::fmt::format($crate::__export::format_args!($($arg)*)))
}
diff --git a/src/libcore/bool.rs b/src/libcore/bool.rs
new file mode 100644
index 0000000..32ec269
--- /dev/null
+++ b/src/libcore/bool.rs
@@ -0,0 +1,45 @@
+//! impl bool {}
+
+#[cfg(not(boostrap_stdarch_ignore_this))]
+#[lang = "bool"]
+impl bool {
+ /// Returns `Some(t)` if the `bool` is `true`, or `None` otherwise.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(bool_to_option)]
+ ///
+ /// assert_eq!(false.then(0), None);
+ /// assert_eq!(true.then(0), Some(0));
+ /// ```
+ #[unstable(feature = "bool_to_option", issue = "64260")]
+ #[inline]
+ pub fn then<T>(self, t: T) -> Option<T> {
+ if self {
+ Some(t)
+ } else {
+ None
+ }
+ }
+
+ /// Returns `Some(f())` if the `bool` is `true`, or `None` otherwise.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(bool_to_option)]
+ ///
+ /// assert_eq!(false.then_with(|| 0), None);
+ /// assert_eq!(true.then_with(|| 0), Some(0));
+ /// ```
+ #[unstable(feature = "bool_to_option", issue = "64260")]
+ #[inline]
+ pub fn then_with<T, F: FnOnce() -> T>(self, f: F) -> Option<T> {
+ if self {
+ Some(f())
+ } else {
+ None
+ }
+ }
+}
diff --git a/src/libcore/iter/adapters/mod.rs b/src/libcore/iter/adapters/mod.rs
index 8e1ac60..3b8edc2 100644
--- a/src/libcore/iter/adapters/mod.rs
+++ b/src/libcore/iter/adapters/mod.rs
@@ -5,7 +5,7 @@
use crate::intrinsics;
use super::{Iterator, DoubleEndedIterator, ExactSizeIterator, FusedIterator, TrustedLen};
-use super::LoopState;
+use super::{LoopState, from_fn};
mod chain;
mod flatten;
@@ -534,6 +534,26 @@
self.iter.nth(nth - 1);
}
}
+
+ fn try_fold<Acc, F, R>(&mut self, mut acc: Acc, mut f: F) -> R
+ where
+ F: FnMut(Acc, Self::Item) -> R,
+ R: Try<Ok = Acc>,
+ {
+ #[inline]
+ fn nth<I: Iterator>(iter: &mut I, step: usize) -> impl FnMut() -> Option<I::Item> + '_ {
+ move || iter.nth(step)
+ }
+
+ if self.first_take {
+ self.first_take = false;
+ match self.iter.next() {
+ None => return Try::from_ok(acc),
+ Some(x) => acc = f(acc, x)?,
+ }
+ }
+ from_fn(nth(&mut self.iter, self.step)).try_fold(acc, f)
+ }
}
impl<I> StepBy<I> where I: ExactSizeIterator {
@@ -567,6 +587,28 @@
.saturating_add(self.next_back_index());
self.iter.nth_back(n)
}
+
+ fn try_rfold<Acc, F, R>(&mut self, init: Acc, mut f: F) -> R
+ where
+ F: FnMut(Acc, Self::Item) -> R,
+ R: Try<Ok = Acc>,
+ {
+ #[inline]
+ fn nth_back<I: DoubleEndedIterator>(
+ iter: &mut I,
+ step: usize,
+ ) -> impl FnMut() -> Option<I::Item> + '_ {
+ move || iter.nth_back(step)
+ }
+
+ match self.next_back() {
+ None => Try::from_ok(init),
+ Some(x) => {
+ let acc = f(init, x)?;
+ from_fn(nth_back(&mut self.iter, self.step)).try_fold(acc, f)
+ }
+ }
+ }
}
// StepBy can only make the iterator shorter, so the len will still fit.
diff --git a/src/libcore/iter/traits/iterator.rs b/src/libcore/iter/traits/iterator.rs
index 8fd5fe0..c09df3f 100644
--- a/src/libcore/iter/traits/iterator.rs
+++ b/src/libcore/iter/traits/iterator.rs
@@ -2557,11 +2557,41 @@
/// assert_eq!([1, 2].iter().cmp([1].iter()), Ordering::Greater);
/// ```
#[stable(feature = "iter_order", since = "1.5.0")]
- fn cmp<I>(mut self, other: I) -> Ordering where
+ fn cmp<I>(self, other: I) -> Ordering
+ where
I: IntoIterator<Item = Self::Item>,
Self::Item: Ord,
Self: Sized,
{
+ self.cmp_by(other, |x, y| x.cmp(&y))
+ }
+
+ /// Lexicographically compares the elements of this `Iterator` with those
+ /// of another with respect to the specified comparison function.
+ ///
+ /// # Examples
+ ///
+ /// Basic usage:
+ ///
+ /// ```
+ /// #![feature(iter_order_by)]
+ ///
+ /// use std::cmp::Ordering;
+ ///
+ /// let xs = [1, 2, 3, 4];
+ /// let ys = [1, 4, 9, 16];
+ ///
+ /// assert_eq!(xs.iter().cmp_by(&ys, |&x, &y| x.cmp(&y)), Ordering::Less);
+ /// assert_eq!(xs.iter().cmp_by(&ys, |&x, &y| (x * x).cmp(&y)), Ordering::Equal);
+ /// assert_eq!(xs.iter().cmp_by(&ys, |&x, &y| (2 * x).cmp(&y)), Ordering::Greater);
+ /// ```
+ #[unstable(feature = "iter_order_by", issue = "0")]
+ fn cmp_by<I, F>(mut self, other: I, mut cmp: F) -> Ordering
+ where
+ Self: Sized,
+ I: IntoIterator,
+ F: FnMut(Self::Item, I::Item) -> Ordering,
+ {
let mut other = other.into_iter();
loop {
@@ -2579,7 +2609,7 @@
Some(val) => val,
};
- match x.cmp(&y) {
+ match cmp(x, y) {
Ordering::Equal => (),
non_eq => return non_eq,
}
@@ -2601,11 +2631,50 @@
/// assert_eq!([std::f64::NAN].iter().partial_cmp([1.].iter()), None);
/// ```
#[stable(feature = "iter_order", since = "1.5.0")]
- fn partial_cmp<I>(mut self, other: I) -> Option<Ordering> where
+ fn partial_cmp<I>(self, other: I) -> Option<Ordering>
+ where
I: IntoIterator,
Self::Item: PartialOrd<I::Item>,
Self: Sized,
{
+ self.partial_cmp_by(other, |x, y| x.partial_cmp(&y))
+ }
+
+ /// Lexicographically compares the elements of this `Iterator` with those
+ /// of another with respect to the specified comparison function.
+ ///
+ /// # Examples
+ ///
+ /// Basic usage:
+ ///
+ /// ```
+ /// #![feature(iter_order_by)]
+ ///
+ /// use std::cmp::Ordering;
+ ///
+ /// let xs = [1.0, 2.0, 3.0, 4.0];
+ /// let ys = [1.0, 4.0, 9.0, 16.0];
+ ///
+ /// assert_eq!(
+ /// xs.iter().partial_cmp_by(&ys, |&x, &y| x.partial_cmp(&y)),
+ /// Some(Ordering::Less)
+ /// );
+ /// assert_eq!(
+ /// xs.iter().partial_cmp_by(&ys, |&x, &y| (x * x).partial_cmp(&y)),
+ /// Some(Ordering::Equal)
+ /// );
+ /// assert_eq!(
+ /// xs.iter().partial_cmp_by(&ys, |&x, &y| (2.0 * x).partial_cmp(&y)),
+ /// Some(Ordering::Greater)
+ /// );
+ /// ```
+ #[unstable(feature = "iter_order_by", issue = "0")]
+ fn partial_cmp_by<I, F>(mut self, other: I, mut partial_cmp: F) -> Option<Ordering>
+ where
+ Self: Sized,
+ I: IntoIterator,
+ F: FnMut(Self::Item, I::Item) -> Option<Ordering>,
+ {
let mut other = other.into_iter();
loop {
@@ -2623,7 +2692,7 @@
Some(val) => val,
};
- match x.partial_cmp(&y) {
+ match partial_cmp(x, y) {
Some(Ordering::Equal) => (),
non_eq => return non_eq,
}
@@ -2640,11 +2709,37 @@
/// assert_eq!([1].iter().eq([1, 2].iter()), false);
/// ```
#[stable(feature = "iter_order", since = "1.5.0")]
- fn eq<I>(mut self, other: I) -> bool where
+ fn eq<I>(self, other: I) -> bool
+ where
I: IntoIterator,
Self::Item: PartialEq<I::Item>,
Self: Sized,
{
+ self.eq_by(other, |x, y| x == y)
+ }
+
+ /// Determines if the elements of this `Iterator` are equal to those of
+ /// another with respect to the specified equality function.
+ ///
+ /// # Examples
+ ///
+ /// Basic usage:
+ ///
+ /// ```
+ /// #![feature(iter_order_by)]
+ ///
+ /// let xs = [1, 2, 3, 4];
+ /// let ys = [1, 4, 9, 16];
+ ///
+ /// assert!(xs.iter().eq_by(&ys, |&x, &y| x * x == y));
+ /// ```
+ #[unstable(feature = "iter_order_by", issue = "0")]
+ fn eq_by<I, F>(mut self, other: I, mut eq: F) -> bool
+ where
+ Self: Sized,
+ I: IntoIterator,
+ F: FnMut(Self::Item, I::Item) -> bool,
+ {
let mut other = other.into_iter();
loop {
@@ -2658,7 +2753,9 @@
Some(val) => val,
};
- if x != y { return false }
+ if !eq(x, y) {
+ return false;
+ }
}
}
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index c168d5c..a2cc585 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -87,7 +87,7 @@
#![feature(link_llvm_intrinsics)]
#![feature(never_type)]
#![feature(nll)]
-#![feature(bind_by_move_pattern_guards)]
+#![cfg_attr(boostrap_stdarch_ignore_this, feature(bind_by_move_pattern_guards))]
#![feature(exhaustive_patterns)]
#![feature(no_core)]
#![feature(on_unimplemented)]
@@ -227,6 +227,7 @@
pub mod alloc;
// note: does not need to be public
+mod bool;
mod tuple;
mod unit;
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs
index ffaca02..384bc87 100644
--- a/src/libcore/macros.rs
+++ b/src/libcore/macros.rs
@@ -1236,8 +1236,10 @@
pub macro test($item:item) { /* compiler built-in */ }
/// Attribute macro applied to a function to turn it into a benchmark test.
- #[unstable(feature = "test", issue = "50297",
- reason = "`bench` is a part of custom test frameworks which are unstable")]
+ #[cfg_attr(not(boostrap_stdarch_ignore_this), unstable(soft, feature = "test", issue = "50297",
+ reason = "`bench` is a part of custom test frameworks which are unstable"))]
+ #[cfg_attr(boostrap_stdarch_ignore_this, unstable(feature = "test", issue = "50297",
+ reason = "`bench` is a part of custom test frameworks which are unstable"))]
#[allow_internal_unstable(test, rustc_attrs)]
#[rustc_builtin_macro]
pub macro bench($item:item) { /* compiler built-in */ }
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index b46e06f..df1c00c 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -1401,12 +1401,8 @@
```"),
#[stable(feature = "no_panic_abs", since = "1.13.0")]
#[inline]
- pub fn wrapping_abs(self) -> Self {
- if self.is_negative() {
- self.wrapping_neg()
- } else {
- self
- }
+ pub const fn wrapping_abs(self) -> Self {
+ (self ^ (self >> ($BITS - 1))).wrapping_sub(self >> ($BITS - 1))
}
}
@@ -1764,12 +1760,8 @@
```"),
#[stable(feature = "no_panic_abs", since = "1.13.0")]
#[inline]
- pub fn overflowing_abs(self) -> (Self, bool) {
- if self.is_negative() {
- self.overflowing_neg()
- } else {
- (self, false)
- }
+ pub const fn overflowing_abs(self) -> (Self, bool) {
+ (self ^ (self >> ($BITS - 1))).overflowing_sub(self >> ($BITS - 1))
}
}
@@ -1973,15 +1965,11 @@
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
#[rustc_inherit_overflow_checks]
- pub fn abs(self) -> Self {
- if self.is_negative() {
- // Note that the #[inline] above means that the overflow
- // semantics of this negation depend on the crate we're being
- // inlined into.
- -self
- } else {
- self
- }
+ pub const fn abs(self) -> Self {
+ // Note that the #[inline] above means that the overflow
+ // semantics of the subtraction depend on the crate we're being
+ // inlined into.
+ (self ^ (self >> ($BITS - 1))) - (self >> ($BITS - 1))
}
}
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 8dfb19f..a731115 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -979,9 +979,8 @@
/// let some_ptr = AtomicPtr::new(ptr);
///
/// let other_ptr = &mut 10;
- /// let another_ptr = &mut 10;
///
- /// let value = some_ptr.compare_and_swap(other_ptr, another_ptr, Ordering::Relaxed);
+ /// let value = some_ptr.compare_and_swap(ptr, other_ptr, Ordering::Relaxed);
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1021,9 +1020,8 @@
/// let some_ptr = AtomicPtr::new(ptr);
///
/// let other_ptr = &mut 10;
- /// let another_ptr = &mut 10;
///
- /// let value = some_ptr.compare_exchange(other_ptr, another_ptr,
+ /// let value = some_ptr.compare_exchange(ptr, other_ptr,
/// Ordering::SeqCst, Ordering::Relaxed);
/// ```
#[inline]
diff --git a/src/libcore/tests/bool.rs b/src/libcore/tests/bool.rs
new file mode 100644
index 0000000..0f1e6e8
--- /dev/null
+++ b/src/libcore/tests/bool.rs
@@ -0,0 +1,7 @@
+#[test]
+fn test_bool_to_option() {
+ assert_eq!(false.then(0), None);
+ assert_eq!(true.then(0), Some(0));
+ assert_eq!(false.then_with(|| 0), None);
+ assert_eq!(true.then_with(|| 0), Some(0));
+}
diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs
index 8e0658d..c9096b7 100644
--- a/src/libcore/tests/iter.rs
+++ b/src/libcore/tests/iter.rs
@@ -58,6 +58,62 @@
}
#[test]
+fn test_cmp_by() {
+ use core::cmp::Ordering;
+
+ let f = |x: i32, y: i32| (x * x).cmp(&y);
+ let xs = || [1, 2, 3, 4].iter().copied();
+ let ys = || [1, 4, 16].iter().copied();
+
+ assert_eq!(xs().cmp_by(ys(), f), Ordering::Less);
+ assert_eq!(ys().cmp_by(xs(), f), Ordering::Greater);
+ assert_eq!(xs().cmp_by(xs().map(|x| x * x), f), Ordering::Equal);
+ assert_eq!(xs().rev().cmp_by(ys().rev(), f), Ordering::Greater);
+ assert_eq!(xs().cmp_by(ys().rev(), f), Ordering::Less);
+ assert_eq!(xs().cmp_by(ys().take(2), f), Ordering::Greater);
+}
+
+#[test]
+fn test_partial_cmp_by() {
+ use core::cmp::Ordering;
+ use core::f64;
+
+ let f = |x: i32, y: i32| (x * x).partial_cmp(&y);
+ let xs = || [1, 2, 3, 4].iter().copied();
+ let ys = || [1, 4, 16].iter().copied();
+
+ assert_eq!(xs().partial_cmp_by(ys(), f), Some(Ordering::Less));
+ assert_eq!(ys().partial_cmp_by(xs(), f), Some(Ordering::Greater));
+ assert_eq!(xs().partial_cmp_by(xs().map(|x| x * x), f), Some(Ordering::Equal));
+ assert_eq!(xs().rev().partial_cmp_by(ys().rev(), f), Some(Ordering::Greater));
+ assert_eq!(xs().partial_cmp_by(xs().rev(), f), Some(Ordering::Less));
+ assert_eq!(xs().partial_cmp_by(ys().take(2), f), Some(Ordering::Greater));
+
+ let f = |x: f64, y: f64| (x * x).partial_cmp(&y);
+ let xs = || [1.0, 2.0, 3.0, 4.0].iter().copied();
+ let ys = || [1.0, 4.0, f64::NAN, 16.0].iter().copied();
+
+ assert_eq!(xs().partial_cmp_by(ys(), f), None);
+ assert_eq!(ys().partial_cmp_by(xs(), f), Some(Ordering::Greater));
+}
+
+#[test]
+fn test_eq_by() {
+ let f = |x: i32, y: i32| x * x == y;
+ let xs = || [1, 2, 3, 4].iter().copied();
+ let ys = || [1, 4, 9, 16].iter().copied();
+
+ assert!(xs().eq_by(ys(), f));
+ assert!(!ys().eq_by(xs(), f));
+ assert!(!xs().eq_by(xs(), f));
+ assert!(!ys().eq_by(ys(), f));
+
+ assert!(!xs().take(3).eq_by(ys(), f));
+ assert!(!xs().eq_by(ys().take(3), f));
+ assert!(xs().take(3).eq_by(ys().take(3), f));
+}
+
+#[test]
fn test_counter_from_iter() {
let it = (0..).step_by(5).take(10);
let xs: Vec<isize> = FromIterator::from_iter(it);
@@ -330,6 +386,23 @@
}
#[test]
+fn test_iterator_step_by_nth_try_fold() {
+ let mut it = (0..).step_by(10);
+ assert_eq!(it.try_fold(0, i8::checked_add), None);
+ assert_eq!(it.next(), Some(60));
+ assert_eq!(it.try_fold(0, i8::checked_add), None);
+ assert_eq!(it.next(), Some(90));
+
+ let mut it = (100..).step_by(10);
+ assert_eq!(it.try_fold(50, i8::checked_add), None);
+ assert_eq!(it.next(), Some(110));
+
+ let mut it = (100..=100).step_by(10);
+ assert_eq!(it.next(), Some(100));
+ assert_eq!(it.try_fold(0, i8::checked_add), Some(0));
+}
+
+#[test]
fn test_iterator_step_by_nth_back() {
let mut it = (0..16).step_by(5);
assert_eq!(it.nth_back(0), Some(15));
@@ -355,6 +428,24 @@
}
#[test]
+fn test_iterator_step_by_nth_try_rfold() {
+ let mut it = (0..100).step_by(10);
+ assert_eq!(it.try_rfold(0, i8::checked_add), None);
+ assert_eq!(it.next_back(), Some(70));
+ assert_eq!(it.next(), Some(0));
+ assert_eq!(it.try_rfold(0, i8::checked_add), None);
+ assert_eq!(it.next_back(), Some(30));
+
+ let mut it = (0..100).step_by(10);
+ assert_eq!(it.try_rfold(50, i8::checked_add), None);
+ assert_eq!(it.next_back(), Some(80));
+
+ let mut it = (100..=100).step_by(10);
+ assert_eq!(it.next_back(), Some(100));
+ assert_eq!(it.try_fold(0, i8::checked_add), Some(0));
+}
+
+#[test]
#[should_panic]
fn test_iterator_step_by_zero() {
let mut it = (0..).step_by(0);
diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs
index a3b108b..050195c 100644
--- a/src/libcore/tests/lib.rs
+++ b/src/libcore/tests/lib.rs
@@ -1,3 +1,4 @@
+#![feature(bool_to_option)]
#![feature(bound_cloned)]
#![feature(box_syntax)]
#![feature(cell_update)]
@@ -32,6 +33,7 @@
#![feature(const_fn)]
#![feature(iter_partition_in_place)]
#![feature(iter_is_partitioned)]
+#![feature(iter_order_by)]
extern crate test;
@@ -40,6 +42,7 @@
mod array;
mod ascii;
mod atomic;
+mod bool;
mod cell;
mod char;
mod clone;
diff --git a/src/librustc/arena.rs b/src/librustc/arena.rs
index b3a561e..d4fc1b1 100644
--- a/src/librustc/arena.rs
+++ b/src/librustc/arena.rs
@@ -187,7 +187,7 @@
unsafe trait ArenaField<'tcx>: Sized {
/// Returns a specific arena to allocate from.
- /// If None is returned, the DropArena will be used.
+ /// If `None` is returned, the `DropArena` will be used.
fn arena<'a>(arena: &'a Arena<'tcx>) -> Option<&'a TypedArena<Self>>;
}
diff --git a/src/librustc/cfg/mod.rs b/src/librustc/cfg/mod.rs
deleted file mode 100644
index 88fc7fb..0000000
--- a/src/librustc/cfg/mod.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-//! Module that constructs a control-flow graph representing an item.
-//! Uses `Graph` as the underlying representation.
-
-use rustc_data_structures::graph::implementation as graph;
-use crate::ty::TyCtxt;
-use crate::hir;
-use crate::hir::def_id::DefId;
-
-mod construct;
-pub mod graphviz;
-
-pub struct CFG {
- pub owner_def_id: DefId,
- pub graph: CFGGraph,
- pub entry: CFGIndex,
- pub exit: CFGIndex,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum CFGNodeData {
- AST(hir::ItemLocalId),
- Entry,
- Exit,
- Dummy,
- Unreachable,
-}
-
-impl CFGNodeData {
- pub fn id(&self) -> hir::ItemLocalId {
- if let CFGNodeData::AST(id) = *self {
- id
- } else {
- hir::DUMMY_ITEM_LOCAL_ID
- }
- }
-}
-
-#[derive(Debug)]
-pub struct CFGEdgeData {
- pub exiting_scopes: Vec<hir::ItemLocalId>
-}
-
-pub type CFGIndex = graph::NodeIndex;
-
-pub type CFGGraph = graph::Graph<CFGNodeData, CFGEdgeData>;
-
-pub type CFGNode = graph::Node<CFGNodeData>;
-
-pub type CFGEdge = graph::Edge<CFGEdgeData>;
-
-impl CFG {
- pub fn new(tcx: TyCtxt<'_>, body: &hir::Body) -> CFG {
- construct::construct(tcx, body)
- }
-
- pub fn node_is_reachable(&self, id: hir::ItemLocalId) -> bool {
- self.graph.depth_traverse(self.entry, graph::OUTGOING)
- .any(|idx| self.graph.node_data(idx).id() == id)
- }
-}
diff --git a/src/librustc/error_codes.rs b/src/librustc/error_codes.rs
index 937a9ea..eee3384 100644
--- a/src/librustc/error_codes.rs
+++ b/src/librustc/error_codes.rs
@@ -1,7 +1,8 @@
// Error messages for EXXXX errors.
-// Each message should start and end with a new line, and be wrapped to 80 characters.
-// In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use `:set tw=0` to disable.
-register_long_diagnostics! {
+// Each message should start and end with a new line, and be wrapped to 80
+// characters. In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use
+// `:set tw=0` to disable.
+syntax::register_diagnostics! {
E0038: r##"
Trait objects like `Box<Trait>` can only be constructed when certain
requirements are satisfied by the trait in question.
@@ -2183,11 +2184,7 @@
static X: u32 = 42;
```
"##,
-
-}
-
-
-register_diagnostics! {
+;
// E0006, // merged with E0005
// E0101, // replaced with E0282
// E0102, // replaced with E0282
@@ -2206,7 +2203,8 @@
// E0305, // expected constant
E0311, // thing may not live long enough
E0312, // lifetime of reference outlives lifetime of borrowed content
- E0313, // lifetime of borrowed pointer outlives lifetime of captured variable
+ E0313, // lifetime of borrowed pointer outlives lifetime of captured
+ // variable
E0314, // closure outlives stack frame
E0315, // cannot invoke closure outside of its lifetime
E0316, // nested quantification of lifetimes
@@ -2223,12 +2221,13 @@
E0483, // lifetime of operand does not outlive the operation
E0484, // reference is not valid at the time of borrow
E0485, // automatically reference is not valid at the time of borrow
- E0486, // type of expression contains references that are not valid during...
+ E0486, // type of expression contains references that are not valid during..
E0487, // unsafe use of destructor: destructor might be called while...
E0488, // lifetime of variable does not enclose its declaration
E0489, // type/lifetime parameter not in scope here
E0490, // a value of type `..` is borrowed for too long
- E0495, // cannot infer an appropriate lifetime due to conflicting requirements
+ E0495, // cannot infer an appropriate lifetime due to conflicting
+ // requirements
E0566, // conflicting representation hints
E0623, // lifetime mismatch where both parameters are anonymous regions
E0628, // generators cannot have explicit parameters
@@ -2239,7 +2238,8 @@
E0688, // in-band lifetimes cannot be mixed with explicit lifetime binders
E0697, // closures cannot be static
E0707, // multiple elided lifetimes used in arguments of `async fn`
- E0708, // `async` non-`move` closures with parameters are not currently supported
+ E0708, // `async` non-`move` closures with parameters are not currently
+ // supported
E0709, // multiple different lifetimes used in arguments of `async fn`
E0710, // an unknown tool name found in scoped lint
E0711, // a feature has been declared with conflicting stability attributes
diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs
index eae956c..1df0942 100644
--- a/src/librustc/hir/check_attr.rs
+++ b/src/librustc/hir/check_attr.rs
@@ -4,13 +4,12 @@
//! conflicts between multiple such attributes attached to the same
//! item.
-
-use crate::ty::TyCtxt;
-use crate::ty::query::Providers;
-
use crate::hir;
use crate::hir::def_id::DefId;
use crate::hir::intravisit::{self, Visitor, NestedVisitorMap};
+use crate::ty::TyCtxt;
+use crate::ty::query::Providers;
+
use std::fmt::{self, Display};
use syntax::symbol::sym;
use syntax_pos::Span;
diff --git a/src/librustc/hir/def.rs b/src/librustc/hir/def.rs
index f83fbcd..f7d31ca 100644
--- a/src/librustc/hir/def.rs
+++ b/src/librustc/hir/def.rs
@@ -1,15 +1,17 @@
+use self::Namespace::*;
+
use crate::hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
+use crate::hir;
+use crate::ty;
use crate::util::nodemap::DefIdMap;
+
use syntax::ast;
use syntax::ext::base::MacroKind;
use syntax::ast::NodeId;
use syntax_pos::Span;
use rustc_macros::HashStable;
-use crate::hir;
-use crate::ty;
-use std::fmt::Debug;
-use self::Namespace::*;
+use std::fmt::Debug;
/// Encodes if a `DefKind::Ctor` is the constructor of an enum variant or a struct.
#[derive(Clone, Copy, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, HashStable)]
@@ -115,7 +117,7 @@
}
}
- /// An English article for the def.
+ /// Gets an English article for the definition.
pub fn article(&self) -> &'static str {
match *self {
DefKind::AssocTy
@@ -134,18 +136,22 @@
Def(DefKind, DefId),
// Type namespace
+
PrimTy(hir::PrimTy),
SelfTy(Option<DefId> /* trait */, Option<DefId> /* impl */),
ToolMod, // e.g., `rustfmt` in `#[rustfmt::skip]`
// Value namespace
+
SelfCtor(DefId /* impl */), // `DefId` refers to the impl
Local(Id),
// Macro namespace
+
NonMacroAttr(NonMacroAttrKind), // e.g., `#[inline]` or `#[rustfmt::skip]`
// All namespaces
+
Err,
}
@@ -330,7 +336,7 @@
}
impl<Id> Res<Id> {
- /// Return the `DefId` of this `Def` if it has an id, else panic.
+ /// Return the `DefId` of this `Def` if it has an ID, else panic.
pub fn def_id(&self) -> DefId
where
Id: Debug,
@@ -340,7 +346,7 @@
})
}
- /// Return `Some(..)` with the `DefId` of this `Res` if it has a id, else `None`.
+ /// Return `Some(..)` with the `DefId` of this `Res` if it has a ID, else `None`.
pub fn opt_def_id(&self) -> Option<DefId> {
match *self {
Res::Def(_, id) => Some(id),
@@ -379,7 +385,7 @@
}
}
- /// An English article for the res.
+ /// Gets an English article for the `Res`.
pub fn article(&self) -> &'static str {
match *self {
Res::Def(kind, _) => kind.article(),
diff --git a/src/librustc/hir/def_id.rs b/src/librustc/hir/def_id.rs
index c91ad78..d0bdc14 100644
--- a/src/librustc/hir/def_id.rs
+++ b/src/librustc/hir/def_id.rs
@@ -11,7 +11,7 @@
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum CrateNum {
- /// A special CrateNum that we use for the tcx.rcache when decoding from
+ /// A special `CrateNum` that we use for the `tcx.rcache` when decoding from
/// the incr. comp. cache.
ReservedForIncrCompCache,
Index(CrateId),
@@ -26,11 +26,10 @@
}
}
-/// Item definitions in the currently-compiled crate would have the CrateNum
-/// LOCAL_CRATE in their DefId.
+/// Item definitions in the currently-compiled crate would have the `CrateNum`
+/// `LOCAL_CRATE` in their `DefId`.
pub const LOCAL_CRATE: CrateNum = CrateNum::Index(CrateId::from_u32_const(0));
-
impl Idx for CrateNum {
#[inline]
fn new(value: usize) -> Self {
diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs
index bbde351..1f125de 100644
--- a/src/librustc/hir/intravisit.rs
+++ b/src/librustc/hir/intravisit.rs
@@ -31,11 +31,13 @@
//! This order consistency is required in a few places in rustc, for
//! example generator inference, and possibly also HIR borrowck.
-use syntax::ast::{Ident, Name, Attribute};
-use syntax_pos::Span;
+use super::itemlikevisit::DeepVisitor;
+
use crate::hir::*;
use crate::hir::map::Map;
-use super::itemlikevisit::DeepVisitor;
+
+use syntax::ast::{Ident, Name, Attribute};
+use syntax_pos::Span;
#[derive(Copy, Clone)]
pub enum FnKind<'a> {
@@ -139,7 +141,7 @@
/// explicitly, you need to override each method. (And you also need
/// to monitor future changes to `Visitor` in case a new method with a
/// new default implementation gets introduced.)
-pub trait Visitor<'v> : Sized {
+pub trait Visitor<'v>: Sized {
///////////////////////////////////////////////////////////////////////////
// Nested items.
@@ -162,8 +164,8 @@
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'v>;
/// Invoked when a nested item is encountered. By default does
- /// nothing unless you override `nested_visit_map` to return
- /// `Some(_)`, in which case it will walk the item. **You probably
+ /// nothing unless you override `nested_visit_map` to return other than
+ /// `None`, in which case it will walk the item. **You probably
/// don't want to override this method** -- instead, override
/// `nested_visit_map` or use the "shallow" or "deep" visit
/// patterns described on `itemlikevisit::ItemLikeVisitor`. The only
@@ -201,8 +203,8 @@
/// Invoked to visit the body of a function, method or closure. Like
/// visit_nested_item, does nothing by default unless you override
- /// `nested_visit_map` to return `Some(_)`, in which case it will walk the
- /// body.
+ /// `nested_visit_map` to return other htan `None`, in which case it will walk
+ /// the body.
fn visit_nested_body(&mut self, id: BodyId) {
let opt_body = self.nested_visit_map().intra().map(|map| map.body(id));
if let Some(body) = opt_body {
@@ -603,7 +605,7 @@
visitor.visit_lifetime(lifetime);
visitor.visit_ty(&mutable_type.ty)
}
- TyKind::Never => {},
+ TyKind::Never => {}
TyKind::Tup(ref tuple_element_types) => {
walk_list!(visitor, visit_ty, tuple_element_types);
}
diff --git a/src/librustc/hir/itemlikevisit.rs b/src/librustc/hir/itemlikevisit.rs
index 35b1812..39dd46c 100644
--- a/src/librustc/hir/itemlikevisit.rs
+++ b/src/librustc/hir/itemlikevisit.rs
@@ -1,7 +1,7 @@
use super::{Item, ImplItem, TraitItem};
use super::intravisit::Visitor;
-/// The "item-like visitor" visitor defines only the top-level methods
+/// The "item-like visitor" defines only the top-level methods
/// that can be invoked by `Crate::visit_all_item_likes()`. Whether
/// this trait is the right one to implement will depend on the
/// overall pattern you need. Here are the three available patterns,
@@ -18,11 +18,11 @@
/// an item, but don't care about how item-like things are nested
/// within one another.
/// - Example: Examine each expression to look for its type and do some check or other.
-/// - How: Implement `intravisit::Visitor` and use
-/// `tcx.hir().krate().visit_all_item_likes(visitor.as_deep_visitor())`. Within
-/// your `intravisit::Visitor` impl, implement methods like
-/// `visit_expr()`; don't forget to invoke
-/// `intravisit::walk_visit_expr()` to keep walking the subparts.
+/// - How: Implement `intravisit::Visitor` and override the `nested_visit_map()` method
+/// to return `NestedVisitorMap::OnlyBodies` and use
+/// `tcx.hir().krate().visit_all_item_likes(&mut visitor.as_deep_visitor())`. Within
+/// your `intravisit::Visitor` impl, implement methods like `visit_expr()` (don't forget
+/// to invoke `intravisit::walk_expr()` to keep walking the subparts).
/// - Pro: Visitor methods for any kind of HIR node, not just item-like things.
/// - Pro: Integrates well into dependency tracking.
/// - Con: Don't get information about nesting between items
@@ -30,10 +30,9 @@
/// item-like things.
/// - Example: Lifetime resolution, which wants to bring lifetimes declared on the
/// impl into scope while visiting the impl-items, and then back out again.
-/// - How: Implement `intravisit::Visitor` and override the
-/// `nested_visit_map()` methods to return
-/// `NestedVisitorMap::All`. Walk your crate with
-/// `intravisit::walk_crate()` invoked on `tcx.hir().krate()`.
+/// - How: Implement `intravisit::Visitor` and override the `nested_visit_map()` method
+/// to return `NestedVisitorMap::All`. Walk your crate with `intravisit::walk_crate()`
+/// invoked on `tcx.hir().krate()`.
/// - Pro: Visitor methods for any kind of HIR node, not just item-like things.
/// - Pro: Preserves nesting information
/// - Con: Does not integrate well into dependency tracking.
@@ -79,7 +78,7 @@
}
}
-/// A parallel variant of ItemLikeVisitor
+/// A parallel variant of `ItemLikeVisitor`.
pub trait ParItemLikeVisitor<'hir> {
fn visit_item(&self, item: &'hir Item);
fn visit_trait_item(&self, trait_item: &'hir TraitItem);
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 190b50b..b50cfa0 100644
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -79,7 +79,7 @@
pub struct LoweringContext<'a> {
crate_root: Option<Symbol>,
- /// Used to assign ids to HIR nodes that do not directly correspond to an AST node.
+ /// Used to assign IDs to HIR nodes that do not directly correspond to AST nodes.
sess: &'a Session,
cstore: &'a dyn CrateStore,
@@ -126,7 +126,7 @@
/// lifetime definitions in the corresponding impl or function generics.
lifetimes_to_define: Vec<(Span, ParamName)>,
- /// Whether or not in-band lifetimes are being collected. This is used to
+ /// `true` if in-band lifetimes are being collected. This is used to
/// indicate whether or not we're in a place where new lifetimes will result
/// in in-band lifetime definitions, such a function or an impl header,
/// including implicit lifetimes from `impl_header_lifetime_elision`.
@@ -154,13 +154,13 @@
}
pub trait Resolver {
- /// Obtain resolution for a `NodeId` with a single resolution.
+ /// Obtains resolution for a `NodeId` with a single resolution.
fn get_partial_res(&mut self, id: NodeId) -> Option<PartialRes>;
- /// Obtain per-namespace resolutions for `use` statement with the given `NoedId`.
+ /// Obtains per-namespace resolutions for `use` statement with the given `NodeId`.
fn get_import_res(&mut self, id: NodeId) -> PerNS<Option<Res<NodeId>>>;
- /// Obtain resolution for a label with the given `NodeId`.
+ /// Obtains resolution for a label with the given `NodeId`.
fn get_label_res(&mut self, id: NodeId) -> Option<NodeId>;
/// We must keep the set of definitions up to date as we add nodes that weren't in the AST.
@@ -699,7 +699,7 @@
fn lower_res(&mut self, res: Res<NodeId>) -> Res {
res.map_id(|id| {
self.lower_node_id_generic(id, |_| {
- panic!("expected node_id to be lowered already for res {:#?}", res)
+ panic!("expected `NodeId` to be lowered already for res {:#?}", res);
})
})
}
@@ -1364,7 +1364,7 @@
}
}
}
- TyKind::Mac(_) => bug!("`TyMac` should have been expanded by now."),
+ TyKind::Mac(_) => bug!("`TyMac` should have been expanded by now"),
TyKind::CVarArgs => {
// Create the implicit lifetime of the "spoofed" `VaListImpl`.
let span = self.sess.source_map().next_point(t.span.shrink_to_lo());
@@ -2999,7 +2999,7 @@
}
StmtKind::Expr(ref e) => hir::StmtKind::Expr(P(self.lower_expr(e))),
StmtKind::Semi(ref e) => hir::StmtKind::Semi(P(self.lower_expr(e))),
- StmtKind::Mac(..) => panic!("Shouldn't exist here"),
+ StmtKind::Mac(..) => panic!("shouldn't exist here"),
};
smallvec![hir::Stmt {
hir_id: self.lower_node_id(s.id),
@@ -3187,7 +3187,7 @@
hir::Path {
span,
- res: res.map_id(|_| panic!("unexpected node_id")),
+ res: res.map_id(|_| panic!("unexpected `NodeId`")),
segments: segments.into(),
}
}
diff --git a/src/librustc/hir/lowering/expr.rs b/src/librustc/hir/lowering/expr.rs
index 0d8986d..a46cdab 100644
--- a/src/librustc/hir/lowering/expr.rs
+++ b/src/librustc/hir/lowering/expr.rs
@@ -507,14 +507,13 @@
/// Desugar `<expr>.await` into:
/// ```rust
- /// {
- /// let mut pinned = <expr>;
- /// loop {
+ /// match <expr> {
+ /// mut pinned => loop {
/// match ::std::future::poll_with_tls_context(unsafe {
- /// ::std::pin::Pin::new_unchecked(&mut pinned)
+ /// <::std::pin::Pin>::new_unchecked(&mut pinned)
/// }) {
/// ::std::task::Poll::Ready(result) => break result,
- /// ::std::task::Poll::Pending => {},
+ /// ::std::task::Poll::Pending => {}
/// }
/// yield ();
/// }
@@ -549,21 +548,12 @@
self.allow_gen_future.clone(),
);
- // let mut pinned = <expr>;
- let expr = P(self.lower_expr(expr));
let pinned_ident = Ident::with_dummy_span(sym::pinned);
let (pinned_pat, pinned_pat_hid) = self.pat_ident_binding_mode(
span,
pinned_ident,
hir::BindingAnnotation::Mutable,
);
- let pinned_let = self.stmt_let_pat(
- ThinVec::new(),
- span,
- Some(expr),
- pinned_pat,
- hir::LocalSource::AwaitDesugar,
- );
// ::std::future::poll_with_tls_context(unsafe {
// ::std::pin::Pin::new_unchecked(&mut pinned)
@@ -621,7 +611,7 @@
self.arm(hir_vec![pending_pat], empty_block)
};
- let match_stmt = {
+ let inner_match_stmt = {
let match_expr = self.expr_match(
span,
poll_expr,
@@ -643,10 +633,11 @@
let loop_block = P(self.block_all(
span,
- hir_vec![match_stmt, yield_stmt],
+ hir_vec![inner_match_stmt, yield_stmt],
None,
));
+ // loop { .. }
let loop_expr = P(hir::Expr {
hir_id: loop_hir_id,
node: hir::ExprKind::Loop(
@@ -658,10 +649,14 @@
attrs: ThinVec::new(),
});
- hir::ExprKind::Block(
- P(self.block_all(span, hir_vec![pinned_let], Some(loop_expr))),
- None,
- )
+ // mut pinned => loop { ... }
+ let pinned_arm = self.arm(hir_vec![pinned_pat], loop_expr);
+
+ // match <expr> {
+ // mut pinned => loop { .. }
+ // }
+ let expr = P(self.lower_expr(expr));
+ hir::ExprKind::Match(expr, hir_vec![pinned_arm], hir::MatchSource::AwaitDesugar)
}
fn lower_expr_closure(
diff --git a/src/librustc/hir/lowering/item.rs b/src/librustc/hir/lowering/item.rs
index 4e432f4..5f82e42 100644
--- a/src/librustc/hir/lowering/item.rs
+++ b/src/librustc/hir/lowering/item.rs
@@ -718,7 +718,7 @@
AnonymousLifetimeMode::PassThrough,
|this, _| {
(
- // Disallow impl Trait in foreign items
+ // Disallow `impl Trait` in foreign items.
this.lower_fn_decl(fdec, None, false, None),
this.lower_fn_params_to_names(fdec),
)
@@ -732,7 +732,7 @@
self.lower_ty(t, ImplTraitContext::disallowed()), self.lower_mutability(m))
}
ForeignItemKind::Ty => hir::ForeignItemKind::Type,
- ForeignItemKind::Macro(_) => panic!("shouldn't exist here"),
+ ForeignItemKind::Macro(_) => panic!("macro shouldn't exist here"),
},
vis: self.lower_visibility(&i.vis, None),
span: i.span,
diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs
index b8bd1d7..4179cf2 100644
--- a/src/librustc/hir/map/collector.rs
+++ b/src/librustc/hir/map/collector.rs
@@ -340,7 +340,7 @@
/// their outer items.
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'hir> {
- panic!("visit_nested_xxx must be manually implemented in this visitor")
+ panic!("`visit_nested_xxx` must be manually implemented in this visitor");
}
fn visit_nested_item(&mut self, item: ItemId) {
diff --git a/src/librustc/hir/map/def_collector.rs b/src/librustc/hir/map/def_collector.rs
index 17bcb1d..bffb4df 100644
--- a/src/librustc/hir/map/def_collector.rs
+++ b/src/librustc/hir/map/def_collector.rs
@@ -155,6 +155,9 @@
}
fn visit_variant(&mut self, v: &'a Variant) {
+ if v.is_placeholder {
+ return self.visit_macro_invoc(v.id);
+ }
let def = self.create_def(v.id,
DefPathData::TypeNs(v.ident.as_interned_str()),
v.span);
@@ -168,16 +171,24 @@
fn visit_variant_data(&mut self, data: &'a VariantData) {
for (index, field) in data.fields().iter().enumerate() {
+ if field.is_placeholder {
+ self.visit_macro_invoc(field.id);
+ continue;
+ }
let name = field.ident.map(|ident| ident.name)
.unwrap_or_else(|| sym::integer(index));
let def = self.create_def(field.id,
DefPathData::ValueNs(name.as_interned_str()),
field.span);
- self.with_parent(def, |this| this.visit_struct_field(field));
+ self.with_parent(def, |this| visit::walk_struct_field(this, field));
}
}
fn visit_generic_param(&mut self, param: &'a GenericParam) {
+ if param.is_placeholder {
+ self.visit_macro_invoc(param.id);
+ return;
+ }
let name = param.ident.as_interned_str();
let def_path_data = match param.kind {
GenericParamKind::Lifetime { .. } => DefPathData::LifetimeNs(name),
@@ -294,4 +305,49 @@
}
}
}
+
+ fn visit_arm(&mut self, arm: &'a Arm) {
+ if arm.is_placeholder {
+ self.visit_macro_invoc(arm.id)
+ } else {
+ visit::walk_arm(self, arm)
+ }
+ }
+
+ fn visit_field(&mut self, f: &'a Field) {
+ if f.is_placeholder {
+ self.visit_macro_invoc(f.id)
+ } else {
+ visit::walk_field(self, f)
+ }
+ }
+
+ fn visit_field_pattern(&mut self, fp: &'a FieldPat) {
+ if fp.is_placeholder {
+ self.visit_macro_invoc(fp.id)
+ } else {
+ visit::walk_field_pattern(self, fp)
+ }
+ }
+
+ fn visit_param(&mut self, p: &'a Param) {
+ if p.is_placeholder {
+ self.visit_macro_invoc(p.id)
+ } else {
+ visit::walk_param(self, p)
+ }
+ }
+
+ fn visit_struct_field(&mut self, sf: &'a StructField) {
+ if sf.is_placeholder {
+ self.visit_macro_invoc(sf.id)
+ } else {
+ let name = sf.ident.map(|ident| ident.name)
+ .unwrap_or_else(|| panic!("don't know the field number in this context"));
+ let def = self.create_def(sf.id,
+ DefPathData::ValueNs(name.as_interned_str()),
+ sf.span);
+ self.with_parent(def, |this| visit::walk_struct_field(this, sf));
+ }
+ }
}
diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index 6dc3c70..651fe84 100644
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -7,10 +7,12 @@
use crate::hir;
use crate::hir::def_id::{CrateNum, DefId, DefIndex, LOCAL_CRATE, CRATE_DEF_INDEX};
use crate::ich::Fingerprint;
+use crate::session::CrateDisambiguator;
+use crate::util::nodemap::NodeMap;
+
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::indexed_vec::{IndexVec};
use rustc_data_structures::stable_hasher::StableHasher;
-use crate::session::CrateDisambiguator;
use std::borrow::Borrow;
use std::fmt::Write;
use std::hash::Hash;
@@ -18,12 +20,11 @@
use syntax::ext::hygiene::ExpnId;
use syntax::symbol::{Symbol, sym, InternedString};
use syntax_pos::{Span, DUMMY_SP};
-use crate::util::nodemap::NodeMap;
-/// The DefPathTable maps DefIndexes to DefKeys and vice versa.
-/// Internally the DefPathTable holds a tree of DefKeys, where each DefKey
-/// stores the DefIndex of its parent.
-/// There is one DefPathTable for each crate.
+/// The `DefPathTable` maps `DefIndex`es to `DefKey`s and vice versa.
+/// Internally the `DefPathTable` holds a tree of `DefKey`s, where each `DefKey`
+/// stores the `DefIndex` of its parent.
+/// There is one `DefPathTable` for each crate.
#[derive(Clone, Default, RustcDecodable, RustcEncodable)]
pub struct DefPathTable {
index_to_key: Vec<DefKey>,
@@ -121,7 +122,7 @@
fn compute_stable_hash(&self, parent_hash: DefPathHash) -> DefPathHash {
let mut hasher = StableHasher::new();
- // We hash a 0u8 here to disambiguate between regular DefPath hashes,
+ // We hash a `0u8` here to disambiguate between regular `DefPath` hashes,
// and the special "root_parent" below.
0u8.hash(&mut hasher);
parent_hash.hash(&mut hasher);
@@ -145,8 +146,7 @@
crate_disambiguator: CrateDisambiguator)
-> DefPathHash {
let mut hasher = StableHasher::new();
- // Disambiguate this from a regular DefPath hash,
- // see compute_stable_hash() above.
+ // Disambiguate this from a regular `DefPath` hash; see `compute_stable_hash()` above.
1u8.hash(&mut hasher);
crate_name.hash(&mut hasher);
crate_disambiguator.hash(&mut hasher);
@@ -155,10 +155,10 @@
}
/// A pair of `DefPathData` and an integer disambiguator. The integer is
-/// normally 0, but in the event that there are multiple defs with the
+/// normally `0`, but in the event that there are multiple defs with the
/// same `parent` and `data`, we use this field to disambiguate
/// between them. This introduces some artificial ordering dependency
-/// but means that if you have (e.g.) two impls for the same type in
+/// but means that if you have, e.g., two impls for the same type in
/// the same module, they do get distinct `DefId`s.
#[derive(Clone, PartialEq, Debug, Hash, RustcEncodable, RustcDecodable)]
pub struct DisambiguatedDefPathData {
@@ -277,29 +277,34 @@
pub enum DefPathData {
// Root: these should only be used for the root nodes, because
// they are treated specially by the `def_path` function.
- /// The crate root (marker)
+
+ /// The crate root (marker).
CrateRoot,
- // Catch-all for random DefId things like `DUMMY_NODE_ID`
+ // Catch-all for random `DefId` things like `DUMMY_NODE_ID`.
Misc,
+
// Different kinds of items and item-like things:
- /// An impl
+
+ /// An impl.
Impl,
- /// Something in the type NS
+ /// Something in the type namespace.
TypeNs(InternedString),
- /// Something in the value NS
+ /// Something in the value namespace.
ValueNs(InternedString),
- /// Something in the macro NS
+ /// Something in the macro namespace.
MacroNs(InternedString),
- /// Something in the lifetime NS
+ /// Something in the lifetime namespace.
LifetimeNs(InternedString),
- /// A closure expression
+ /// A closure expression.
ClosureExpr,
- // Subportions of items
- /// Implicit ctor for a unit or tuple-like struct or enum variant.
+
+ // Subportions of items:
+
+ /// Implicit constructor for a unit or tuple-like struct or enum variant.
Ctor,
- /// A constant expression (see {ast,hir}::AnonConst).
+ /// A constant expression (see `{ast,hir}::AnonConst`).
AnonConst,
- /// An `impl Trait` type node
+ /// An `impl Trait` type node.
ImplTrait,
/// Identifies a piece of crate metadata that is global to a whole crate
/// (as opposed to just one item). `GlobalMetaData` components are only
@@ -435,7 +440,7 @@
self.node_to_def_index.insert(ast::CRATE_NODE_ID, root_index);
self.set_invocation_parent(ExpnId::root(), root_index);
- // Allocate some other DefIndices that always must exist.
+ // Allocate some other `DefIndex`es that always must exist.
GlobalMetaDataKind::allocate_def_indices(self);
root_index
@@ -458,7 +463,7 @@
data,
self.table.def_key(self.node_to_def_index[&node_id]));
- // The root node must be created with create_root_def()
+ // The root node must be created with `create_root_def()`.
assert!(data != DefPathData::CrateRoot);
// Find the next free disambiguator for this key.
@@ -486,9 +491,9 @@
assert_eq!(index.index(), self.def_index_to_node.len());
self.def_index_to_node.push(node_id);
- // Some things for which we allocate DefIndices don't correspond to
- // anything in the AST, so they don't have a NodeId. For these cases
- // we don't need a mapping from NodeId to DefIndex.
+ // Some things for which we allocate `DefIndex`es don't correspond to
+ // anything in the AST, so they don't have a `NodeId`. For these cases
+ // we don't need a mapping from `NodeId` to `DefIndex`.
if node_id != ast::DUMMY_NODE_ID {
debug!("create_def_with_parent: def_index_to_node[{:?} <-> {:?}", index, node_id);
self.node_to_def_index.insert(node_id, index);
@@ -498,7 +503,7 @@
self.expansions_that_defined.insert(index, expn_id);
}
- // The span is added if it isn't dummy
+ // The span is added if it isn't dummy.
if !span.is_dummy() {
self.def_index_to_span.insert(index, span);
}
@@ -506,12 +511,12 @@
index
}
- /// Initialize the `ast::NodeId` to `HirId` mapping once it has been generated during
+ /// Initializes the `ast::NodeId` to `HirId` mapping once it has been generated during
/// AST to HIR lowering.
pub fn init_node_id_to_hir_id_mapping(&mut self,
mapping: IndexVec<ast::NodeId, hir::HirId>) {
assert!(self.node_to_hir_id.is_empty(),
- "Trying initialize NodeId -> HirId mapping twice");
+ "trying to initialize `NodeId` -> `HirId` mapping twice");
self.node_to_hir_id = mapping;
}
@@ -533,7 +538,7 @@
pub fn set_invocation_parent(&mut self, invoc_id: ExpnId, parent: DefIndex) {
let old_parent = self.invocation_parents.insert(invoc_id, parent);
- assert!(old_parent.is_none(), "parent def-index is reset for an invocation");
+ assert!(old_parent.is_none(), "parent `DefIndex` is reset for an invocation");
}
}
@@ -585,9 +590,9 @@
}
}
-// We define the GlobalMetaDataKind enum with this macro because we want to
+// We define the `GlobalMetaDataKind` enum with this macro because we want to
// make sure that we exhaustively iterate over all variants when registering
-// the corresponding DefIndices in the DefTable.
+// the corresponding `DefIndex`es in the `DefTable`.
macro_rules! define_global_metadata_kind {
(pub enum GlobalMetaDataKind {
$($variant:ident),*
@@ -609,7 +614,7 @@
DUMMY_SP
);
- // Make sure calling def_index does not crash.
+ // Make sure calling `def_index` does not crash.
instance.def_index(&definitions.table);
})*
}
@@ -623,7 +628,7 @@
}
};
- // These DefKeys are all right after the root,
+ // These `DefKey`s are all right after the root,
// so a linear search is fine.
let index = def_path_table.index_to_key
.iter()
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index eb8be6e..5cec8a5 100644
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -5,10 +5,15 @@
};
use crate::dep_graph::{DepGraph, DepNode, DepKind, DepNodeIndex};
-
+use crate::hir::*;
+use crate::hir::DefKind;
use crate::hir::def_id::{CRATE_DEF_INDEX, DefId, LocalDefId};
-
+use crate::hir::itemlikevisit::ItemLikeVisitor;
+use crate::hir::print::Nested;
use crate::middle::cstore::CrateStoreDyn;
+use crate::ty::query::Providers;
+use crate::util::nodemap::FxHashMap;
+use crate::util::common::time;
use rustc_target::spec::abi::Abi;
use rustc_data_structures::svh::Svh;
@@ -18,15 +23,7 @@
use syntax::ext::base::MacroKind;
use syntax_pos::{Span, DUMMY_SP};
-use crate::hir::*;
-use crate::hir::DefKind;
-use crate::hir::itemlikevisit::ItemLikeVisitor;
-use crate::hir::print::Nested;
-use crate::util::nodemap::FxHashMap;
-use crate::util::common::time;
-
use std::result::Result::Err;
-use crate::ty::query::Providers;
pub mod blocks;
mod collector;
@@ -627,7 +624,7 @@
.unwrap_or(hir_id)
}
- /// Check if the node is an argument. An argument is a local variable whose
+ /// Checks if the node is an argument. An argument is a local variable whose
/// immediate parent is an item or a closure.
pub fn is_argument(&self, id: HirId) -> bool {
match self.find(id) {
@@ -733,7 +730,7 @@
/// ```
/// fn foo(x: usize) -> bool {
/// if x == 1 {
- /// true // `get_return_block` gets passed the `id` corresponding
+ /// true // If `get_return_block` gets passed the `id` corresponding
/// } else { // to this, it will return `foo`'s `HirId`.
/// false
/// }
@@ -743,7 +740,7 @@
/// ```
/// fn foo(x: usize) -> bool {
/// loop {
- /// true // `get_return_block` gets passed the `id` corresponding
+ /// true // If `get_return_block` gets passed the `id` corresponding
/// } // to this, it will return `None`.
/// false
/// }
@@ -994,9 +991,9 @@
self.map.iter().enumerate().filter_map(|(i, local_map)| {
local_map.as_ref().map(|m| (i, m))
}).flat_map(move |(array_index, local_map)| {
- // Iterate over each valid entry in the local map
+ // Iterate over each valid entry in the local map.
local_map.iter_enumerated().filter_map(move |(i, entry)| entry.map(move |_| {
- // Reconstruct the HirId based on the 3 indices we used to find it
+ // Reconstruct the `HirId` based on the 3 indices we used to find it.
HirId {
owner: DefIndex::from(array_index),
local_id: i,
@@ -1207,7 +1204,7 @@
definitions,
};
- time(sess, "validate hir map", || {
+ time(sess, "validate HIR map", || {
hir_id_validator::check_crate(&map);
});
@@ -1247,9 +1244,9 @@
Node::Pat(a) => self.print_pat(&a),
Node::Arm(a) => self.print_arm(&a),
Node::Block(a) => {
- // containing cbox, will be closed by print-block at }
+ // Containing cbox, will be closed by print-block at `}`.
self.cbox(print::INDENT_UNIT);
- // head-ibox, will be closed by print-block after {
+ // Head-ibox, will be closed by print-block after `{`.
self.ibox(0);
self.print_block(&a)
}
@@ -1257,8 +1254,8 @@
Node::Visibility(a) => self.print_visibility(&a),
Node::GenericParam(_) => bug!("cannot print Node::GenericParam"),
Node::Field(_) => bug!("cannot print StructField"),
- // these cases do not carry enough information in the
- // hir_map to reconstruct their full structure for pretty
+ // These cases do not carry enough information in the
+ // `hir_map` to reconstruct their full structure for pretty
// printing.
Node::Ctor(..) => bug!("cannot print isolated Ctor"),
Node::Local(a) => self.print_local_decl(&a),
@@ -1273,8 +1270,8 @@
let id_str = if include_id { &id_str[..] } else { "" };
let path_str = || {
- // This functionality is used for debugging, try to use TyCtxt to get
- // the user-friendly path, otherwise fall back to stringifying DefPath.
+ // This functionality is used for debugging, try to use `TyCtxt` to get
+ // the user-friendly path, otherwise fall back to stringifying `DefPath`.
crate::ty::tls::with_opt(|tcx| {
if let Some(tcx) = tcx {
let def_id = map.local_def_id(id);
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index d2c45a5..f5e6446 100644
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -13,26 +13,24 @@
use crate::hir::def::{Res, DefKind};
use crate::hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX};
use crate::hir::ptr::P;
-use crate::util::nodemap::{NodeMap, FxHashSet};
use crate::mir::mono::Linkage;
+use crate::ty::AdtKind;
+use crate::ty::query::Providers;
+use crate::util::nodemap::{NodeMap, FxHashSet};
use errors::FatalError;
use syntax_pos::{Span, DUMMY_SP, symbol::InternedString, MultiSpan};
use syntax::source_map::Spanned;
-use rustc_target::spec::abi::Abi;
use syntax::ast::{self, CrateSugar, Ident, Name, NodeId, AsmDialect};
use syntax::ast::{Attribute, Label, LitKind, StrStyle, FloatTy, IntTy, UintTy};
use syntax::attr::{InlineAttr, OptimizeAttr};
use syntax::symbol::{Symbol, kw};
use syntax::tokenstream::TokenStream;
use syntax::util::parser::ExprPrecedence;
-use crate::ty::AdtKind;
-use crate::ty::query::Providers;
-
+use rustc_target::spec::abi::Abi;
use rustc_data_structures::sync::{par_for_each_in, Send, Sync};
use rustc_data_structures::thin_vec::ThinVec;
use rustc_macros::HashStable;
-
use rustc_serialize::{self, Encoder, Encodable, Decoder, Decodable};
use std::collections::{BTreeSet, BTreeMap};
use std::fmt;
@@ -99,7 +97,8 @@
} = *self;
owner.encode(s)?;
- local_id.encode(s)
+ local_id.encode(s)?;
+ Ok(())
}
}
@@ -121,7 +120,7 @@
}
}
-// Hack to ensure that we don't try to access the private parts of `ItemLocalId` in this module
+// Hack to ensure that we don't try to access the private parts of `ItemLocalId` in this module.
mod item_local_id_inner {
use rustc_data_structures::indexed_vec::Idx;
use rustc_macros::HashStable;
@@ -746,7 +745,7 @@
// Attributes from non-exported macros, kept only for collecting the library feature list.
pub non_exported_macro_attrs: HirVec<Attribute>,
- // N.B., we use a BTreeMap here so that `visit_all_items` iterates
+ // N.B., we use a `BTreeMap` here so that `visit_all_items` iterates
// over the ids in increasing order. In principle it should not
// matter what order we visit things in, but in *practice* it
// does, because it can affect the order in which errors are
@@ -1403,13 +1402,13 @@
pub body: BodyId,
}
-/// An expression
+/// An expression.
#[derive(RustcEncodable, RustcDecodable)]
pub struct Expr {
- pub span: Span,
+ pub hir_id: HirId,
pub node: ExprKind,
pub attrs: ThinVec<Attribute>,
- pub hir_id: HirId,
+ pub span: Span,
}
// `Expr` is used a lot. Make sure it doesn't unintentionally get bigger.
@@ -2422,37 +2421,37 @@
///
/// or just
///
- /// `use foo::bar::baz;` (with `as baz` implicitly on the right)
+ /// `use foo::bar::baz;` (with `as baz` implicitly on the right).
Use(P<Path>, UseKind),
- /// A `static` item
+ /// A `static` item.
Static(P<Ty>, Mutability, BodyId),
- /// A `const` item
+ /// A `const` item.
Const(P<Ty>, BodyId),
- /// A function declaration
+ /// A function declaration.
Fn(P<FnDecl>, FnHeader, Generics, BodyId),
- /// A module
+ /// A module.
Mod(Mod),
- /// An external module
+ /// An external module.
ForeignMod(ForeignMod),
- /// Module-level inline assembly (from global_asm!)
+ /// Module-level inline assembly (from `global_asm!`).
GlobalAsm(P<GlobalAsm>),
- /// A type alias, e.g., `type Foo = Bar<u8>`
+ /// A type alias, e.g., `type Foo = Bar<u8>`.
TyAlias(P<Ty>, Generics),
- /// An opaque `impl Trait` type alias, e.g., `type Foo = impl Bar;`
+ /// An opaque `impl Trait` type alias, e.g., `type Foo = impl Bar;`.
OpaqueTy(OpaqueTy),
- /// An enum definition, e.g., `enum Foo<A, B> {C<A>, D<B>}`
+ /// An enum definition, e.g., `enum Foo<A, B> {C<A>, D<B>}`.
Enum(EnumDef, Generics),
- /// A struct definition, e.g., `struct Foo<A> {x: A}`
+ /// A struct definition, e.g., `struct Foo<A> {x: A}`.
Struct(VariantData, Generics),
- /// A union definition, e.g., `union Foo<A, B> {x: A, y: B}`
+ /// A union definition, e.g., `union Foo<A, B> {x: A, y: B}`.
Union(VariantData, Generics),
- /// A trait definition
+ /// A trait definition.
Trait(IsAuto, Unsafety, Generics, GenericBounds, HirVec<TraitItemRef>),
- /// A trait alias
+ /// A trait alias.
TraitAlias(Generics, GenericBounds),
- /// An implementation, eg `impl<A> Trait for Foo { .. }`
+ /// An implementation, e.g., `impl<A> Trait for Foo { .. }`.
Impl(Unsafety,
ImplPolarity,
Defaultness,
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
index 21cc72e..cfbfb5e 100644
--- a/src/librustc/hir/print.rs
+++ b/src/librustc/hir/print.rs
@@ -1293,11 +1293,11 @@
self.print_closure_params(&decl, body);
self.s.space();
- // this is a bare expression
+ // This is a bare expression.
self.ann.nested(self, Nested::Body(body));
self.end(); // need to close a box
- // a box will be closed by print_expr, but we didn't want an overall
+ // A box will be closed by `print_expr`, but we didn't want an overall
// wrapper so we closed the corresponding opening. so create an
// empty box to satisfy the close.
self.ibox(0);
@@ -1307,9 +1307,9 @@
self.print_ident(label.ident);
self.word_space(":");
}
- // containing cbox, will be closed by print-block at }
+ // containing cbox, will be closed by print-block at `}`
self.cbox(INDENT_UNIT);
- // head-box, will be closed by print-block after {
+ // head-box, will be closed by print-block after `{`
self.ibox(0);
self.print_block(&blk);
}
@@ -1759,7 +1759,7 @@
self.word_space(",");
}
if let PatKind::Wild = p.node {
- // Print nothing
+ // Print nothing.
} else {
self.print_pat(&p);
}
@@ -1891,7 +1891,7 @@
i += 1;
if let hir::TyKind::Infer = ty.node {
- // Print nothing
+ // Print nothing.
} else {
s.s.word(":");
s.s.space();
@@ -2221,7 +2221,6 @@
}
}
-// Dup'ed from parse::classify, but adapted for the HIR.
/// Does this expression require a semicolon to be treated
/// as a statement? The negation of this: 'can this expression
/// be used as a statement without a semicolon' -- is used
@@ -2229,6 +2228,8 @@
/// if true {...} else {...}
/// |x| 5
/// isn't parsed as (if true {...} else {...} | x) | 5
+//
+// Duplicated from `parse::classify`, but adapted for the HIR.
fn expr_requires_semi_to_be_stmt(e: &hir::Expr) -> bool {
match e.node {
hir::ExprKind::Match(..) |
@@ -2238,7 +2239,7 @@
}
}
-/// this statement requires a semicolon after it.
+/// This statement requires a semicolon after it.
/// note that in one case (stmt_semi), we've already
/// seen the semicolon, and thus don't need another.
fn stmt_ends_with_semi(stmt: &hir::StmtKind) -> bool {
@@ -2277,7 +2278,7 @@
}
}
-/// Expressions that syntactically contain an "exterior" struct literal i.e., not surrounded by any
+/// Expressions that syntactically contain an "exterior" struct literal, i.e., not surrounded by any
/// parens or other delimiters, e.g., `X { y: 1 }`, `X { y: 1 }.method()`, `foo == X { y: 1 }` and
/// `X { y: 1 } == foo` all do, but `(X { y: 1 }) == foo` does not.
fn contains_exterior_struct_lit(value: &hir::Expr) -> bool {
@@ -2287,7 +2288,7 @@
hir::ExprKind::Assign(ref lhs, ref rhs) |
hir::ExprKind::AssignOp(_, ref lhs, ref rhs) |
hir::ExprKind::Binary(_, ref lhs, ref rhs) => {
- // X { y: 1 } + X { y: 2 }
+ // `X { y: 1 } + X { y: 2 }`
contains_exterior_struct_lit(&lhs) || contains_exterior_struct_lit(&rhs)
}
hir::ExprKind::Unary(_, ref x) |
@@ -2295,12 +2296,12 @@
hir::ExprKind::Type(ref x, _) |
hir::ExprKind::Field(ref x, _) |
hir::ExprKind::Index(ref x, _) => {
- // &X { y: 1 }, X { y: 1 }.y
+ // `&X { y: 1 }, X { y: 1 }.y`
contains_exterior_struct_lit(&x)
}
hir::ExprKind::MethodCall(.., ref exprs) => {
- // X { y: 1 }.bar(...)
+ // `X { y: 1 }.bar(...)`
contains_exterior_struct_lit(&exprs[0])
}
diff --git a/src/librustc/ich/hcx.rs b/src/librustc/ich/hcx.rs
index e77faea..182a9ad 100644
--- a/src/librustc/ich/hcx.rs
+++ b/src/librustc/ich/hcx.rs
@@ -12,7 +12,6 @@
use std::cell::RefCell;
use syntax::ast;
-
use syntax::source_map::SourceMap;
use syntax::ext::hygiene::SyntaxContext;
use syntax::symbol::Symbol;
@@ -20,9 +19,9 @@
use syntax_pos::{Span, DUMMY_SP};
use syntax_pos::hygiene;
-use rustc_data_structures::stable_hasher::{HashStable,
- StableHasher, StableHasherResult,
- ToStableHashKey};
+use rustc_data_structures::stable_hasher::{
+ HashStable, StableHasher, StableHasherResult, ToStableHashKey,
+};
use rustc_data_structures::fx::{FxHashSet, FxHashMap};
use smallvec::SmallVec;
@@ -32,9 +31,9 @@
}
/// This is the context state available during incr. comp. hashing. It contains
-/// enough information to transform DefIds and HirIds into stable DefPaths (i.e.
-/// a reference to the TyCtxt) and it holds a few caches for speeding up various
-/// things (e.g., each DefId/DefPath is only hashed once).
+/// enough information to transform `DefId`s and `HirId`s into stable `DefPath`s (i.e.,
+/// a reference to the `TyCtxt`) and it holds a few caches for speeding up various
+/// things (e.g., each `DefId`/`DefPath` is only hashed once).
#[derive(Clone)]
pub struct StableHashingContext<'a> {
sess: &'a Session,
@@ -46,7 +45,7 @@
node_id_hashing_mode: NodeIdHashingMode,
// Very often, we are hashing something that does not need the
- // CachingSourceMapView, so we initialize it lazily.
+ // `CachingSourceMapView`, so we initialize it lazily.
raw_source_map: &'a SourceMap,
caching_source_map: Option<CachingSourceMapView<'a>>,
}
@@ -57,24 +56,24 @@
HashDefPath,
}
-/// The BodyResolver allows to map a BodyId to the corresponding hir::Body.
-/// We could also just store a plain reference to the hir::Crate but we want
+/// The `BodyResolver` allows mapping a `BodyId` to the corresponding `hir::Body`.
+/// We could also just store a plain reference to the `hir::Crate` but we want
/// to avoid that the crate is used to get untracked access to all of the HIR.
#[derive(Clone, Copy)]
struct BodyResolver<'tcx>(&'tcx hir::Crate);
impl<'tcx> BodyResolver<'tcx> {
- // Return a reference to the hir::Body with the given BodyId.
- // DOES NOT DO ANY TRACKING, use carefully.
+ /// Returns a reference to the `hir::Body` with the given `BodyId`.
+ /// **Does not do any tracking**; use carefully.
fn body(self, id: hir::BodyId) -> &'tcx hir::Body {
self.0.body(id)
}
}
impl<'a> StableHashingContext<'a> {
- // The `krate` here is only used for mapping BodyIds to Bodies.
- // Don't use it for anything else or you'll run the risk of
- // leaking data out of the tracking system.
+ /// The `krate` here is only used for mapping `BodyId`s to `Body`s.
+ /// Don't use it for anything else or you'll run the risk of
+ /// leaking data out of the tracking system.
#[inline]
pub fn new(sess: &'a Session,
krate: &'a hir::Crate,
@@ -217,9 +216,7 @@
}
}
-impl<'a> crate::dep_graph::DepGraphSafe for StableHashingContext<'a> {
-}
-
+impl<'a> crate::dep_graph::DepGraphSafe for StableHashingContext<'a> {}
impl<'a> HashStable<StableHashingContext<'a>> for hir::BodyId {
fn hash_stable<W: StableHasherResult>(&self,
@@ -292,16 +289,15 @@
}
impl<'a> HashStable<StableHashingContext<'a>> for Span {
-
- // Hash a span in a stable way. We can't directly hash the span's BytePos
- // fields (that would be similar to hashing pointers, since those are just
- // offsets into the SourceMap). Instead, we hash the (file name, line, column)
- // triple, which stays the same even if the containing SourceFile has moved
- // within the SourceMap.
- // Also note that we are hashing byte offsets for the column, not unicode
- // codepoint offsets. For the purpose of the hash that's sufficient.
- // Also, hashing filenames is expensive so we avoid doing it twice when the
- // span starts and ends in the same file, which is almost always the case.
+ /// Hashes a span in a stable way. We can't directly hash the span's `BytePos`
+ /// fields (that would be similar to hashing pointers, since those are just
+ /// offsets into the `SourceMap`). Instead, we hash the (file name, line, column)
+ /// triple, which stays the same even if the containing `SourceFile` has moved
+ /// within the `SourceMap`.
+ /// Also note that we are hashing byte offsets for the column, not unicode
+ /// codepoint offsets. For the purpose of the hash that's sufficient.
+ /// Also, hashing filenames is expensive so we avoid doing it twice when the
+ /// span starts and ends in the same file, which is almost always the case.
fn hash_stable<W: StableHasherResult>(&self,
hcx: &mut StableHashingContext<'a>,
hasher: &mut StableHasher<W>) {
@@ -340,7 +336,7 @@
}
std_hash::Hash::hash(&TAG_VALID_SPAN, hasher);
- // We truncate the stable_id hash and line and col numbers. The chances
+ // We truncate the stable ID hash and line and column numbers. The chances
// of causing a collision this way should be minimal.
std_hash::Hash::hash(&(file_lo.name_hash as u64), hasher);
diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs
index fb981d9..6e6492d 100644
--- a/src/librustc/ich/impls_hir.rs
+++ b/src/librustc/ich/impls_hir.rs
@@ -5,8 +5,10 @@
use crate::hir::map::DefPathHash;
use crate::hir::def_id::{DefId, LocalDefId, CrateNum, CRATE_DEF_INDEX};
use crate::ich::{StableHashingContext, NodeIdHashingMode, Fingerprint};
-use rustc_data_structures::stable_hasher::{HashStable, ToStableHashKey,
- StableHasher, StableHasherResult};
+
+use rustc_data_structures::stable_hasher::{
+ HashStable, ToStableHashKey, StableHasher, StableHasherResult,
+};
use smallvec::SmallVec;
use std::mem;
use syntax::ast;
@@ -82,9 +84,9 @@
}
}
-// The following implementations of HashStable for ItemId, TraitItemId, and
-// ImplItemId deserve special attention. Normally we do not hash NodeIds within
-// the HIR, since they just signify a HIR nodes own path. But ItemId et al
+// The following implementations of HashStable for `ItemId`, `TraitItemId`, and
+// `ImplItemId` deserve special attention. Normally we do not hash `NodeId`s within
+// the HIR, since they just signify a HIR nodes own path. But `ItemId` et al
// are used when another item in the HIR is *referenced* and we certainly
// want to pick up on a reference changing its target, so we hash the NodeIds
// in "DefPath Mode".
@@ -131,7 +133,6 @@
}
}
-
impl_stable_hash_for!(struct ast::Label {
ident
});
@@ -241,7 +242,7 @@
}
}
-impl_stable_hash_for!(enum ::syntax::ast::CrateSugar {
+impl_stable_hash_for!(enum ast::CrateSugar {
JustCrate,
PubCrate,
});
@@ -365,8 +366,7 @@
}
}
-impl<'a> ToStableHashKey<StableHashingContext<'a>>
-for hir::def_id::DefIndex {
+impl<'a> ToStableHashKey<StableHashingContext<'a>> for hir::def_id::DefIndex {
type KeyType = DefPathHash;
#[inline]
diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
index ddfca3a..a33181e 100644
--- a/src/librustc/ich/impls_syntax.rs
+++ b/src/librustc/ich/impls_syntax.rs
@@ -115,9 +115,10 @@
hasher: &mut StableHasher<W>) {
mem::discriminant(self).hash_stable(hcx, hasher);
match *self {
- ::syntax::attr::StabilityLevel::Unstable { ref reason, ref issue } => {
+ ::syntax::attr::StabilityLevel::Unstable { ref reason, ref issue, ref is_soft } => {
reason.hash_stable(hcx, hasher);
issue.hash_stable(hcx, hasher);
+ is_soft.hash_stable(hcx, hasher);
}
::syntax::attr::StabilityLevel::Stable { ref since } => {
since.hash_stable(hcx, hasher);
@@ -390,9 +391,17 @@
impl_stable_hash_for!(enum ::syntax_pos::hygiene::ExpnKind {
Root,
Macro(kind, descr),
+ AstPass(kind),
Desugaring(kind)
});
+impl_stable_hash_for!(enum ::syntax_pos::hygiene::AstPass {
+ StdImports,
+ TestHarness,
+ ProcMacroHarness,
+ PluginMacroDefs,
+});
+
impl_stable_hash_for!(enum ::syntax_pos::hygiene::DesugaringKind {
CondTemporary,
Async,
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index be7669f..f230c53 100644
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -204,7 +204,7 @@
fn hash_stable<W: StableHasherResult>(&self,
_hcx: &mut StableHashingContext<'a>,
_hasher: &mut StableHasher<W>) {
- // TyVid values are confined to an inference context and hence
+ // `TyVid` values are confined to an inference context and hence
// should not be hashed.
bug!("ty::TyKind::hash_stable() - can't hash a TyVid {:?}.", *self)
}
@@ -214,7 +214,7 @@
fn hash_stable<W: StableHasherResult>(&self,
_hcx: &mut StableHashingContext<'a>,
_hasher: &mut StableHasher<W>) {
- // IntVid values are confined to an inference context and hence
+ // `IntVid` values are confined to an inference context and hence
// should not be hashed.
bug!("ty::TyKind::hash_stable() - can't hash an IntVid {:?}.", *self)
}
@@ -224,7 +224,7 @@
fn hash_stable<W: StableHasherResult>(&self,
_hcx: &mut StableHashingContext<'a>,
_hasher: &mut StableHasher<W>) {
- // FloatVid values are confined to an inference context and hence
+ // `FloatVid` values are confined to an inference context and hence
// should not be hashed.
bug!("ty::TyKind::hash_stable() - can't hash a FloatVid {:?}.", *self)
}
diff --git a/src/librustc/infer/mod.rs b/src/librustc/infer/mod.rs
index cc28567e..8638f42 100644
--- a/src/librustc/infer/mod.rs
+++ b/src/librustc/infer/mod.rs
@@ -1321,13 +1321,13 @@
T: TypeFoldable<'tcx>,
{
if !value.needs_infer() {
- return value.clone(); // avoid duplicated subst-folding
+ return value.clone(); // Avoid duplicated subst-folding.
}
let mut r = resolve::OpportunisticVarResolver::new(self);
value.fold_with(&mut r)
}
- /// Returns first unresolved variable contained in `T`. In the
+ /// Returns the first unresolved variable contained in `T`. In the
/// process of visiting `T`, this will resolve (where possible)
/// type variables in `T`, but it never constructs the final,
/// resolved type, so it's more efficient than
@@ -1462,7 +1462,7 @@
let copy_def_id = self.tcx.require_lang_item(lang_items::CopyTraitLangItem, None);
- // this can get called from typeck (by euv), and moves_by_default
+ // This can get called from typeck (by euv), and `moves_by_default`
// rightly refuses to work with inference variables, but
// moves_by_default has a cache, which we want to use in other
// cases.
@@ -1482,7 +1482,7 @@
closure_kind_ty.to_opt_closure_kind()
}
- /// Obtain the signature of a closure. For closures, unlike
+ /// Obtains the signature of a closure. For closures, unlike
/// `tcx.fn_sig(def_id)`, this method will work during the
/// type-checking of the enclosing function and return the closure
/// signature in its partially inferred state.
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 368f5bb..63ef82a 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -45,7 +45,6 @@
#![feature(non_exhaustive)]
#![feature(optin_builtin_traits)]
#![feature(range_is_empty)]
-#![feature(rustc_diagnostic_macros)]
#![feature(slice_patterns)]
#![feature(specialization)]
#![feature(unboxed_closures)]
@@ -88,8 +87,6 @@
#[macro_use]
mod macros;
-// N.B., this module needs to be declared first so diagnostics are
-// registered before they are used.
pub mod error_codes;
#[macro_use]
@@ -97,7 +94,6 @@
#[macro_use]
pub mod arena;
-pub mod cfg;
pub mod dep_graph;
pub mod hir;
pub mod ich;
@@ -143,6 +139,3 @@
// Allows macros to refer to this crate as `::rustc`
extern crate self as rustc;
-
-// Build the diagnostics array at the end so that the metadata includes error use sites.
-__build_diagnostic_array! { librustc, DIAGNOSTICS }
diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index 6d9a6bb..dd29057 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -395,6 +395,12 @@
"reservation of a two-phased borrow conflicts with other shared borrows"
}
+declare_lint! {
+ pub SOFT_UNSTABLE,
+ Deny,
+ "a feature gate that doesn't break dependent crates"
+}
+
declare_lint_pass! {
/// Does nothing as a lint pass, but registers some `Lint`s
/// that are used by other parts of the compiler.
@@ -460,6 +466,7 @@
NESTED_IMPL_TRAIT,
MUTABLE_BORROW_RESERVATION_CONFLICT,
INDIRECT_STRUCTURAL_MATCH,
+ SOFT_UNSTABLE,
]
}
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs
index 77df930..c658120 100644
--- a/src/librustc/lint/context.rs
+++ b/src/librustc/lint/context.rs
@@ -16,32 +16,32 @@
use self::TargetLint::*;
-use std::slice;
-use rustc_data_structures::sync::{ReadGuard, Lock, ParallelIterator, join, par_iter};
+use crate::hir;
+use crate::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
+use crate::hir::intravisit as hir_visit;
+use crate::hir::intravisit::Visitor;
+use crate::hir::map::{definitions::DisambiguatedDefPathData, DefPathData};
use crate::lint::{EarlyLintPass, LateLintPass, EarlyLintPassObject, LateLintPassObject};
use crate::lint::{LintArray, Level, Lint, LintId, LintPass, LintBuffer};
use crate::lint::builtin::BuiltinLintDiagnostics;
use crate::lint::levels::{LintLevelSets, LintLevelsBuilder};
use crate::middle::privacy::AccessLevels;
-use rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
use crate::session::{config, early_error, Session};
use crate::ty::{self, print::Printer, subst::Kind, TyCtxt, Ty};
use crate::ty::layout::{LayoutError, LayoutOf, TyLayout};
use crate::util::nodemap::FxHashMap;
use crate::util::common::time;
+use errors::DiagnosticBuilder;
+use std::slice;
use std::default::Default as StdDefault;
+use rustc_data_structures::sync::{ReadGuard, Lock, ParallelIterator, join, par_iter};
+use rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
use syntax::ast;
use syntax::edition;
-use syntax_pos::{MultiSpan, Span, symbol::Symbol};
-use errors::DiagnosticBuilder;
-use crate::hir;
-use crate::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
-use crate::hir::intravisit as hir_visit;
-use crate::hir::intravisit::Visitor;
-use crate::hir::map::{definitions::DisambiguatedDefPathData, DefPathData};
use syntax::util::lev_distance::find_best_match_for_name;
use syntax::visit as ast_visit;
+use syntax_pos::{MultiSpan, Span, symbol::Symbol};
/// Information about the registered lints.
///
diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs
index a3518b2..5b490b7 100644
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@ -646,6 +646,30 @@
(Level::Forbid, None) => sess.struct_err(msg),
};
+ // Check for future incompatibility lints and issue a stronger warning.
+ let lints = sess.lint_store.borrow();
+ let lint_id = LintId::of(lint);
+ let future_incompatible = lints.future_incompatible(lint_id);
+
+ // If this code originates in a foreign macro, aka something that this crate
+ // did not itself author, then it's likely that there's nothing this crate
+ // can do about it. We probably want to skip the lint entirely.
+ if err.span.primary_spans().iter().any(|s| in_external_macro(sess, *s)) {
+ // Any suggestions made here are likely to be incorrect, so anything we
+ // emit shouldn't be automatically fixed by rustfix.
+ err.allow_suggestions(false);
+
+ // If this is a future incompatible lint it'll become a hard error, so
+ // we have to emit *something*. Also allow lints to whitelist themselves
+ // on a case-by-case basis for emission in a foreign macro.
+ if future_incompatible.is_none() && !lint.report_in_external_macro {
+ err.cancel();
+ // Don't continue further, since we don't want to have
+ // `diag_span_note_once` called for a diagnostic that isn't emitted.
+ return err;
+ }
+ }
+
let name = lint.name_lower();
match src {
LintSource::Default => {
@@ -695,10 +719,6 @@
err.code(DiagnosticId::Lint(name));
- // Check for future incompatibility lints and issue a stronger warning.
- let lints = sess.lint_store.borrow();
- let lint_id = LintId::of(lint);
- let future_incompatible = lints.future_incompatible(lint_id);
if let Some(future_incompatible) = future_incompatible {
const STANDARD_MESSAGE: &str =
"this was previously accepted by the compiler but is being phased out; \
@@ -723,22 +743,6 @@
err.note(&citation);
}
- // If this code originates in a foreign macro, aka something that this crate
- // did not itself author, then it's likely that there's nothing this crate
- // can do about it. We probably want to skip the lint entirely.
- if err.span.primary_spans().iter().any(|s| in_external_macro(sess, *s)) {
- // Any suggestions made here are likely to be incorrect, so anything we
- // emit shouldn't be automatically fixed by rustfix.
- err.allow_suggestions(false);
-
- // If this is a future incompatible lint it'll become a hard error, so
- // we have to emit *something*. Also allow lints to whitelist themselves
- // on a case-by-case basis for emission in a foreign macro.
- if future_incompatible.is_none() && !lint.report_in_external_macro {
- err.cancel()
- }
- }
-
return err
}
@@ -868,15 +872,15 @@
let expn_data = span.ctxt().outer_expn_data();
match expn_data.kind {
ExpnKind::Root | ExpnKind::Desugaring(DesugaringKind::ForLoop) => false,
- ExpnKind::Desugaring(_) => true, // well, it's "external"
+ ExpnKind::AstPass(_) | ExpnKind::Desugaring(_) => true, // well, it's "external"
ExpnKind::Macro(MacroKind::Bang, _) => {
if expn_data.def_site.is_dummy() {
- // dummy span for the def_site means it's an external macro
+ // Dummy span for the `def_site` means it's an external macro.
return true;
}
match sess.source_map().span_to_snippet(expn_data.def_site) {
Ok(code) => !code.starts_with("macro_rules"),
- // no snippet = external macro or compiler-builtin expansion
+ // No snippet means external macro or compiler-builtin expansion.
Err(_) => true,
}
}
@@ -884,7 +888,7 @@
}
}
-/// Returns whether `span` originates in a derive macro's expansion
+/// Returns `true` if `span` originates in a derive-macro's expansion.
pub fn in_derive_expansion(span: Span) -> bool {
if let ExpnKind::Macro(MacroKind::Derive, _) = span.ctxt().outer_expn_data().kind {
return true;
diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs
index 53c099c..93bb301 100644
--- a/src/librustc/middle/entry.rs
+++ b/src/librustc/middle/entry.rs
@@ -16,17 +16,17 @@
map: &'a hir_map::Map<'tcx>,
- // The top-level function called 'main'
+ /// The top-level function called 'main'.
main_fn: Option<(HirId, Span)>,
- // The function that has attribute named 'main'
+ /// The function that has attribute named 'main'.
attr_main_fn: Option<(HirId, Span)>,
- // The function that has the attribute 'start' on it
+ /// The function that has the attribute 'start' on it.
start_fn: Option<(HirId, Span)>,
- // The functions that one might think are 'main' but aren't, e.g.
- // main functions not defined at the top level. For diagnostics.
+ /// The functions that one might think are 'main' but aren't, e.g.
+ /// main functions not defined at the top level. For diagnostics.
non_main_fns: Vec<(HirId, Span)> ,
}
@@ -39,11 +39,11 @@
}
fn visit_trait_item(&mut self, _trait_item: &'tcx TraitItem) {
- // entry fn is never a trait item
+ // Entry fn is never a trait item.
}
fn visit_impl_item(&mut self, _impl_item: &'tcx ImplItem) {
- // entry fn is never an impl item
+ // Entry fn is never a trait item.
}
}
@@ -54,7 +54,7 @@
*ty == config::CrateType::Executable
});
if !any_exe {
- // No need to find a main function
+ // No need to find a main function.
return None;
}
@@ -148,7 +148,7 @@
} else if let Some((hir_id, _)) = visitor.main_fn {
Some((tcx.hir().local_def_id(hir_id), EntryFnType::Main))
} else {
- // No main function
+ // There is no main function.
let mut err = struct_err!(tcx.sess, E0601,
"`main` function not found in crate `{}`", tcx.crate_name(LOCAL_CRATE));
if !visitor.non_main_fns.is_empty() {
diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs
index 222c2a4..de6dada 100644
--- a/src/librustc/middle/expr_use_visitor.rs
+++ b/src/librustc/middle/expr_use_visitor.rs
@@ -596,7 +596,7 @@
}
hir::StmtKind::Item(_) => {
- // we don't visit nested items in this visitor,
+ // We don't visit nested items in this visitor,
// only the fn body we were given.
}
diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs
index 6b04600..c5d9a72 100644
--- a/src/librustc/middle/lang_items.rs
+++ b/src/librustc/middle/lang_items.rs
@@ -3,10 +3,8 @@
//! Language items are items that represent concepts intrinsic to the language
//! itself. Examples are:
//!
-//! * Traits that specify "kinds"; e.g., "Sync", "Send".
-//!
-//! * Traits that represent operators; e.g., "Add", "Sub", "Index".
-//!
+//! * Traits that specify "kinds"; e.g., `Sync`, `Send`.
+//! * Traits that represent operators; e.g., `Add`, `Sub`, `Index`.
//! * Functions called by the compiler itself.
pub use self::LangItem::*;
@@ -151,11 +149,11 @@
}
fn visit_trait_item(&mut self, _trait_item: &hir::TraitItem) {
- // at present, lang items are always items, not trait items
+ // At present, lang items are always items, not trait items.
}
fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem) {
- // at present, lang items are always items, not impl items
+ // At present, lang items are always items, not impl items.
}
}
@@ -204,7 +202,7 @@
}
}
-/// Extract the first `lang = "$name"` out of a list of attributes.
+/// Extracts the first `lang = "$name"` out of a list of attributes.
/// The attributes `#[panic_handler]` and `#[alloc_error_handler]`
/// are also extracted out when found.
pub fn extract(attrs: &[ast::Attribute]) -> Option<(Symbol, Span)> {
@@ -216,7 +214,7 @@
}))
}
-/// Traverse and collect all the lang items in all crates.
+/// Traverses and collects all the lang items in all crates.
pub fn collect<'tcx>(tcx: TyCtxt<'tcx>) -> LanguageItems {
// Initialize the collector.
let mut collector = LanguageItemCollector::new(tcx);
@@ -246,6 +244,7 @@
language_item_table! {
// Variant name, Name, Method name, Target;
+ BoolImplItem, "bool", bool_impl, Target::Impl;
CharImplItem, "char", char_impl, Target::Impl;
StrImplItem, "str", str_impl, Target::Impl;
SliceImplItem, "slice", slice_impl, Target::Impl;
@@ -367,7 +366,7 @@
MaybeUninitLangItem, "maybe_uninit", maybe_uninit, Target::Union;
- // Align offset for stride != 1, must not panic.
+ // Align offset for stride != 1; must not panic.
AlignOffsetLangItem, "align_offset", align_offset_fn, Target::Fn;
TerminationTraitLangItem, "termination", termination, Target::Trait;
@@ -378,7 +377,7 @@
impl<'tcx> TyCtxt<'tcx> {
/// Returns the `DefId` for a given `LangItem`.
- /// If not found, fatally abort compilation.
+ /// If not found, fatally aborts compilation.
pub fn require_lang_item(&self, lang_item: LangItem, span: Option<Span>) -> DefId {
self.lang_items().require(lang_item).unwrap_or_else(|msg| {
if let Some(span) = span {
diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs
index 28aa86e..b9d8a4e 100644
--- a/src/librustc/middle/region.rs
+++ b/src/librustc/middle/region.rs
@@ -6,29 +6,27 @@
//!
//! [rustc guide]: https://rust-lang.github.io/rustc-guide/mir/borrowck.html
-use crate::ich::{StableHashingContext, NodeIdHashingMode};
-use crate::util::nodemap::{FxHashMap, FxHashSet};
-use crate::ty;
-
-use std::mem;
-use std::fmt;
-use rustc_macros::HashStable;
-use syntax::source_map;
-use syntax_pos::{Span, DUMMY_SP};
-use crate::ty::{DefIdTree, TyCtxt};
-use crate::ty::query::Providers;
-
use crate::hir;
use crate::hir::Node;
use crate::hir::def_id::DefId;
use crate::hir::intravisit::{self, Visitor, NestedVisitorMap};
use crate::hir::{Block, Arm, Pat, PatKind, Stmt, Expr, Local};
-use rustc_data_structures::indexed_vec::Idx;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher,
- StableHasherResult};
+use crate::ich::{StableHashingContext, NodeIdHashingMode};
+use crate::util::nodemap::{FxHashMap, FxHashSet};
+use crate::ty::{self, DefIdTree, TyCtxt};
+use crate::ty::query::Providers;
-/// Scope represents a statically-describable scope that can be
-/// used to bound the lifetime/region for values.
+use rustc_data_structures::indexed_vec::Idx;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher, StableHasherResult};
+use rustc_macros::HashStable;
+use syntax::source_map;
+use syntax_pos::{Span, DUMMY_SP};
+
+use std::fmt;
+use std::mem;
+
+/// Represents a statically-describable scope that can be used to
+/// bound the lifetime/region for values.
///
/// `Node(node_id)`: Any AST node that has any scope at all has the
/// `Node(node_id)` scope. Other variants represent special cases not
@@ -225,7 +223,7 @@
/// have lifetime parameters free in this body.
root_parent: Option<hir::HirId>,
- /// `parent_map` maps from a scope ID to the enclosing scope id;
+ /// Maps from a scope ID to the enclosing scope id;
/// this is usually corresponding to the lexical nesting, though
/// in the case of closures the parent scope is the innermost
/// conditional expression or repeating block. (Note that the
@@ -233,17 +231,17 @@
/// the closure itself.)
parent_map: FxHashMap<Scope, (Scope, ScopeDepth)>,
- /// `var_map` maps from a variable or binding ID to the block in
- /// which that variable is declared.
+ /// Maps from a variable or binding ID to the block in which that
+ /// variable is declared.
var_map: FxHashMap<hir::ItemLocalId, Scope>,
- /// maps from a `NodeId` to the associated destruction scope (if any)
+ /// Maps from a `NodeId` to the associated destruction scope (if any).
destruction_scopes: FxHashMap<hir::ItemLocalId, Scope>,
- /// `rvalue_scopes` includes entries for those expressions whose cleanup scope is
- /// larger than the default. The map goes from the expression id
- /// to the cleanup scope id. For rvalues not present in this
- /// table, the appropriate cleanup scope is the innermost
+ /// `rvalue_scopes` includes entries for those expressions whose
+ /// cleanup scope is larger than the default. The map goes from the
+ /// expression ID to the cleanup scope id. For rvalues not present in
+ /// this table, the appropriate cleanup scope is the innermost
/// enclosing statement, conditional expression, or repeating
/// block (see `terminating_scopes`).
/// In constants, None is used to indicate that certain expressions
@@ -318,7 +316,7 @@
/// 4. By `2.` and `3.`, `D` is *statically* storage-dead at `U`,
/// QED.
///
- /// I don't think this property relies on `3.` in an essential way - it
+ /// This property ought to not on (3) in an essential way -- it
/// is probably still correct even if we have "unrestricted" terminating
/// scopes. However, why use the complicated proof when a simple one
/// works?
@@ -341,20 +339,20 @@
#[derive(Debug, Copy, Clone, RustcEncodable, RustcDecodable, HashStable)]
pub struct YieldData {
- /// `Span` of the yield.
+ /// The `Span` of the yield.
pub span: Span,
- /// The number of expressions and patterns appearing before the `yield` in the body + 1.
+ /// The number of expressions and patterns appearing before the `yield` in the body plus one.
pub expr_and_pat_count: usize,
pub source: hir::YieldSource,
}
#[derive(Debug, Copy, Clone)]
pub struct Context {
- /// the root of the current region tree. This is typically the id
+ /// The root of the current region tree. This is typically the id
/// of the innermost fn body. Each fn forms its own disjoint tree
/// in the region hierarchy. These fn bodies are themselves
/// arranged into a tree. See the "Modeling closures" section of
- /// the README in infer::region_constraints for more
+ /// the README in `infer::region_constraints` for more
/// details.
root_id: Option<hir::ItemLocalId>,
@@ -369,15 +367,15 @@
struct RegionResolutionVisitor<'tcx> {
tcx: TyCtxt<'tcx>,
- // The number of expressions and patterns visited in the current body
+ // The number of expressions and patterns visited in the current body.
expr_and_pat_count: usize,
// When this is `true`, we record the `Scopes` we encounter
// when processing a Yield expression. This allows us to fix
// up their indices.
pessimistic_yield: bool,
- // Stores scopes when pessimistic_yield is true.
+ // Stores scopes when `pessimistic_yield` is `true`.
fixup_scopes: Vec<Scope>,
- // Generated scope tree:
+ // The generated scope tree.
scope_tree: ScopeTree,
cx: Context,
@@ -411,7 +409,7 @@
expr_and_pat_count: usize,
}
-// This visitor has to have the same visit_expr calls as RegionResolutionVisitor
+// This visitor has to have the same `visit_expr` calls as `RegionResolutionVisitor`
// since `expr_count` is compared against the results there.
impl<'tcx> Visitor<'tcx> for ExprLocatorVisitor {
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
@@ -456,7 +454,7 @@
assert!(prev.is_none());
}
- // record the destruction scopes for later so we can query them
+ // Record the destruction scopes for later so we can query them.
if let ScopeData::Destruction = child.data {
self.destruction_scopes.insert(child.item_local_id(), child);
}
@@ -478,7 +476,7 @@
self.destruction_scopes.get(&n).cloned()
}
- /// Records that `sub_closure` is defined within `sup_closure`. These ids
+ /// Records that `sub_closure` is defined within `sup_closure`. These IDs
/// should be the ID of the block that is the fn body, which is
/// also the root of the region hierarchy for that fn.
fn record_closure_parent(&mut self,
@@ -505,14 +503,14 @@
self.rvalue_scopes.insert(var, lifetime);
}
+ /// Returns the narrowest scope that encloses `id`, if any.
pub fn opt_encl_scope(&self, id: Scope) -> Option<Scope> {
- //! Returns the narrowest scope that encloses `id`, if any.
self.parent_map.get(&id).cloned().map(|(p, _)| p)
}
+ /// Returns the narrowest scope that encloses `id`, if any.
#[allow(dead_code)] // used in cfg
pub fn encl_scope(&self, id: Scope) -> Scope {
- //! Returns the narrowest scope that encloses `id`, if any.
self.opt_encl_scope(id).unwrap()
}
@@ -522,16 +520,15 @@
bug!("no enclosing scope for id {:?}", var_id))
}
+ /// Returns the scope when the temp created by `expr_id` will be cleaned up.
pub fn temporary_scope(&self, expr_id: hir::ItemLocalId) -> Option<Scope> {
- //! Returns the scope when temp created by expr_id will be cleaned up
-
- // check for a designated rvalue scope
+ // Check for a designated rvalue scope.
if let Some(&s) = self.rvalue_scopes.get(&expr_id) {
debug!("temporary_scope({:?}) = {:?} [custom]", expr_id, s);
return s;
}
- // else, locate the innermost terminating scope
+ // Otherwise, locate the innermost terminating scope
// if there's one. Static items, for instance, won't
// have an enclosing scope, hence no scope will be
// returned.
@@ -552,9 +549,8 @@
return None;
}
+ /// Returns the lifetime of the variable `id`.
pub fn var_region(&self, id: hir::ItemLocalId) -> ty::RegionKind {
- //! Returns the lifetime of the variable `id`.
-
let scope = ty::ReScope(self.var_scope(id));
debug!("var_region({:?}) = {:?}", id, scope);
scope
@@ -589,7 +585,7 @@
return true;
}
- /// Returns the ID of the innermost containing body
+ /// Returns the ID of the innermost containing body.
pub fn containing_body(&self, mut scope: Scope) -> Option<hir::ItemLocalId> {
loop {
if let ScopeData::CallSite = scope.data {
diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs
index d02259b..c06a0fe 100644
--- a/src/librustc/middle/stability.rs
+++ b/src/librustc/middle/stability.rs
@@ -438,6 +438,7 @@
level: attr::StabilityLevel::Unstable {
reason: Some(Symbol::intern(reason)),
issue: 27812,
+ is_soft: false,
},
feature: sym::rustc_private,
rustc_depr: None,
@@ -480,7 +481,7 @@
}
pub fn report_unstable(
- sess: &Session, feature: Symbol, reason: Option<Symbol>, issue: u32, span: Span
+ sess: &Session, feature: Symbol, reason: Option<Symbol>, issue: u32, is_soft: bool, span: Span
) {
let msg = match reason {
Some(r) => format!("use of unstable library feature '{}': {}", feature, r),
@@ -505,7 +506,13 @@
let error_id = (DiagnosticMessageId::StabilityId(issue), span_key, msg.clone());
let fresh = sess.one_time_diagnostics.borrow_mut().insert(error_id);
if fresh {
- emit_feature_err(&sess.parse_sess, feature, span, GateIssue::Library(Some(issue)), &msg);
+ if is_soft {
+ sess.buffer_lint(lint::builtin::SOFT_UNSTABLE, CRATE_NODE_ID, span, &msg);
+ } else {
+ emit_feature_err(
+ &sess.parse_sess, feature, span, GateIssue::Library(Some(issue)), &msg
+ );
+ }
}
}
@@ -621,6 +628,7 @@
feature: Symbol,
reason: Option<Symbol>,
issue: u32,
+ is_soft: bool,
},
/// The item does not have the `#[stable]` or `#[unstable]` marker assigned.
Unmarked,
@@ -720,7 +728,9 @@
}
match stability {
- Some(&Stability { level: attr::Unstable { reason, issue }, feature, .. }) => {
+ Some(&Stability {
+ level: attr::Unstable { reason, issue, is_soft }, feature, ..
+ }) => {
if span.allows_unstable(feature) {
debug!("stability: skipping span={:?} since it is internal", span);
return EvalResult::Allow;
@@ -744,7 +754,7 @@
}
}
- EvalResult::Deny { feature, reason, issue }
+ EvalResult::Deny { feature, reason, issue, is_soft }
}
Some(_) => {
// Stable APIs are always ok to call and deprecated APIs are
@@ -767,8 +777,8 @@
pub fn check_stability(self, def_id: DefId, id: Option<HirId>, span: Span) {
match self.eval_stability(def_id, id, span) {
EvalResult::Allow => {}
- EvalResult::Deny { feature, reason, issue } =>
- report_unstable(self.sess, feature, reason, issue, span),
+ EvalResult::Deny { feature, reason, issue, is_soft } =>
+ report_unstable(self.sess, feature, reason, issue, is_soft, span),
EvalResult::Unmarked => {
// The API could be uncallable for other reasons, for example when a private module
// was referenced.
diff --git a/src/librustc/middle/weak_lang_items.rs b/src/librustc/middle/weak_lang_items.rs
index 4fb88da..fa5fa22 100644
--- a/src/librustc/middle/weak_lang_items.rs
+++ b/src/librustc/middle/weak_lang_items.rs
@@ -116,8 +116,8 @@
}
impl<'a, 'tcx> Context<'a, 'tcx> {
- fn register(&mut self, name: &str, span: Span) {
- $(if name == stringify!($name) {
+ fn register(&mut self, name: Symbol, span: Span) {
+ $(if name == sym::$name {
if self.items.$name().is_none() {
self.items.missing.push(lang_items::$item);
}
@@ -136,7 +136,7 @@
fn visit_foreign_item(&mut self, i: &hir::ForeignItem) {
if let Some((lang_item, _)) = lang_items::extract(&i.attrs) {
- self.register(&lang_item.as_str(), i.span);
+ self.register(lang_item, i.span);
}
intravisit::walk_foreign_item(self, i)
}
diff --git a/src/librustc/mir/cache.rs b/src/librustc/mir/cache.rs
index 3d33e24..1f60487 100644
--- a/src/librustc/mir/cache.rs
+++ b/src/librustc/mir/cache.rs
@@ -27,7 +27,7 @@
fn hash_stable<W: StableHasherResult>(&self,
_: &mut StableHashingContext<'a>,
_: &mut StableHasher<W>) {
- // do nothing
+ // Do nothing.
}
}
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs
index 13552a6..755cda7 100644
--- a/src/librustc/mir/interpret/allocation.rs
+++ b/src/librustc/mir/interpret/allocation.rs
@@ -4,16 +4,17 @@
Pointer, InterpResult, AllocId, ScalarMaybeUndef, write_target_uint, read_target_uint, Scalar,
};
-use crate::ty::layout::{Size, Align};
-use syntax::ast::Mutability;
-use std::iter;
use crate::mir;
-use std::ops::{Range, Deref, DerefMut};
+use crate::ty::layout::{Size, Align};
+
use rustc_data_structures::sorted_map::SortedMap;
use rustc_target::abi::HasDataLayout;
+use syntax::ast::Mutability;
+use std::iter;
+use std::ops::{Range, Deref, DerefMut};
use std::borrow::Cow;
-// NOTE: When adding new fields, make sure to adjust the Snapshot impl in
+// NOTE: When adding new fields, make sure to adjust the `Snapshot` impl in
// `src/librustc_mir/interpret/snapshot.rs`.
#[derive(
Clone,
@@ -27,7 +28,7 @@
RustcDecodable,
HashStable,
)]
-pub struct Allocation<Tag=(),Extra=()> {
+pub struct Allocation<Tag = (),Extra = ()> {
/// The actual bytes of the allocation.
/// Note that the bytes of a pointer represent the offset of the pointer.
bytes: Vec<u8>,
@@ -42,7 +43,7 @@
pub size: Size,
/// The alignment of the allocation to detect unaligned reads.
pub align: Align,
- /// Whether the allocation is mutable.
+ /// `true` if the allocation is mutable.
/// Also used by codegen to determine if a static should be put into mutable memory,
/// which happens for `static mut` and `static` with interior mutability.
pub mutability: Mutability,
@@ -50,7 +51,6 @@
pub extra: Extra,
}
-
pub trait AllocationExtra<Tag>: ::std::fmt::Debug + Clone {
// There is no constructor in here because the constructor's type depends
// on `MemoryKind`, and making things sufficiently generic leads to painful
@@ -92,7 +92,7 @@
}
}
-// For Tag=() and no extra state, we have is a trivial implementation.
+// For `Tag = ()` and no extra state, we have a trivial implementation.
impl AllocationExtra<()> for () { }
// The constructors are all without extra; the extra gets added by a machine hook later.
@@ -185,7 +185,7 @@
impl<'tcx> rustc_serialize::UseSpecializedDecodable for &'tcx Allocation {}
-/// Byte accessors
+/// Byte accessors.
impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
/// Just a small local helper function to avoid a bit of code repetition.
/// Returns the range of this allocation that was meant.
@@ -195,7 +195,7 @@
offset: Size,
size: Size
) -> Range<usize> {
- let end = offset + size; // this does overflow checking
+ let end = offset + size; // This does overflow checking.
assert_eq!(
end.bytes() as usize as u64, end.bytes(),
"cannot handle this access on this host architecture"
@@ -232,7 +232,7 @@
self.check_defined(ptr, size)?;
self.check_relocations(cx, ptr, size)?;
} else {
- // We still don't want relocations on the *edges*
+ // We still don't want relocations on the *edges*.
self.check_relocation_edges(cx, ptr, size)?;
}
@@ -241,7 +241,7 @@
Ok(&self.bytes[range])
}
- /// Check that these bytes are initialized and not pointer bytes, and then return them
+ /// Checks that these bytes are initialized and not pointer bytes, and then return them
/// as a slice.
///
/// It is the caller's responsibility to check bounds and alignment beforehand.
@@ -293,7 +293,7 @@
}
}
-/// Reading and writing
+/// Reading and writing.
impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
/// Reads bytes until a `0` is encountered. Will error if the end of the allocation is reached
/// before a `0` is found.
@@ -329,9 +329,9 @@
allow_ptr_and_undef: bool,
) -> InterpResult<'tcx>
{
- // Check bounds and relocations on the edges
+ // Check bounds and relocations on the edges.
self.get_bytes_with_undef_and_ptr(cx, ptr, size)?;
- // Check undef and ptr
+ // Check undef and ptr.
if !allow_ptr_and_undef {
self.check_defined(ptr, size)?;
self.check_relocations(cx, ptr, size)?;
@@ -372,12 +372,12 @@
Ok(())
}
- /// Read a *non-ZST* scalar
+ /// Reads a *non-ZST* scalar.
///
- /// zsts can't be read out of two reasons:
- /// * byteorder cannot work with zero element buffers
- /// * in order to obtain a `Pointer` we need to check for ZSTness anyway due to integer pointers
- /// being valid for ZSTs
+ /// ZSTs can't be read for two reasons:
+ /// * byte-order cannot work with zero-element buffers;
+ /// * in order to obtain a `Pointer`, we need to check for ZSTness anyway due to integer
+ /// pointers being valid for ZSTs.
///
/// It is the caller's responsibility to check bounds and alignment beforehand.
pub fn read_scalar(
@@ -387,20 +387,20 @@
size: Size
) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>>
{
- // get_bytes_unchecked tests relocation edges
+ // `get_bytes_unchecked` tests relocation edges.
let bytes = self.get_bytes_with_undef_and_ptr(cx, ptr, size)?;
// Undef check happens *after* we established that the alignment is correct.
- // We must not return Ok() for unaligned pointers!
+ // We must not return `Ok()` for unaligned pointers!
if self.check_defined(ptr, size).is_err() {
- // this inflates undefined bytes to the entire scalar, even if only a few
- // bytes are undefined
+ // This inflates undefined bytes to the entire scalar, even if only a few
+ // bytes are undefined.
return Ok(ScalarMaybeUndef::Undef);
}
- // Now we do the actual reading
+ // Now we do the actual reading.
let bits = read_target_uint(cx.data_layout().endian, bytes).unwrap();
- // See if we got a pointer
+ // See if we got a pointer.
if size != cx.data_layout().pointer_size {
- // *Now* better make sure that the inside also is free of relocations.
+ // *Now*, we better make sure that the inside is free of relocations too.
self.check_relocations(cx, ptr, size)?;
} else {
match self.relocations.get(&ptr.offset) {
@@ -415,7 +415,7 @@
Ok(ScalarMaybeUndef::Scalar(Scalar::from_uint(bits, size)))
}
- /// Read a pointer-sized scalar.
+ /// Reads a pointer-sized scalar.
///
/// It is the caller's responsibility to check bounds and alignment beforehand.
pub fn read_ptr_sized(
@@ -427,12 +427,12 @@
self.read_scalar(cx, ptr, cx.data_layout().pointer_size)
}
- /// Write a *non-ZST* scalar
+ /// Writes a *non-ZST* scalar.
///
- /// zsts can't be read out of two reasons:
- /// * byteorder cannot work with zero element buffers
- /// * in oder to obtain a `Pointer` we need to check for ZSTness anyway due to integer pointers
- /// being valid for ZSTs
+ /// ZSTs can't be read for two reasons:
+ /// * byte-order cannot work with zero-element buffers;
+ /// * in order to obtain a `Pointer`, we need to check for ZSTness anyway due to integer
+ /// pointers being valid for ZSTs.
///
/// It is the caller's responsibility to check bounds and alignment beforehand.
pub fn write_scalar(
@@ -460,7 +460,7 @@
let dst = self.get_bytes_mut(cx, ptr, type_size)?;
write_target_uint(endian, dst, bytes).unwrap();
- // See if we have to also write a relocation
+ // See if we have to also write a relocation.
match val {
Scalar::Ptr(val) => {
self.relocations.insert(
@@ -474,7 +474,7 @@
Ok(())
}
- /// Write a pointer-sized scalar.
+ /// Writes a pointer-sized scalar.
///
/// It is the caller's responsibility to check bounds and alignment beforehand.
pub fn write_ptr_sized(
@@ -489,9 +489,9 @@
}
}
-/// Relocations
+/// Relocations.
impl<'tcx, Tag: Copy, Extra> Allocation<Tag, Extra> {
- /// Returns all relocations overlapping with the given ptr-offset pair.
+ /// Returns all relocations overlapping with the given pointer-offset pair.
pub fn get_relocations(
&self,
cx: &impl HasDataLayout,
@@ -501,7 +501,7 @@
// We have to go back `pointer_size - 1` bytes, as that one would still overlap with
// the beginning of this range.
let start = ptr.offset.bytes().saturating_sub(cx.data_layout().pointer_size.bytes() - 1);
- let end = ptr.offset + size; // this does overflow checking
+ let end = ptr.offset + size; // This does overflow checking.
self.relocations.range(Size::from_bytes(start)..end)
}
@@ -561,7 +561,7 @@
Ok(())
}
- /// Error if there are relocations overlapping with the edges of the
+ /// Errors if there are relocations overlapping with the edges of the
/// given memory range.
#[inline]
fn check_relocation_edges(
@@ -577,7 +577,7 @@
}
-/// Undefined bytes
+/// Undefined bytes.
impl<'tcx, Tag, Extra> Allocation<Tag, Extra> {
/// Checks that a range of bytes is defined. If not, returns the `ReadUndefBytes`
/// error which will report the first byte which is undefined.
@@ -618,7 +618,7 @@
/// Transferring the definedness mask to other allocations.
impl<Tag, Extra> Allocation<Tag, Extra> {
- /// Creates a run-length encoding of the undef_mask.
+ /// Creates a run-length encoding of the undef mask.
pub fn compress_undef_range(
&self,
src: Pointer<Tag>,
@@ -631,10 +631,10 @@
// Therefor we precompute a compressed version of the undef mask of the source value and
// then write it back `repeat` times without computing any more information from the source.
- // a precomputed cache for ranges of defined/undefined bits
+ // A precomputed cache for ranges of defined/undefined bits
// 0000010010001110 will become
- // [5, 1, 2, 1, 3, 3, 1]
- // where each element toggles the state
+ // `[5, 1, 2, 1, 3, 3, 1]`,
+ // where each element toggles the state.
let mut ranges = smallvec::SmallVec::<[u64; 1]>::new();
let initial = self.undef_mask.get(src.offset);
@@ -642,7 +642,7 @@
let mut cur = initial;
for i in 1..size.bytes() {
- // FIXME: optimize to bitshift the current undef block's bits and read the top bit
+ // FIXME: optimize to bitshift the current undef block's bits and read the top bit.
if self.undef_mask.get(src.offset + Size::from_bytes(i)) == cur {
cur_len += 1;
} else {
@@ -657,7 +657,7 @@
AllocationDefinedness { ranges, initial, }
}
- /// Apply multiple instances of the run-length encoding to the undef_mask.
+ /// Applies multiple instances of the run-length encoding to the undef mask.
pub fn mark_compressed_undef_range(
&mut self,
defined: &AllocationDefinedness,
@@ -665,7 +665,7 @@
size: Size,
repeat: u64,
) {
- // an optimization where we can just overwrite an entire range of definedness bits if
+ // An optimization where we can just overwrite an entire range of definedness bits if
// they are going to be uniformly `1` or `0`.
if defined.ranges.len() <= 1 {
self.undef_mask.set_range_inbounds(
@@ -694,9 +694,9 @@
}
}
-/// Relocations
+/// Relocations.
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, RustcEncodable, RustcDecodable)]
-pub struct Relocations<Tag=(), Id=AllocId>(SortedMap<Size, (Tag, Id)>);
+pub struct Relocations<Tag = (), Id = AllocId>(SortedMap<Size, (Tag, Id)>);
impl<Tag, Id> Relocations<Tag, Id> {
pub fn new() -> Self {
@@ -766,7 +766,7 @@
}
}
- /// Apply a relocation copy.
+ /// Applies a relocation copy.
/// The affected range, as defined in the parameters to `prepare_relocation_copy` is expected
/// to be clear of relocations.
pub fn mark_relocation_range(
@@ -838,8 +838,8 @@
let (blocka, bita) = bit_index(start);
let (blockb, bitb) = bit_index(end);
if blocka == blockb {
- // first set all bits but the first `bita`
- // then unset the last `64 - bitb` bits
+ // First set all bits except the first `bita`,
+ // then unset the last `64 - bitb` bits.
let range = if bitb == 0 {
u64::max_value() << bita
} else {
@@ -854,24 +854,24 @@
}
// across block boundaries
if new_state {
- // set bita..64 to 1
+ // Set `bita..64` to `1`.
self.blocks[blocka] |= u64::max_value() << bita;
- // set 0..bitb to 1
+ // Set `0..bitb` to `1`.
if bitb != 0 {
self.blocks[blockb] |= u64::max_value() >> (64 - bitb);
}
- // fill in all the other blocks (much faster than one bit at a time)
+ // Fill in all the other blocks (much faster than one bit at a time).
for block in (blocka + 1) .. blockb {
self.blocks[block] = u64::max_value();
}
} else {
- // set bita..64 to 0
+ // Set `bita..64` to `0`.
self.blocks[blocka] &= !(u64::max_value() << bita);
- // set 0..bitb to 0
+ // Set `0..bitb` to `0`.
if bitb != 0 {
self.blocks[blockb] &= !(u64::max_value() >> (64 - bitb));
}
- // fill in all the other blocks (much faster than one bit at a time)
+ // Fill in all the other blocks (much faster than one bit at a time).
for block in (blocka + 1) .. blockb {
self.blocks[block] = 0;
}
@@ -908,7 +908,7 @@
let additional_blocks = amount.bytes() / Self::BLOCK_SIZE + 1;
assert_eq!(additional_blocks as usize as u64, additional_blocks);
self.blocks.extend(
- // FIXME(oli-obk): optimize this by repeating `new_state as Block`
+ // FIXME(oli-obk): optimize this by repeating `new_state as Block`.
iter::repeat(0).take(additional_blocks as usize),
);
}
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index 589a021..09c822f 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -1,23 +1,21 @@
-use std::{fmt, env};
+use super::{RawConst, Pointer, CheckInAllocMsg, ScalarMaybeUndef};
use crate::hir;
use crate::hir::map::definitions::DefPathData;
use crate::mir;
use crate::ty::{self, Ty, layout};
use crate::ty::layout::{Size, Align, LayoutError};
-use rustc_target::spec::abi::Abi;
-use rustc_macros::HashStable;
-
-use super::{RawConst, Pointer, CheckInAllocMsg, ScalarMaybeUndef};
+use crate::ty::query::TyCtxtAt;
use backtrace::Backtrace;
-
-use crate::ty::query::TyCtxtAt;
use errors::DiagnosticBuilder;
-
+use rustc_macros::HashStable;
+use rustc_target::spec::abi::Abi;
use syntax_pos::{Pos, Span};
use syntax::symbol::Symbol;
+use std::{fmt, env};
+
#[derive(Debug, Copy, Clone, PartialEq, Eq, HashStable, RustcEncodable, RustcDecodable)]
pub enum ErrorHandled {
/// Already reported a lint or an error for this evaluation.
@@ -582,7 +580,7 @@
impl fmt::Display for InterpError<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- // Forward `Display` to `Debug`
+ // Forward `Display` to `Debug`.
write!(f, "{:?}", self)
}
}
diff --git a/src/librustc/mir/interpret/mod.rs b/src/librustc/mir/interpret/mod.rs
index 1ec95c2..23433c2 100644
--- a/src/librustc/mir/interpret/mod.rs
+++ b/src/librustc/mir/interpret/mod.rs
@@ -1,4 +1,4 @@
-//! An interpreter for MIR used in CTFE and by miri
+//! An interpreter for MIR used in CTFE and by miri.
#[macro_export]
macro_rules! err_unsup {
@@ -107,21 +107,21 @@
pub use self::pointer::{Pointer, PointerArithmetic, CheckInAllocMsg};
-use std::fmt;
use crate::mir;
use crate::hir::def_id::DefId;
use crate::ty::{self, TyCtxt, Instance, subst::UnpackedKind};
+use crate::ty::codec::TyDecoder;
use crate::ty::layout::{self, Size};
use std::io;
+use std::fmt;
+use std::num::NonZeroU32;
+use std::sync::atomic::{AtomicU32, Ordering};
use rustc_serialize::{Encoder, Decodable, Encodable};
use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::sync::{Lock as Mutex, HashMapExt};
+use rustc_data_structures::sync::{Lock, HashMapExt};
use rustc_data_structures::tiny_list::TinyList;
use rustc_macros::HashStable;
use byteorder::{WriteBytesExt, ReadBytesExt, LittleEndian, BigEndian};
-use crate::ty::codec::TyDecoder;
-use std::sync::atomic::{AtomicU32, Ordering};
-use std::num::NonZeroU32;
/// Uniquely identifies a specific constant or static.
#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, RustcEncodable, RustcDecodable, HashStable)]
@@ -152,8 +152,8 @@
tcx: TyCtxt<'tcx>,
alloc_id: AllocId,
) -> Result<(), E::Error> {
- let alloc: GlobalAlloc<'tcx> =
- tcx.alloc_map.lock().get(alloc_id).expect("no value for AllocId");
+ let alloc: GlobalAlloc<'tcx> = tcx.alloc_map.lock().get(alloc_id)
+ .expect("no value for given alloc ID");
match alloc {
GlobalAlloc::Memory(alloc) => {
trace!("encoding {:?} with {:#?}", alloc_id, alloc);
@@ -166,8 +166,8 @@
fn_instance.encode(encoder)?;
}
GlobalAlloc::Static(did) => {
- // referring to statics doesn't need to know about their allocations,
- // just about its DefId
+ // References to statics doesn't need to know about their allocations,
+ // just about its `DefId`.
AllocDiscriminant::Static.encode(encoder)?;
did.encode(encoder)?;
}
@@ -187,19 +187,18 @@
}
pub struct AllocDecodingState {
- // For each AllocId we keep track of which decoding state it's currently in.
- decoding_state: Vec<Mutex<State>>,
+ // For each `AllocId`, we keep track of which decoding state it's currently in.
+ decoding_state: Vec<Lock<State>>,
// The offsets of each allocation in the data stream.
data_offsets: Vec<u32>,
}
impl AllocDecodingState {
-
pub fn new_decoding_session(&self) -> AllocDecodingSession<'_> {
static DECODER_SESSION_ID: AtomicU32 = AtomicU32::new(0);
let counter = DECODER_SESSION_ID.fetch_add(1, Ordering::SeqCst);
- // Make sure this is never zero
+ // Make sure this is never zero.
let session_id = DecodingSessionId::new((counter & 0x7FFFFFFF) + 1).unwrap();
AllocDecodingSession {
@@ -208,10 +207,10 @@
}
}
- pub fn new(data_offsets: Vec<u32>) -> AllocDecodingState {
- let decoding_state = vec![Mutex::new(State::Empty); data_offsets.len()];
+ pub fn new(data_offsets: Vec<u32>) -> Self {
+ let decoding_state = vec![Lock::new(State::Empty); data_offsets.len()];
- AllocDecodingState {
+ Self {
decoding_state,
data_offsets,
}
@@ -225,23 +224,23 @@
}
impl<'s> AllocDecodingSession<'s> {
- // Decodes an AllocId in a thread-safe way.
+ /// Decodes an `AllocId` in a thread-safe way.
pub fn decode_alloc_id<D>(&self, decoder: &mut D) -> Result<AllocId, D::Error>
where
D: TyDecoder<'tcx>,
{
- // Read the index of the allocation
+ // Read the index of the allocation.
let idx = decoder.read_u32()? as usize;
let pos = self.state.data_offsets[idx] as usize;
- // Decode the AllocDiscriminant now so that we know if we have to reserve an
- // AllocId.
+ // Decode the `AllocDiscriminant` now so that we know if we have to reserve an
+ // `AllocId`.
let (alloc_kind, pos) = decoder.with_position(pos, |decoder| {
let alloc_kind = AllocDiscriminant::decode(decoder)?;
Ok((alloc_kind, decoder.position()))
})?;
- // Check the decoding state, see if it's already decoded or if we should
+ // Check the decoding state to see if it's already decoded or if we should
// decode it here.
let alloc_id = {
let mut entry = self.state.decoding_state[idx].lock();
@@ -251,11 +250,11 @@
return Ok(alloc_id);
}
ref mut entry @ State::Empty => {
- // We are allowed to decode
+ // We are allowed to decode.
match alloc_kind {
AllocDiscriminant::Alloc => {
// If this is an allocation, we need to reserve an
- // AllocId so we can decode cyclic graphs.
+ // `AllocId` so we can decode cyclic graphs.
let alloc_id = decoder.tcx().alloc_map.lock().reserve();
*entry = State::InProgress(
TinyList::new_single(self.session_id),
@@ -263,8 +262,8 @@
Some(alloc_id)
},
AllocDiscriminant::Fn | AllocDiscriminant::Static => {
- // Fns and statics cannot be cyclic and their AllocId
- // is determined later by interning
+ // Fns and statics cannot be cyclic, and their `AllocId`
+ // is determined later by interning.
*entry = State::InProgressNonAlloc(
TinyList::new_single(self.session_id));
None
@@ -273,9 +272,9 @@
}
State::InProgressNonAlloc(ref mut sessions) => {
if sessions.contains(&self.session_id) {
- bug!("This should be unreachable")
+ bug!("this should be unreachable");
} else {
- // Start decoding concurrently
+ // Start decoding concurrently.
sessions.insert(self.session_id);
None
}
@@ -285,7 +284,7 @@
// Don't recurse.
return Ok(alloc_id)
} else {
- // Start decoding concurrently
+ // Start decoding concurrently.
sessions.insert(self.session_id);
Some(alloc_id)
}
@@ -293,20 +292,20 @@
}
};
- // Now decode the actual data
+ // Now decode the actual data.
let alloc_id = decoder.with_position(pos, |decoder| {
match alloc_kind {
AllocDiscriminant::Alloc => {
- let allocation = <&'tcx Allocation as Decodable>::decode(decoder)?;
- // We already have a reserved AllocId.
+ let alloc = <&'tcx Allocation as Decodable>::decode(decoder)?;
+ // We already have a reserved `AllocId`.
let alloc_id = alloc_id.unwrap();
- trace!("decoded alloc {:?} {:#?}", alloc_id, allocation);
- decoder.tcx().alloc_map.lock().set_alloc_id_same_memory(alloc_id, allocation);
+ trace!("decoded alloc {:?}: {:#?}", alloc_id, alloc);
+ decoder.tcx().alloc_map.lock().set_alloc_id_same_memory(alloc_id, alloc);
Ok(alloc_id)
},
AllocDiscriminant::Fn => {
assert!(alloc_id.is_none());
- trace!("creating fn alloc id");
+ trace!("creating fn alloc ID");
let instance = ty::Instance::decode(decoder)?;
trace!("decoded fn alloc instance: {:?}", instance);
let alloc_id = decoder.tcx().alloc_map.lock().create_fn_alloc(instance);
@@ -314,8 +313,9 @@
},
AllocDiscriminant::Static => {
assert!(alloc_id.is_none());
- trace!("creating extern static alloc id at");
+ trace!("creating extern static alloc ID");
let did = DefId::decode(decoder)?;
+ trace!("decoded static def-ID: {:?}", did);
let alloc_id = decoder.tcx().alloc_map.lock().create_static_alloc(did);
Ok(alloc_id)
}
@@ -340,7 +340,7 @@
/// a static, or a "real" allocation with some data in it.
#[derive(Debug, Clone, Eq, PartialEq, Hash, RustcDecodable, RustcEncodable, HashStable)]
pub enum GlobalAlloc<'tcx> {
- /// The alloc ID is used as a function pointer
+ /// The alloc ID is used as a function pointer.
Function(Instance<'tcx>),
/// The alloc ID points to a "lazy" static variable that did not get computed (yet).
/// This is also used to break the cycle in recursive statics.
@@ -350,16 +350,17 @@
}
pub struct AllocMap<'tcx> {
- /// Lets you know what an `AllocId` refers to.
+ /// Maps `AllocId`s to their corresponding allocations.
alloc_map: FxHashMap<AllocId, GlobalAlloc<'tcx>>,
/// Used to ensure that statics and functions only get one associated `AllocId`.
/// Should never contain a `GlobalAlloc::Memory`!
- /// FIXME: Should we just have two separate dedup maps for statics and functions each?
+ //
+ // FIXME: Should we just have two separate dedup maps for statics and functions each?
dedup: FxHashMap<GlobalAlloc<'tcx>, AllocId>,
/// The `AllocId` to assign to the next requested ID.
- /// Always incremented, never gets smaller.
+ /// Always incremented; never gets smaller.
next_id: AllocId,
}
@@ -389,7 +390,7 @@
next
}
- /// Reserve a new ID *if* this allocation has not been dedup-reserved before.
+ /// Reserves a new ID *if* this allocation has not been dedup-reserved before.
/// Should only be used for function pointers and statics, we don't want
/// to dedup IDs for "real" memory!
fn reserve_and_set_dedup(&mut self, alloc: GlobalAlloc<'tcx>) -> AllocId {
@@ -430,17 +431,17 @@
}
});
if is_generic {
- // Get a fresh ID
+ // Get a fresh ID.
let id = self.reserve();
self.alloc_map.insert(id, GlobalAlloc::Function(instance));
id
} else {
- // Deduplicate
+ // Deduplicate.
self.reserve_and_set_dedup(GlobalAlloc::Function(instance))
}
}
- /// Intern the `Allocation` and return a new `AllocId`, even if there's already an identical
+ /// Interns the `Allocation` and return a new `AllocId`, even if there's already an identical
/// `Allocation` with a different `AllocId`.
/// Statics with identical content will still point to the same `Allocation`, i.e.,
/// their data will be deduplicated through `Allocation` interning -- but they
@@ -465,19 +466,19 @@
pub fn unwrap_memory(&self, id: AllocId) -> &'tcx Allocation {
match self.get(id) {
Some(GlobalAlloc::Memory(mem)) => mem,
- _ => bug!("expected allocation id {} to point to memory", id),
+ _ => bug!("expected allocation ID {} to point to memory", id),
}
}
- /// Freeze an `AllocId` created with `reserve` by pointing it at an `Allocation`. Trying to
+ /// Freezes an `AllocId` created with `reserve` by pointing it at an `Allocation`. Trying to
/// call this function twice, even with the same `Allocation` will ICE the compiler.
pub fn set_alloc_id_memory(&mut self, id: AllocId, mem: &'tcx Allocation) {
if let Some(old) = self.alloc_map.insert(id, GlobalAlloc::Memory(mem)) {
- bug!("tried to set allocation id {}, but it was already existing as {:#?}", id, old);
+ bug!("tried to set allocation ID {}, but it was already existing as {:#?}", id, old);
}
}
- /// Freeze an `AllocId` created with `reserve` by pointing it at an `Allocation`. May be called
+ /// Freezes an `AllocId` created with `reserve` by pointing it at an `Allocation`. May be called
/// twice for the same `(AllocId, Allocation)` pair.
fn set_alloc_id_same_memory(&mut self, id: AllocId, mem: &'tcx Allocation) {
self.alloc_map.insert_same(id, GlobalAlloc::Memory(mem));
@@ -513,7 +514,7 @@
// Methods to facilitate working with signed integers stored in a u128
////////////////////////////////////////////////////////////////////////////////
-/// Truncate `value` to `size` bits and then sign-extend it to 128 bits
+/// Truncates `value` to `size` bits and then sign-extend it to 128 bits
/// (i.e., if it is negative, fill with 1's on the left).
#[inline]
pub fn sign_extend(value: u128, size: Size) -> u128 {
@@ -522,14 +523,14 @@
// Truncated until nothing is left.
return 0;
}
- // sign extend
+ // Sign-extend it.
let shift = 128 - size;
- // shift the unsigned value to the left
- // and back to the right as signed (essentially fills with FF on the left)
+ // Shift the unsigned value to the left, then shift back to the right as signed
+ // (essentially fills with FF on the left).
(((value << shift) as i128) >> shift) as u128
}
-/// Truncate `value` to `size` bits.
+/// Truncates `value` to `size` bits.
#[inline]
pub fn truncate(value: u128, size: Size) -> u128 {
let size = size.bits();
@@ -538,6 +539,6 @@
return 0;
}
let shift = 128 - size;
- // truncate (shift left to drop out leftover values, shift right to fill with zeroes)
+ // Truncate (shift left to drop out leftover values, shift right to fill with zeroes).
(value << shift) >> shift
}
diff --git a/src/librustc/mir/interpret/pointer.rs b/src/librustc/mir/interpret/pointer.rs
index b55e6bc..1bb4d9e 100644
--- a/src/librustc/mir/interpret/pointer.rs
+++ b/src/librustc/mir/interpret/pointer.rs
@@ -86,18 +86,17 @@
impl<T: layout::HasDataLayout> PointerArithmetic for T {}
-
-/// Pointer is generic over the type that represents a reference to Allocations,
+/// `Pointer` is generic over the type that represents a reference to `Allocation`s,
/// thus making it possible for the most convenient representation to be used in
/// each context.
///
-/// Defaults to the index based and loosely coupled AllocId.
+/// Defaults to the index based and loosely coupled `AllocId`.
///
/// Pointer is also generic over the `Tag` associated with each pointer,
/// which is used to do provenance tracking during execution.
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd,
RustcEncodable, RustcDecodable, Hash, HashStable)]
-pub struct Pointer<Tag=(),Id=AllocId> {
+pub struct Pointer<Tag = (), Id = AllocId> {
pub alloc_id: Id,
pub offset: Size,
pub tag: Tag,
@@ -117,7 +116,7 @@
}
}
-/// Produces a `Pointer` which points to the beginning of the Allocation
+/// Produces a `Pointer` which points to the beginning of the `Allocation`.
impl From<AllocId> for Pointer {
#[inline(always)]
fn from(alloc_id: AllocId) -> Self {
diff --git a/src/librustc/mir/interpret/value.rs b/src/librustc/mir/interpret/value.rs
index 3da5a65..d72d879 100644
--- a/src/librustc/mir/interpret/value.rs
+++ b/src/librustc/mir/interpret/value.rs
@@ -91,7 +91,7 @@
/// of a simple value or a pointer into another `Allocation`
#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd,
RustcEncodable, RustcDecodable, Hash, HashStable)]
-pub enum Scalar<Tag=(), Id=AllocId> {
+pub enum Scalar<Tag = (), Id = AllocId> {
/// The raw bytes of a simple value.
Raw {
/// The first `size` bytes of `data` are the value.
@@ -359,7 +359,7 @@
#[inline(always)]
pub fn assert_bits(self, target_size: Size) -> u128 {
- self.to_bits(target_size).expect("Expected Raw bits but got a Pointer")
+ self.to_bits(target_size).expect("expected Raw bits but got a Pointer")
}
/// Do not call this method! Use either `assert_ptr` or `force_ptr`.
@@ -374,7 +374,7 @@
#[inline(always)]
pub fn assert_ptr(self) -> Pointer<Tag> {
- self.to_ptr().expect("Expected a Pointer but got Raw bits")
+ self.to_ptr().expect("expected a Pointer but got Raw bits")
}
/// Do not call this method! Dispatch based on the type instead.
@@ -482,8 +482,8 @@
}
}
-#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RustcEncodable, RustcDecodable, Hash)]
-pub enum ScalarMaybeUndef<Tag=(), Id=AllocId> {
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, RustcEncodable, RustcDecodable)]
+pub enum ScalarMaybeUndef<Tag = (), Id = AllocId> {
Scalar(Scalar<Tag, Id>),
Undef,
}
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index 8956cbb..18a5142 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -18,6 +18,7 @@
self, AdtDef, CanonicalUserTypeAnnotations, ClosureSubsts, GeneratorSubsts, Region, Ty, TyCtxt,
UserTypeAnnotationIndex,
};
+
use polonius_engine::Atom;
use rustc_data_structures::bit_set::BitMatrix;
use rustc_data_structures::fx::FxHashSet;
@@ -70,7 +71,7 @@
/// The various "big phases" that MIR goes through.
///
-/// Warning: ordering of variants is significant
+/// Warning: ordering of variants is significant.
#[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug, PartialEq, Eq, PartialOrd, Ord)]
pub enum MirPhase {
Build = 0,
@@ -80,16 +81,16 @@
}
impl MirPhase {
- /// Gets the index of the current MirPhase within the set of all MirPhases.
+ /// Gets the index of the current MirPhase within the set of all `MirPhase`s.
pub fn phase_index(&self) -> usize {
*self as usize
}
}
-/// Lowered representation of a single function.
+/// The lowered representation of a single function.
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct Body<'tcx> {
- /// List of basic blocks. References to basic block use a newtyped index type `BasicBlock`
+ /// A list of basic blocks. References to basic block use a newtyped index type `BasicBlock`
/// that indexes into this vector.
basic_blocks: IndexVec<BasicBlock, BasicBlockData<'tcx>>,
@@ -100,7 +101,7 @@
/// us to see the difference and forego optimization on the inlined promoted items.
pub phase: MirPhase,
- /// List of source scopes; these are referenced by statements
+ /// A list of source scopes; these are referenced by statements
/// and used for debuginfo. Indexed by a `SourceScope`.
pub source_scopes: IndexVec<SourceScope, SourceScopeData>,
@@ -108,10 +109,10 @@
/// needn't) be tracked across crates.
pub source_scope_local_data: ClearCrossCrate<IndexVec<SourceScope, SourceScopeLocalData>>,
- /// Yields type of the function, if it is a generator.
+ /// The yield type of the function, if it is a generator.
pub yield_ty: Option<Ty<'tcx>>,
- /// Generator drop glue
+ /// Generator drop glue.
pub generator_drop: Option<Box<Body<'tcx>>>,
/// The layout of a generator. Produced by the state transformation.
@@ -124,10 +125,10 @@
/// variables and temporaries.
pub local_decls: LocalDecls<'tcx>,
- /// User type annotations
+ /// User type annotations.
pub user_type_annotations: CanonicalUserTypeAnnotations<'tcx>,
- /// Number of arguments this function takes.
+ /// The number of arguments this function takes.
///
/// Starting at local 1, `arg_count` locals will be provided by the caller
/// and can be assumed to be initialized.
@@ -143,10 +144,11 @@
/// Names and capture modes of all the closure upvars, assuming
/// the first argument is either the closure or a reference to it.
+ //
// NOTE(eddyb) This is *strictly* a temporary hack for codegen
// debuginfo generation, and will be removed at some point.
- // Do **NOT** use it for anything else, upvar information should not be
- // in the MIR, please rely on local crate HIR or other side-channels.
+ // Do **NOT** use it for anything else; upvar information should not be
+ // in the MIR, so please rely on local crate HIR or other side-channels.
pub __upvar_debuginfo_codegen_only_do_not_use: Vec<UpvarDebuginfo>,
/// Mark this MIR of a const context other than const functions as having converted a `&&` or
@@ -157,10 +159,10 @@
/// List of places where control flow was destroyed. Used for error reporting.
pub control_flow_destroyed: Vec<(Span, String)>,
- /// A span representing this MIR, for error reporting
+ /// A span representing this MIR, for error reporting.
pub span: Span,
- /// A cache for various calculations
+ /// A cache for various calculations.
cache: cache::Cache,
}
@@ -177,7 +179,7 @@
span: Span,
control_flow_destroyed: Vec<(Span, String)>,
) -> Self {
- // We need `arg_count` locals, and one for the return place
+ // We need `arg_count` locals, and one for the return place.
assert!(
local_decls.len() >= arg_count + 1,
"expected at least {} locals, got {}",
@@ -384,12 +386,12 @@
true
}
- /// Returns the return type, it always return first element from `local_decls` array
+ /// Returns the return type; it always return first element from `local_decls` array.
pub fn return_ty(&self) -> Ty<'tcx> {
self.local_decls[RETURN_PLACE].ty
}
- /// Gets the location of the terminator for the given block
+ /// Gets the location of the terminator for the given block.
pub fn terminator_loc(&self, bb: BasicBlock) -> Location {
Location { block: bb, statement_index: self[bb].statements.len() }
}
@@ -463,7 +465,7 @@
/// Most passes can work with it as a whole, within a single function.
#[derive(Copy, Clone, Debug, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, HashStable)]
pub struct SourceInfo {
- /// Source span for the AST pertaining to this MIR entity.
+ /// The source span for the AST pertaining to this MIR entity.
pub span: Span,
/// The source scope, keeping track of which bindings can be
@@ -591,13 +593,13 @@
/// Classifies locals into categories. See `Body::local_kind`.
#[derive(PartialEq, Eq, Debug, HashStable)]
pub enum LocalKind {
- /// User-declared variable binding
+ /// User-declared variable binding.
Var,
- /// Compiler-introduced temporary
+ /// Compiler-introduced temporary.
Temp,
- /// Function argument
+ /// Function argument.
Arg,
- /// Location of function's return value
+ /// Location of function's return value.
ReturnPointer,
}
@@ -619,7 +621,7 @@
/// (b) it gives a way to separate this case from the remaining cases
/// for diagnostics.
pub opt_match_place: Option<(Option<Place<'tcx>>, Span)>,
- /// Span of the pattern in which this variable was bound.
+ /// The span of the pattern in which this variable was bound.
pub pat_span: Span,
}
@@ -721,12 +723,12 @@
/// argument, or the return place.
#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
pub struct LocalDecl<'tcx> {
- /// `let mut x` vs `let x`.
+ /// Whether this is a mutable minding (i.e., `let x` or `let mut x`).
///
/// Temporaries and the return place are always mutable.
pub mutability: Mutability,
- /// Some(binding_mode) if this corresponds to a user-declared local variable.
+ /// `Some(binding_mode)` if this corresponds to a user-declared local variable.
///
/// This is solely used for local diagnostics when generating
/// warnings/errors when compiling the current crate, and
@@ -760,7 +762,7 @@
/// intervening statement context).
pub is_block_tail: Option<BlockTailInfo>,
- /// Type of this local.
+ /// The type of this local.
pub ty: Ty<'tcx>,
/// If the user manually ascribed a type to this variable,
@@ -769,7 +771,7 @@
/// region inference.
pub user_ty: UserTypeProjections,
- /// Name of the local, used in debuginfo and pretty-printing.
+ /// The name of the local, used in debuginfo and pretty-printing.
///
/// Note that function arguments can also have this set to `Some(_)`
/// to generate better debuginfo.
@@ -837,8 +839,8 @@
/// ROOT SCOPE
/// │{ argument x: &str }
/// │
- /// │ │{ #[allow(unused_mut)] } // this is actually split into 2 scopes
- /// │ │ // in practice because I'm lazy.
+ /// │ │{ #[allow(unused_mut)] } // This is actually split into 2 scopes
+ /// │ │ // in practice because I'm lazy.
/// │ │
/// │ │← x.source_info.scope
/// │ │← `x.parse().unwrap()`
@@ -852,7 +854,7 @@
/// │
/// │ │{ let x: u32 }
/// │ │← x.visibility_scope
- /// │ │← `drop(x)` // this accesses `x: u32`
+ /// │ │← `drop(x)` // This accesses `x: u32`.
/// ```
pub source_info: SourceInfo,
@@ -1038,16 +1040,16 @@
#[derive(Clone, RustcEncodable, RustcDecodable, HashStable)]
pub enum TerminatorKind<'tcx> {
- /// block should have one successor in the graph; we jump there
+ /// Block should have one successor in the graph; we jump there.
Goto { target: BasicBlock },
- /// operand evaluates to an integer; jump depending on its value
- /// to one of the targets, and otherwise fallback to `otherwise`
+ /// Operand evaluates to an integer; jump depending on its value
+ /// to one of the targets, and otherwise fallback to `otherwise`.
SwitchInt {
- /// discriminant value being tested
+ /// The discriminant value being tested.
discr: Operand<'tcx>,
- /// type of value being tested
+ /// The type of value being tested.
switch_ty: Ty<'tcx>,
/// Possible values. The locations to branch to in each case
@@ -1057,6 +1059,7 @@
/// Possible branch sites. The last element of this vector is used
/// for the otherwise branch, so targets.len() == values.len() + 1
/// should hold.
+ //
// This invariant is quite non-obvious and also could be improved.
// One way to make this invariant is to have something like this instead:
//
@@ -1069,7 +1072,7 @@
},
/// Indicates that the landing pad is finished and unwinding should
- /// continue. Emitted by build::scope::diverge_cleanup.
+ /// continue. Emitted by `build::scope::diverge_cleanup`.
Resume,
/// Indicates that the landing pad is finished and that the process
@@ -1083,10 +1086,10 @@
/// Indicates a terminator that can never be reached.
Unreachable,
- /// Drop the Place
+ /// Drop the `Place`.
Drop { location: Place<'tcx>, target: BasicBlock, unwind: Option<BasicBlock> },
- /// Drop the Place and assign the new value over it. This ensures
+ /// Drop the `Place` and assign the new value over it. This ensures
/// that the assignment to `P` occurs *even if* the destructor for
/// place unwinds. Its semantics are best explained by the
/// elaboration:
@@ -1119,9 +1122,9 @@
unwind: Option<BasicBlock>,
},
- /// Block ends with a call of a converging function
+ /// Block ends with a call of a converging function.
Call {
- /// The function that’s being called
+ /// The function that’s being called.
func: Operand<'tcx>,
/// Arguments the function is called with.
/// These are owned by the callee, which is free to modify them.
@@ -1132,7 +1135,7 @@
destination: Option<(Place<'tcx>, BasicBlock)>,
/// Cleanups to be done if the call unwinds.
cleanup: Option<BasicBlock>,
- /// Whether this is from a call in HIR, rather than from an overloaded
+ /// `true` if this is from a call in HIR rather than from an overloaded
/// operator. True for overloaded function call.
from_hir_call: bool,
},
@@ -1147,40 +1150,40 @@
cleanup: Option<BasicBlock>,
},
- /// A suspend point
+ /// A suspend point.
Yield {
- /// The value to return
+ /// The value to return.
value: Operand<'tcx>,
- /// Where to resume to
+ /// Where to resume to.
resume: BasicBlock,
- /// Cleanup to be done if the generator is dropped at this suspend point
+ /// Cleanup to be done if the generator is dropped at this suspend point.
drop: Option<BasicBlock>,
},
- /// Indicates the end of the dropping of a generator
+ /// Indicates the end of the dropping of a generator.
GeneratorDrop,
/// A block where control flow only ever takes one real path, but borrowck
/// needs to be more conservative.
FalseEdges {
- /// The target normal control flow will take
+ /// The target normal control flow will take.
real_target: BasicBlock,
/// A block control flow could conceptually jump to, but won't in
- /// practice
+ /// practice.
imaginary_target: BasicBlock,
},
/// A terminator for blocks that only take one path in reality, but where we
/// reserve the right to unwind in borrowck, even if it won't happen in practice.
/// This can arise in infinite loops with no function calls for example.
FalseUnwind {
- /// The target normal control flow will take
+ /// The target normal control flow will take.
real_target: BasicBlock,
/// The imaginary cleanup block link. This particular path will never be taken
/// in practice, but in order to avoid fragility we want to always
/// consider it in borrowck. We don't want to accept programs which
- /// pass borrowck only when panic=abort or some assertions are disabled
- /// due to release vs. debug mode builds. This needs to be an Option because
- /// of the remove_noop_landing_pads and no_landing_pads passes
+ /// pass borrowck only when `panic=abort` or some assertions are disabled
+ /// due to release vs. debug mode builds. This needs to be an `Option` because
+ /// of the `remove_noop_landing_pads` and `no_landing_pads` passes.
unwind: Option<BasicBlock>,
},
}
@@ -1445,7 +1448,7 @@
}
impl<'tcx> TerminatorKind<'tcx> {
- /// Write the "head" part of the terminator; that is, its name and the data it uses to pick the
+ /// Writes the "head" part of the terminator; that is, its name and the data it uses to pick the
/// successor basic block, if any. The only information not included is the list of possible
/// successors, which may be rendered differently between the text and the graphviz format.
pub fn fmt_head<W: Write>(&self, fmt: &mut W) -> fmt::Result {
@@ -1615,20 +1618,20 @@
Nop,
}
-/// `RetagKind` describes what kind of retag is to be performed.
+/// Describes what kind of retag is to be performed.
#[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug, PartialEq, Eq, HashStable)]
pub enum RetagKind {
- /// The initial retag when entering a function
+ /// The initial retag when entering a function.
FnEntry,
- /// Retag preparing for a two-phase borrow
+ /// Retag preparing for a two-phase borrow.
TwoPhase,
- /// Retagging raw pointers
+ /// Retagging raw pointers.
Raw,
- /// A "normal" retag
+ /// A "normal" retag.
Default,
}
-/// The `FakeReadCause` describes the type of pattern why a `FakeRead` statement exists.
+/// The `FakeReadCause` describes the type of pattern why a FakeRead statement exists.
#[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug, HashStable)]
pub enum FakeReadCause {
/// Inject a fake read of the borrowed input at the end of each guards
@@ -2171,7 +2174,7 @@
#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
pub struct SourceScopeLocalData {
- /// A HirId with lint levels equivalent to this scope's lint levels.
+ /// An `HirId` with lint levels equivalent to this scope's lint levels.
pub lint_root: hir::HirId,
/// The unsafe block that contains this node.
pub safety: Safety,
@@ -2760,11 +2763,12 @@
#[derive(Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd, HashStable)]
pub struct Location {
- /// the location is within this block
+ /// The block that the location is within.
pub block: BasicBlock,
- /// the location is the start of the statement; or, if `statement_index`
- /// == num-statements, then the start of the terminator.
+ /// The location is the position of the start of the statement; or, if
+ /// `statement_index` equals the number of statements, then the start of the
+ /// terminator.
pub statement_index: usize,
}
@@ -2827,7 +2831,7 @@
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, HashStable)]
pub enum UnsafetyViolationKind {
General,
- /// Permitted in const fn and regular fns.
+ /// Permitted both in `const fn`s and regular `fn`s.
GeneralAndConstFn,
ExternStatic(hir::HirId),
BorrowPacked(hir::HirId),
@@ -2843,9 +2847,9 @@
#[derive(Clone, Debug, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, HashStable)]
pub struct UnsafetyCheckResult {
- /// Violations that are propagated *upwards* from this function
+ /// Violations that are propagated *upwards* from this function.
pub violations: Lrc<[UnsafetyViolation]>,
- /// unsafe blocks in this function, along with whether they are used. This is
+ /// `unsafe` blocks in this function, along with whether they are used. This is
/// used for the "unused_unsafe" lint.
pub unsafe_blocks: Lrc<[(hir::HirId, bool)]>,
}
@@ -2857,7 +2861,7 @@
}
}
-/// The layout of generator state
+/// The layout of generator state.
#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
pub struct GeneratorLayout<'tcx> {
/// The type of every local stored inside the generator.
@@ -2872,11 +2876,14 @@
/// layout.
pub storage_conflicts: BitMatrix<GeneratorSavedLocal, GeneratorSavedLocal>,
- /// Names and scopes of all the stored generator locals.
- /// NOTE(tmandry) This is *strictly* a temporary hack for codegen
+ /// The names and scopes of all the stored generator locals.
+ ///
+ /// N.B., this is *strictly* a temporary hack for codegen
/// debuginfo generation, and will be removed at some point.
/// Do **NOT** use it for anything else, local information should not be
/// in the MIR, please rely on local crate HIR or other side-channels.
+ //
+ // FIXME(tmandry): see above.
pub __local_debuginfo_codegen_only_do_not_use: IndexVec<GeneratorSavedLocal, LocalDecl<'tcx>>,
}
@@ -2934,7 +2941,7 @@
/// instances assigned one of these same indices. Those regions will
/// be substituted away by the creator. We use `ReClosureBound` in
/// that case because the regions must be allocated in the global
-/// TyCtxt, and hence we cannot use `ReVar` (which is what we use
+/// `TyCtxt`, and hence we cannot use `ReVar` (which is what we use
/// internally within the rest of the NLL code).
#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
pub struct ClosureRegionRequirements<'tcx> {
@@ -2950,8 +2957,8 @@
pub outlives_requirements: Vec<ClosureOutlivesRequirement<'tcx>>,
}
-/// Indicates an outlives constraint between a type or between two
-/// free-regions declared on the closure.
+/// Indicates an outlives-constraint between a type or between two
+/// free regions declared on the closure.
#[derive(Copy, Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
pub struct ClosureOutlivesRequirement<'tcx> {
// This region or type ...
@@ -2967,11 +2974,11 @@
pub category: ConstraintCategory,
}
-/// Outlives constraints can be categorized to determine whether and why they
+/// Outlives-constraints can be categorized to determine whether and why they
/// are interesting (for error reporting). Order of variants indicates sort
/// order of the category, thereby influencing diagnostic output.
///
-/// See also [rustc_mir::borrow_check::nll::constraints]
+/// See also [rustc_mir::borrow_check::nll::constraints].
#[derive(
Copy,
Clone,
@@ -3019,7 +3026,7 @@
Internal,
}
-/// The subject of a ClosureOutlivesRequirement -- that is, the thing
+/// The subject of a `ClosureOutlivesRequirement` -- that is, the thing
/// that must outlive some region.
#[derive(Copy, Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
pub enum ClosureOutlivesSubject<'tcx> {
@@ -3037,7 +3044,7 @@
}
/*
- * TypeFoldable implementations for MIR types
+ * `TypeFoldable` implementations for MIR types
*/
CloneTypeFoldableAndLiftImpls! {
diff --git a/src/librustc/query/mod.rs b/src/librustc/query/mod.rs
index ef83811..4ebc2e7 100644
--- a/src/librustc/query/mod.rs
+++ b/src/librustc/query/mod.rs
@@ -17,7 +17,6 @@
use std::borrow::Cow;
use syntax_pos::symbol::InternedString;
-
// Each of these queries corresponds to a function pointer field in the
// `Providers` struct for requesting a value of that type, and a method
// on `tcx: TyCtxt` (and `tcx.at(span)`) for doing that request in a way
@@ -854,7 +853,7 @@
desc { "calculating the lang items map" }
}
- /// Returns all diagnostic items defined in all crates
+ /// Returns all diagnostic items defined in all crates.
query all_diagnostic_items(_: CrateNum) -> &'tcx FxHashMap<Symbol, DefId> {
eval_always
desc { "calculating the diagnostic items map" }
@@ -865,7 +864,7 @@
desc { "calculating the lang items defined in a crate" }
}
- /// Returns the diagnostic items defined in a crate
+ /// Returns the diagnostic items defined in a crate.
query diagnostic_items(_: CrateNum) -> &'tcx FxHashMap<Symbol, DefId> {
desc { "calculating the diagnostic items map in a crate" }
}
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 296c6ad..c74b2fe 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1,36 +1,36 @@
//! Contains infrastructure for configuring the compiler, including parsing
-//! command line options.
+//! command-line options.
-use std::str::FromStr;
-
+use crate::lint;
+use crate::middle::cstore;
use crate::session::{early_error, early_warn, Session};
use crate::session::search_paths::SearchPath;
+use rustc_data_structures::fx::FxHashSet;
+
use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy, RelroLevel};
use rustc_target::spec::{Target, TargetTriple};
-use crate::lint;
-use crate::middle::cstore;
use syntax;
use syntax::ast::{self, IntTy, UintTy, MetaItemKind};
use syntax::source_map::{FileName, FilePathMapping};
use syntax::edition::{Edition, EDITION_NAME_LIST, DEFAULT_EDITION};
+use syntax::parse::{ParseSess, new_parser_from_source_str};
use syntax::parse::token;
-use syntax::parse;
use syntax::symbol::{sym, Symbol};
use syntax::feature_gate::UnstableFeatures;
-use errors::emitter::HumanReadableErrorType;
+use errors::emitter::HumanReadableErrorType;
use errors::{ColorConfig, FatalError, Handler};
use getopts;
-use std::collections::{BTreeMap, BTreeSet};
-use std::collections::btree_map::Iter as BTreeMapIter;
-use std::collections::btree_map::Keys as BTreeMapKeysIter;
-use std::collections::btree_map::Values as BTreeMapValuesIter;
-use rustc_data_structures::fx::FxHashSet;
-use std::{fmt, str};
+use std::collections::{BTreeMap, BTreeSet};
+use std::collections::btree_map::{
+ Iter as BTreeMapIter, Keys as BTreeMapKeysIter, Values as BTreeMapValuesIter,
+};
+use std::fmt;
+use std::str::{self, FromStr};
use std::hash::Hasher;
use std::collections::hash_map::DefaultHasher;
use std::iter::FromIterator;
@@ -241,14 +241,14 @@
}
impl Default for ErrorOutputType {
- fn default() -> ErrorOutputType {
- ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(ColorConfig::Auto))
+ fn default() -> Self {
+ Self::HumanReadable(HumanReadableErrorType::Default(ColorConfig::Auto))
}
}
-// Use tree-based collections to cheaply get a deterministic Hash implementation.
-// DO NOT switch BTreeMap out for an unsorted container type! That would break
-// dependency tracking for command-line arguments.
+/// Use tree-based collections to cheaply get a deterministic `Hash` implementation.
+/// *Do not* switch `BTreeMap` out for an unsorted container type! That would break
+/// dependency tracking for command-line arguments.
#[derive(Clone, Hash)]
pub struct OutputTypes(BTreeMap<OutputType, Option<PathBuf>>);
@@ -281,7 +281,7 @@
self.0.len()
}
- // True if any of the output types require codegen or linking.
+ // Returns `true` if any of the output types require codegen or linking.
pub fn should_codegen(&self) -> bool {
self.0.keys().any(|k| match *k {
OutputType::Bitcode
@@ -295,9 +295,9 @@
}
}
-// Use tree-based collections to cheaply get a deterministic Hash implementation.
-// DO NOT switch BTreeMap or BTreeSet out for an unsorted container type! That
-// would break dependency tracking for command-line arguments.
+/// Use tree-based collections to cheaply get a deterministic `Hash` implementation.
+/// *Do not* switch `BTreeMap` or `BTreeSet` out for an unsorted container type! That
+/// would break dependency tracking for command-line arguments.
#[derive(Clone, Hash)]
pub struct Externs(BTreeMap<String, ExternEntry>);
@@ -327,7 +327,7 @@
($opt_name:ident, $opt_expr:expr, $sub_hashes:expr, [TRACKED]) => ({
if $sub_hashes.insert(stringify!($opt_name),
$opt_expr as &dyn dep_tracking::DepTrackingHash).is_some() {
- bug!("Duplicate key in CLI DepTrackingHash: {}", stringify!($opt_name))
+ bug!("duplicate key in CLI DepTrackingHash: {}", stringify!($opt_name))
}
});
}
@@ -362,7 +362,7 @@
);
}
-// The top-level command-line options struct
+// The top-level command-line options struct.
//
// For each option, one has to specify how it behaves with regard to the
// dependency tracking system of incremental compilation. This is done via the
@@ -376,16 +376,16 @@
// Incremental compilation is not influenced by this option.
//
// If you add a new option to this struct or one of the sub-structs like
-// CodegenOptions, think about how it influences incremental compilation. If in
+// `CodegenOptions`, think about how it influences incremental compilation. If in
// doubt, specify [TRACKED], which is always "correct" but might lead to
// unnecessary re-compilation.
top_level_options!(
pub struct Options {
// The crate config requested for the session, which may be combined
- // with additional crate configurations during the compile process
+ // with additional crate configurations during the compile process.
crate_types: Vec<CrateType> [TRACKED],
optimize: OptLevel [TRACKED],
- // Include the debug_assertions flag into dependency tracking, since it
+ // Include the `debug_assertions` flag in dependency tracking, since it
// can influence whether overflow checks are done or not.
debug_assertions: bool [TRACKED],
debuginfo: DebugInfo [TRACKED],
@@ -402,8 +402,8 @@
test: bool [TRACKED],
error_format: ErrorOutputType [UNTRACKED],
- // if Some, enable incremental compilation, using the given
- // directory to store intermediate results
+ // If `Some`, enable incremental compilation, using the given
+ // directory to store intermediate results.
incremental: Option<PathBuf> [UNTRACKED],
debugging_opts: DebuggingOptions [TRACKED],
@@ -418,7 +418,7 @@
// written `extern crate name as std`. Defaults to `std`. Used by
// out-of-tree drivers.
alt_std_name: Option<String> [TRACKED],
- // Indicates how the compiler should treat unstable features
+ // Indicates how the compiler should treat unstable features.
unstable_features: UnstableFeatures [TRACKED],
// Indicates whether this run of the compiler is actually rustdoc. This
@@ -434,12 +434,12 @@
cli_forced_codegen_units: Option<usize> [UNTRACKED],
cli_forced_thinlto_off: bool [UNTRACKED],
- // Remap source path prefixes in all output (messages, object files, debug, etc)
+ // Remap source path prefixes in all output (messages, object files, debug, etc.).
remap_path_prefix: Vec<(PathBuf, PathBuf)> [UNTRACKED],
edition: Edition [TRACKED],
- // Whether or not we're emitting JSON blobs about each artifact produced
+ // `true` if we're emitting JSON blobs about each artifact produced
// by the compiler.
json_artifact_notifications: bool [TRACKED],
}
@@ -468,7 +468,7 @@
}
impl BorrowckMode {
- /// Should we run the MIR-based borrow check, but also fall back
+ /// Returns whether we should run the MIR-based borrow check, but also fall back
/// on the AST borrow check if the MIR-based one errors.
pub fn migrate(self) -> bool {
match self {
@@ -477,7 +477,7 @@
}
}
- /// Should we emit the AST-based borrow checker errors?
+ /// Returns whether we should emit the AST-based borrow checker errors.
pub fn use_ast(self) -> bool {
match self {
BorrowckMode::Mir => false,
@@ -487,12 +487,13 @@
}
pub enum Input {
- /// Loads source from file
+ /// Load source code from a file.
File(PathBuf),
+ /// Load source code from a string.
Str {
- /// String that is shown in place of a filename
+ /// A string that is shown in place of a filename.
name: FileName,
- /// Anonymous source string
+ /// An anonymous string containing the source code.
input: String,
},
}
@@ -651,7 +652,7 @@
FilePathMapping::new(self.remap_path_prefix.clone())
}
- /// Returns `true` if there will be an output file generated
+ /// Returns `true` if there will be an output file generated.
pub fn will_create_output_file(&self) -> bool {
!self.debugging_opts.parse_only && // The file is just being parsed
!self.debugging_opts.ls // The file is just being queried
@@ -709,16 +710,14 @@
}
}
-/// Declare a macro that will define all CodegenOptions/DebuggingOptions fields and parsers all
-/// at once. The goal of this macro is to define an interface that can be
-/// programmatically used by the option parser in order to initialize the struct
-/// without hardcoding field names all over the place.
+/// Defines all `CodegenOptions`/`DebuggingOptions` fields and parsers all at once. The goal of this
+/// macro is to define an interface that can be programmatically used by the option parser
+/// to initialize the struct without hardcoding field names all over the place.
///
-/// The goal is to invoke this macro once with the correct fields, and then this
-/// macro generates all necessary code. The main gotcha of this macro is the
-/// cgsetters module which is a bunch of generated code to parse an option into
-/// its respective field in the struct. There are a few hand-written parsers for
-/// parsing specific types of values in this module.
+/// The goal is to invoke this macro once with the correct fields, and then this macro generates all
+/// necessary code. The main gotcha of this macro is the `cgsetters` module which is a bunch of
+/// generated code to parse an option into its respective field in the struct. There are a few
+/// hand-written parsers for parsing specific types of values in this module.
macro_rules! options {
($struct_name:ident, $setter_name:ident, $defaultfn:ident,
$buildfn:ident, $prefix:expr, $outputname:expr,
@@ -1539,7 +1538,7 @@
ret
}
-/// Converts the crate cfg! configuration from String to Symbol.
+/// Converts the crate `cfg!` configuration from `String` to `Symbol`.
/// `rustc_interface::interface::Config` accepts this in the compiler configuration,
/// but the symbol interner is not yet set up then, so we must convert it later.
pub fn to_crate_config(cfg: FxHashSet<(String, Option<String>)>) -> ast::CrateConfig {
@@ -1550,9 +1549,9 @@
pub fn build_configuration(sess: &Session, mut user_cfg: ast::CrateConfig) -> ast::CrateConfig {
// Combine the configuration requested by the session (command line) with
- // some default and generated configuration items
+ // some default and generated configuration items.
let default_cfg = default_configuration(sess);
- // If the user wants a test runner, then add the test cfg
+ // If the user wants a test runner, then add the test cfg.
if sess.opts.test {
user_cfg.insert((sym::test, None));
}
@@ -1851,13 +1850,13 @@
opts
}
-// Convert strings provided as --cfg [cfgspec] into a crate_cfg
+// Converts strings provided as `--cfg [cfgspec]` into a `crate_cfg`.
pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> FxHashSet<(String, Option<String>)> {
syntax::with_default_globals(move || {
let cfg = cfgspecs.into_iter().map(|s| {
- let sess = parse::ParseSess::new(FilePathMapping::empty());
+ let sess = ParseSess::new(FilePathMapping::empty());
let filename = FileName::cfg_spec_source_code(&s);
- let mut parser = parse::new_parser_from_source_str(&sess, filename, s.to_string());
+ let mut parser = new_parser_from_source_str(&sess, filename, s.to_string());
macro_rules! error {($reason: expr) => {
early_error(ErrorOutputType::default(),
@@ -1917,7 +1916,7 @@
(lint_opts, describe_lints, lint_cap)
}
-/// Parse the `--color` flag
+/// Parses the `--color` flag.
pub fn parse_color(matches: &getopts::Matches) -> ColorConfig {
match matches.opt_str("color").as_ref().map(|s| &s[..]) {
Some("auto") => ColorConfig::Auto,
@@ -1929,7 +1928,7 @@
Some(arg) => early_error(
ErrorOutputType::default(),
&format!(
- "argument for --color must be auto, \
+ "argument for `--color` must be auto, \
always or never (instead was `{}`)",
arg
),
@@ -1974,16 +1973,16 @@
(json_rendered(json_color), json_artifact_notifications)
}
-/// Parse the `--error-format` flag
+/// Parses the `--error-format` flag.
pub fn parse_error_format(
matches: &getopts::Matches,
color: ColorConfig,
json_rendered: HumanReadableErrorType,
) -> ErrorOutputType {
- // We need the opts_present check because the driver will send us Matches
+ // We need the `opts_present` check because the driver will send us Matches
// with only stable options if no unstable options are used. Since error-format
- // is unstable, it will not be present. We have to use opts_present not
- // opt_present because the latter will panic.
+ // is unstable, it will not be present. We have to use `opts_present` not
+ // `opt_present` because the latter will panic.
let error_format = if matches.opts_present(&["error-format".to_owned()]) {
match matches.opt_str("error-format").as_ref().map(|s| &s[..]) {
None |
@@ -2116,7 +2115,7 @@
let mut codegen_units = cg.codegen_units;
let mut disable_thinlto = false;
- // Issue #30063: if user requests llvm-related output to one
+ // Issue #30063: if user requests LLVM-related output to one
// particular path, disable codegen-units.
let incompatible: Vec<_> = output_types
.iter()
@@ -2414,10 +2413,10 @@
)
}
- // We start out with a Vec<(Option<String>, bool)>>,
- // and later convert it into a BTreeSet<(Option<String>, bool)>
+ // We start out with a `Vec<(Option<String>, bool)>>`,
+ // and later convert it into a `BTreeSet<(Option<String>, bool)>`
// This allows to modify entries in-place to set their correct
- // 'public' value
+ // 'public' value.
let mut externs: BTreeMap<String, ExternEntry> = BTreeMap::new();
for (arg, private) in matches.opt_strs("extern").into_iter().map(|v| (v, false))
.chain(matches.opt_strs("extern-private").into_iter().map(|v| (v, true))) {
@@ -2616,15 +2615,15 @@
/// The values of all command-line arguments that are relevant for dependency
/// tracking are hashed into a single value that determines whether the
/// incremental compilation cache can be re-used or not. This hashing is done
-/// via the DepTrackingHash trait defined below, since the standard Hash
-/// implementation might not be suitable (e.g., arguments are stored in a Vec,
+/// via the `DepTrackingHash` trait defined below, since the standard `Hash`
+/// implementation might not be suitable (e.g., arguments are stored in a `Vec`,
/// the hash of which is order dependent, but we might not want the order of
/// arguments to make a difference for the hash).
///
-/// However, since the value provided by Hash::hash often *is* suitable,
+/// However, since the value provided by `Hash::hash` often *is* suitable,
/// especially for primitive types, there is the
-/// impl_dep_tracking_hash_via_hash!() macro that allows to simply reuse the
-/// Hash implementation for DepTrackingHash. It's important though that
+/// `impl_dep_tracking_hash_via_hash!()` macro that allows to simply reuse the
+/// `Hash` implementation for `DepTrackingHash`. It's important though that
/// we have an opt-in scheme here, so one is hopefully forced to think about
/// how the hash should be calculated when adding a new command-line argument.
mod dep_tracking {
@@ -2637,9 +2636,9 @@
use super::{CrateType, DebugInfo, ErrorOutputType, OptLevel, OutputTypes,
Passes, Sanitizer, LtoCli, LinkerPluginLto, SwitchWithOptPath,
SymbolManglingVersion};
- use syntax::feature_gate::UnstableFeatures;
use rustc_target::spec::{MergeFunctions, PanicStrategy, RelroLevel, TargetTriple};
use syntax::edition::Edition;
+ use syntax::feature_gate::UnstableFeatures;
pub trait DepTrackingHash {
fn hash(&self, hasher: &mut DefaultHasher, error_format: ErrorOutputType);
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index f01883d..8656ebb 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -79,12 +79,12 @@
/// if the value stored here has been affected by path remapping.
pub working_dir: (PathBuf, bool),
- // FIXME: lint_store and buffered_lints are not thread-safe,
- // but are only used in a single thread
+ // FIXME: `lint_store` and `buffered_lints` are not thread-safe,
+ // but are only used in a single thread.
pub lint_store: RwLock<lint::LintStore>,
pub buffered_lints: Lock<Option<lint::LintBuffer>>,
- /// Set of (DiagnosticId, Option<Span>, message) tuples tracking
+ /// Set of `(DiagnosticId, Option<Span>, message)` tuples tracking
/// (sub)diagnostics that have been set once, but should not be set again,
/// in order to avoid redundantly verbose output (Issue #24690, #44953).
pub one_time_diagnostics: Lock<FxHashSet<(DiagnosticMessageId, Option<Span>, String)>>,
@@ -92,11 +92,11 @@
pub plugin_attributes: Lock<Vec<(Symbol, AttributeType)>>,
pub crate_types: Once<Vec<config::CrateType>>,
pub dependency_formats: Once<dependency_format::Dependencies>,
- /// The crate_disambiguator is constructed out of all the `-C metadata`
+ /// The `crate_disambiguator` is constructed out of all the `-C metadata`
/// arguments passed to the compiler. Its value together with the crate-name
/// forms a unique global identifier for the crate. It is used to allow
/// multiple crates with the same name to coexist. See the
- /// rustc_codegen_llvm::back::symbol_names module for more information.
+ /// `rustc_codegen_llvm::back::symbol_names` module for more information.
pub crate_disambiguator: Once<CrateDisambiguator>,
features: Once<feature_gate::Features>,
@@ -111,7 +111,7 @@
/// The maximum number of stackframes allowed in const eval.
pub const_eval_stack_frame_limit: usize,
- /// The metadata::creader module may inject an allocator/panic_runtime
+ /// The `metadata::creader` module may inject an allocator/`panic_runtime`
/// dependency if it didn't already find one, and this tracks what was
/// injected.
pub allocator_kind: Once<Option<AllocatorKind>>,
@@ -130,7 +130,7 @@
/// Used by `-Z profile-queries` in `util::common`.
pub profile_channel: Lock<Option<mpsc::Sender<ProfileQueriesMsg>>>,
- /// Used by -Z self-profile
+ /// Used by `-Z self-profile`.
pub self_profiling: Option<Arc<SelfProfiler>>,
/// Some measurements that are being gathered during compilation.
@@ -187,16 +187,16 @@
pub normalize_projection_ty: AtomicUsize,
}
-/// Enum to support dispatch of one-time diagnostics (in Session.diag_once)
+/// Enum to support dispatch of one-time diagnostics (in `Session.diag_once`).
enum DiagnosticBuilderMethod {
Note,
SpanNote,
SpanSuggestion(String), // suggestion
- // add more variants as needed to support one-time diagnostics
+ // Add more variants as needed to support one-time diagnostics.
}
-/// Diagnostic message ID—used by `Session.one_time_diagnostics` to avoid
-/// emitting the same message more than once
+/// Diagnostic message ID, used by `Session.one_time_diagnostics` to avoid
+/// emitting the same message more than once.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum DiagnosticMessageId {
ErrorId(u16), // EXXXX error code as integer
@@ -408,7 +408,7 @@
Some(next) => {
self.next_node_id.set(ast::NodeId::from_usize(next));
}
- None => bug!("Input too large, ran out of node ids!"),
+ None => bug!("input too large; ran out of node-IDs!"),
}
id
@@ -440,11 +440,11 @@
diag_builder.note(message);
}
DiagnosticBuilderMethod::SpanNote => {
- let span = span_maybe.expect("span_note needs a span");
+ let span = span_maybe.expect("`span_note` needs a span");
diag_builder.span_note(span, message);
}
DiagnosticBuilderMethod::SpanSuggestion(suggestion) => {
- let span = span_maybe.expect("span_suggestion_* needs a span");
+ let span = span_maybe.expect("`span_suggestion_*` needs a span");
diag_builder.span_suggestion(
span,
message,
@@ -688,7 +688,7 @@
pub fn must_not_eliminate_frame_pointers(&self) -> bool {
// "mcount" function relies on stack pointer.
- // See https://sourceware.org/binutils/docs/gprof/Implementation.html
+ // See <https://sourceware.org/binutils/docs/gprof/Implementation.html>.
if self.instrument_mcount() {
true
} else if let Some(x) = self.opts.cg.force_frame_pointers {
@@ -699,7 +699,7 @@
}
/// Returns the symbol name for the registrar function,
- /// given the crate Svh and the function DefIndex.
+ /// given the crate `Svh` and the function `DefIndex`.
pub fn generate_plugin_registrar_symbol(&self, disambiguator: CrateDisambiguator) -> String {
format!(
"__rustc_plugin_registrar_{}__",
@@ -719,7 +719,7 @@
&self.sysroot,
self.opts.target_triple.triple(),
&self.opts.search_paths,
- // target_tlib_path==None means it's the same as host_tlib_path.
+ // `target_tlib_path == None` means it's the same as `host_tlib_path`.
self.target_tlib_path.as_ref().unwrap_or(&self.host_tlib_path),
kind,
)
@@ -779,12 +779,12 @@
if let IncrCompSession::Active { .. } = *incr_comp_session {
} else {
bug!(
- "Trying to finalize IncrCompSession `{:?}`",
+ "trying to finalize `IncrCompSession` `{:?}`",
*incr_comp_session
- )
+ );
}
- // Note: This will also drop the lock file, thus unlocking the directory
+ // Note: this will also drop the lock file, thus unlocking the directory.
*incr_comp_session = IncrCompSession::Finalized {
session_directory: new_directory_path,
};
@@ -800,13 +800,15 @@
} => session_directory.clone(),
IncrCompSession::InvalidBecauseOfErrors { .. } => return,
_ => bug!(
- "Trying to invalidate IncrCompSession `{:?}`",
+ "trying to invalidate `IncrCompSession` `{:?}`",
*incr_comp_session
),
};
- // Note: This will also drop the lock file, thus unlocking the directory
- *incr_comp_session = IncrCompSession::InvalidBecauseOfErrors { session_directory };
+ // Note: this will also drop the lock file, thus unlocking the directory.
+ *incr_comp_session = IncrCompSession::InvalidBecauseOfErrors {
+ session_directory,
+ };
}
pub fn incr_comp_session_dir(&self) -> cell::Ref<'_, PathBuf> {
@@ -815,8 +817,8 @@
incr_comp_session,
|incr_comp_session| match *incr_comp_session {
IncrCompSession::NotInitialized => bug!(
- "Trying to get session directory from IncrCompSession `{:?}`",
- *incr_comp_session
+ "trying to get session directory from `IncrCompSession`: {:?}",
+ *incr_comp_session,
),
IncrCompSession::Active {
ref session_directory,
@@ -1185,7 +1187,10 @@
);
let target_cfg = config::build_target_config(&sopts, &span_diagnostic);
- let p_s = parse::ParseSess::with_span_handler(span_diagnostic, source_map);
+ let parse_sess = parse::ParseSess::with_span_handler(
+ span_diagnostic,
+ source_map,
+ );
let sysroot = match &sopts.maybe_sysroot {
Some(sysroot) => sysroot.clone(),
None => filesearch::get_or_default_sysroot(),
@@ -1214,7 +1219,7 @@
let print_fuel = AtomicU64::new(0);
let working_dir = env::current_dir().unwrap_or_else(|e|
- p_s.span_diagnostic
+ parse_sess.span_diagnostic
.fatal(&format!("Current directory is invalid: {}", e))
.raise()
);
@@ -1232,7 +1237,7 @@
opts: sopts,
host_tlib_path,
target_tlib_path,
- parse_sess: p_s,
+ parse_sess,
sysroot,
local_crate_source_file,
working_dir,
diff --git a/src/librustc/traits/object_safety.rs b/src/librustc/traits/object_safety.rs
index c759981..a7990c4 100644
--- a/src/librustc/traits/object_safety.rs
+++ b/src/librustc/traits/object_safety.rs
@@ -130,13 +130,13 @@
}
/// We say a method is *vtable safe* if it can be invoked on a trait
- /// object. Note that object-safe traits can have some
- /// non-vtable-safe methods, so long as they require `Self:Sized` or
- /// otherwise ensure that they cannot be used when `Self=Trait`.
+ /// object. Note that object-safe traits can have some
+ /// non-vtable-safe methods, so long as they require `Self: Sized` or
+ /// otherwise ensure that they cannot be used when `Self = Trait`.
pub fn is_vtable_safe_method(self, trait_def_id: DefId, method: &ty::AssocItem) -> bool {
debug_assert!(self.generics_of(trait_def_id).has_self);
debug!("is_vtable_safe_method({:?}, {:?})", trait_def_id, method);
- // Any method that has a `Self : Sized` requisite can't be called.
+ // Any method that has a `Self: Sized` bound cannot be called.
if self.generics_require_sized_self(method.def_id) {
return false;
}
@@ -350,15 +350,15 @@
&sig.map_bound(|sig| sig.inputs()[0]),
);
- // until `unsized_locals` is fully implemented, `self: Self` can't be dispatched on.
+ // Until `unsized_locals` is fully implemented, `self: Self` can't be dispatched on.
// However, this is already considered object-safe. We allow it as a special case here.
// FIXME(mikeyhew) get rid of this `if` statement once `receiver_is_dispatchable` allows
- // `Receiver: Unsize<Receiver[Self => dyn Trait]>`
+ // `Receiver: Unsize<Receiver[Self => dyn Trait]>`.
if receiver_ty != self.types.self_param {
if !self.receiver_is_dispatchable(method, receiver_ty) {
return Some(MethodViolationCode::UndispatchableReceiver);
} else {
- // sanity check to make sure the receiver actually has the layout of a pointer
+ // Do sanity check to make sure the receiver actually has the layout of a pointer.
use crate::ty::layout::Abi;
@@ -373,7 +373,7 @@
}
};
- // e.g., Rc<()>
+ // e.g., `Rc<()>`
let unit_receiver_ty = self.receiver_for_self_ty(
receiver_ty, self.mk_unit(), method.def_id
);
@@ -395,7 +395,7 @@
trait_def_id, self.mk_region(ty::ReStatic)
);
- // e.g., Rc<dyn Trait>
+ // e.g., `Rc<dyn Trait>`
let trait_object_receiver = self.receiver_for_self_ty(
receiver_ty, trait_object_ty, method.def_id
);
@@ -419,8 +419,8 @@
None
}
- /// Performs a type substitution to produce the version of receiver_ty when `Self = self_ty`
- /// e.g., for receiver_ty = `Rc<Self>` and self_ty = `Foo`, returns `Rc<Foo>`.
+ /// Performs a type substitution to produce the version of `receiver_ty` when `Self = self_ty`.
+ /// For example, for `receiver_ty = Rc<Self>` and `self_ty = Foo`, returns `Rc<Foo>`.
fn receiver_for_self_ty(
self,
receiver_ty: Ty<'tcx>,
diff --git a/src/librustc/traits/query/evaluate_obligation.rs b/src/librustc/traits/query/evaluate_obligation.rs
index 2ee6364..b9557ce 100644
--- a/src/librustc/traits/query/evaluate_obligation.rs
+++ b/src/librustc/traits/query/evaluate_obligation.rs
@@ -1,7 +1,8 @@
use crate::infer::InferCtxt;
use crate::infer::canonical::OriginalQueryValues;
-use crate::traits::{EvaluationResult, PredicateObligation, SelectionContext,
- TraitQueryMode, OverflowError};
+use crate::traits::{
+ EvaluationResult, PredicateObligation, SelectionContext, TraitQueryMode, OverflowError,
+};
impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
/// Evaluates whether the predicate can be satisfied (by any means)
diff --git a/src/librustc/traits/query/method_autoderef.rs b/src/librustc/traits/query/method_autoderef.rs
index 6b9bdfd..039dea1 100644
--- a/src/librustc/traits/query/method_autoderef.rs
+++ b/src/librustc/traits/query/method_autoderef.rs
@@ -6,11 +6,11 @@
pub struct CandidateStep<'tcx> {
pub self_ty: Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>,
pub autoderefs: usize,
- // true if the type results from a dereference of a raw pointer.
- // when assembling candidates, we include these steps, but not when
- // picking methods. This so that if we have `foo: *const Foo` and `Foo` has methods
- // `fn by_raw_ptr(self: *const Self)` and `fn by_ref(&self)`, then
- // `foo.by_raw_ptr()` will work and `foo.by_ref()` won't.
+ /// `true` if the type results from a dereference of a raw pointer.
+ /// when assembling candidates, we include these steps, but not when
+ /// picking methods. This so that if we have `foo: *const Foo` and `Foo` has methods
+ /// `fn by_raw_ptr(self: *const Self)` and `fn by_ref(&self)`, then
+ /// `foo.by_raw_ptr()` will work and `foo.by_ref()` won't.
pub from_unsafe_deref: bool,
pub unsize: bool,
}
diff --git a/src/librustc/traits/util.rs b/src/librustc/traits/util.rs
index 07d6f63..3d36790 100644
--- a/src/librustc/traits/util.rs
+++ b/src/librustc/traits/util.rs
@@ -512,7 +512,7 @@
(impl_trait_ref, impl_obligations)
}
-/// See `super::obligations_for_generics`
+/// See [`super::obligations_for_generics`].
pub fn predicates_for_generics<'tcx>(cause: ObligationCause<'tcx>,
recursion_depth: usize,
param_env: ty::ParamEnv<'tcx>,
@@ -562,7 +562,7 @@
predicate_for_trait_ref(cause, param_env, trait_ref, recursion_depth)
}
- /// Cast a trait reference into a reference to one of its super
+ /// Casts a trait reference into a reference to one of its super
/// traits; returns `None` if `target_trait_def_id` is not a
/// supertrait.
pub fn upcast_choices(self,
@@ -571,7 +571,7 @@
-> Vec<ty::PolyTraitRef<'tcx>>
{
if source_trait_ref.def_id() == target_trait_def_id {
- return vec![source_trait_ref]; // shorcut the most common case
+ return vec![source_trait_ref]; // Shortcut the most common case.
}
supertraits(self, source_trait_ref)
diff --git a/src/librustc/ty/codec.rs b/src/librustc/ty/codec.rs
index 1ddc678..1aa2150 100644
--- a/src/librustc/ty/codec.rs
+++ b/src/librustc/ty/codec.rs
@@ -284,9 +284,11 @@
#[macro_export]
macro_rules! __impl_decoder_methods {
($($name:ident -> $ty:ty;)*) => {
- $(fn $name(&mut self) -> Result<$ty, Self::Error> {
- self.opaque.$name()
- })*
+ $(
+ fn $name(&mut self) -> Result<$ty, Self::Error> {
+ self.opaque.$name()
+ }
+ )*
}
}
@@ -327,14 +329,17 @@
macro_rules! implement_ty_decoder {
($DecoderName:ident <$($typaram:tt),*>) => {
mod __ty_decoder_impl {
- use super::$DecoderName;
+ use std::borrow::Cow;
+
+ use rustc_serialize::{Decoder, SpecializedDecoder};
+
use $crate::infer::canonical::CanonicalVarInfos;
use $crate::ty;
use $crate::ty::codec::*;
use $crate::ty::subst::SubstsRef;
use $crate::hir::def_id::{CrateNum};
- use rustc_serialize::{Decoder, SpecializedDecoder};
- use std::borrow::Cow;
+
+ use super::$DecoderName;
impl<$($typaram ),*> Decoder for $DecoderName<$($typaram),*> {
type Error = String;
@@ -368,8 +373,8 @@
}
}
- // FIXME(#36588) These impls are horribly unsound as they allow
- // the caller to pick any lifetime for 'tcx, including 'static,
+ // FIXME(#36588): These impls are horribly unsound as they allow
+ // the caller to pick any lifetime for `'tcx`, including `'static`,
// by using the unspecialized proxies to them.
arena_types!(impl_arena_allocatable_decoders, [$DecoderName [$($typaram),*]], 'tcx);
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 17c9e52..8e8472a 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -7,7 +7,7 @@
use crate::session::config::{BorrowckMode, OutputFilenames};
use crate::session::config::CrateType;
use crate::middle;
-use crate::hir::{TraitCandidate, HirId, ItemKind, ItemLocalId, Node};
+use crate::hir::{self, TraitCandidate, HirId, ItemKind, ItemLocalId, Node};
use crate::hir::def::{Res, DefKind, Export};
use crate::hir::def_id::{CrateNum, DefId, DefIndex, LOCAL_CRATE};
use crate::hir::map as hir_map;
@@ -45,15 +45,16 @@
use crate::util::common::ErrorReported;
use crate::util::nodemap::{DefIdMap, DefIdSet, ItemLocalMap, ItemLocalSet};
use crate::util::nodemap::{FxHashMap, FxHashSet};
+
use errors::DiagnosticBuilder;
-use smallvec::SmallVec;
-use rustc_data_structures::stable_hasher::{HashStable, hash_stable_hashmap,
- StableHasher, StableHasherResult,
- StableVec};
use arena::SyncDroplessArena;
+use smallvec::SmallVec;
+use rustc_data_structures::stable_hasher::{
+ HashStable, StableHasher, StableHasherResult, StableVec, hash_stable_hashmap,
+};
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
-use rustc_data_structures::sync::{Lrc, Lock, WorkerLocal};
use rustc_data_structures::sharded::ShardedHashMap;
+use rustc_data_structures::sync::{Lrc, Lock, WorkerLocal};
use std::any::Any;
use std::borrow::Borrow;
use std::cmp::Ordering;
@@ -74,8 +75,6 @@
use syntax::symbol::{Symbol, InternedString, kw, sym};
use syntax_pos::Span;
-use crate::hir;
-
pub struct AllArenas {
pub interner: SyncDroplessArena,
}
@@ -91,10 +90,10 @@
type InternedSet<'tcx, T> = ShardedHashMap<Interned<'tcx, T>, ()>;
pub struct CtxtInterners<'tcx> {
- /// The arena that types, regions, etc are allocated from
+ /// The arena that types, regions, etc. are allocated from.
arena: &'tcx SyncDroplessArena,
- /// Specifically use a speedy hash algorithm for these hash sets,
+ /// Specifically use a speedy hash algorithm for these hash sets, since
/// they're accessed quite often.
type_: InternedSet<'tcx, TyS<'tcx>>,
type_list: InternedSet<'tcx, List<Ty<'tcx>>>,
@@ -129,7 +128,7 @@
}
}
- /// Intern a type
+ /// Interns a type.
#[allow(rustc::usage_of_ty_tykind)]
#[inline(never)]
fn intern_ty(&self,
@@ -144,7 +143,6 @@
outer_exclusive_binder: flags.outer_exclusive_binder,
};
-
Interned(self.arena.alloc(ty_struct))
}).0
}
@@ -1025,7 +1023,7 @@
hir_map: hir_map::Map<'tcx>,
- /// A map from DefPathHash -> DefId. Includes DefIds from the local crate
+ /// A map from `DefPathHash` -> `DefId`. Includes `DefId`s from the local crate
/// as well as all upstream crates. Only populated in incremental mode.
pub def_path_hash_to_def_id: Option<FxHashMap<DefPathHash, DefId>>,
@@ -1124,9 +1122,9 @@
})
}
- /// Allocates a byte or string literal for `mir::interpret`, read-only
+ /// Allocates a read-only byte or string literal for `mir::interpret`.
pub fn allocate_bytes(self, bytes: &[u8]) -> interpret::AllocId {
- // create an allocation that just contains these bytes
+ // Create an allocation that just contains these bytes.
let alloc = interpret::Allocation::from_byte_aligned_bytes(bytes);
let alloc = self.intern_const_alloc(alloc);
self.alloc_map.lock().create_memory_alloc(alloc)
@@ -1346,7 +1344,7 @@
}
/// Converts a `DefId` into its fully expanded `DefPath` (every
- /// `DefId` is really just an interned def-path).
+ /// `DefId` is really just an interned `DefPath`).
///
/// Note that if `id` is not local to this crate, the result will
/// be a non-local `DefPath`.
@@ -1402,6 +1400,10 @@
self.cstore.metadata_encoding_version().to_vec()
}
+ pub fn encode_metadata(self)-> EncodedMetadata {
+ self.cstore.encode_metadata(self)
+ }
+
// Note that this is *untracked* and should only be used within the query
// system if the result is otherwise tracked through queries
pub fn crate_data_as_rc_any(self, cnum: CrateNum) -> Lrc<dyn Any> {
@@ -1446,25 +1448,25 @@
self.queries.on_disk_cache.serialize(self.global_tcx(), encoder)
}
- /// If true, we should use the AST-based borrowck (we may *also* use
+ /// If `true`, we should use the AST-based borrowck (we may *also* use
/// the MIR-based borrowck).
pub fn use_ast_borrowck(self) -> bool {
self.borrowck_mode().use_ast()
}
- /// If true, we should use the MIR-based borrow check, but also
- /// fall back on the AST borrow check if the MIR-based one errors.
+ /// If `true`, we should use the MIR-based borrowck, but also
+ /// fall back on the AST borrowck if the MIR-based one errors.
pub fn migrate_borrowck(self) -> bool {
self.borrowck_mode().migrate()
}
- /// If true, make MIR codegen for `match` emit a temp that holds a
+ /// If `true`, make MIR codegen for `match` emit a temp that holds a
/// borrow of the input to the match expression.
pub fn generate_borrow_of_any_match_input(&self) -> bool {
self.emit_read_for_match()
}
- /// If true, make MIR codegen for `match` emit FakeRead
+ /// If `true`, make MIR codegen for `match` emit FakeRead
/// statements (which simulate the maximal effect of executing the
/// patterns in a match arm).
pub fn emit_read_for_match(&self) -> bool {
@@ -1517,7 +1519,7 @@
})
}
- // This method returns the DefId and the BoundRegion corresponding to the given region.
+ // Returns the `DefId` and the `BoundRegion` corresponding to the given region.
pub fn is_suitable_region(&self, region: Region<'tcx>) -> Option<FreeRegionInfo> {
let (suitable_region_binding_scope, bound_region) = match *region {
ty::ReFree(ref free_region) => (free_region.scope, free_region.bound_region),
@@ -1550,18 +1552,18 @@
&self,
scope_def_id: DefId,
) -> Option<Ty<'tcx>> {
- // HACK: `type_of_def_id()` will fail on these (#55796), so return None
+ // HACK: `type_of_def_id()` will fail on these (#55796), so return `None`.
let hir_id = self.hir().as_local_hir_id(scope_def_id).unwrap();
match self.hir().get(hir_id) {
Node::Item(item) => {
match item.node {
- ItemKind::Fn(..) => { /* type_of_def_id() will work */ }
+ ItemKind::Fn(..) => { /* `type_of_def_id()` will work */ }
_ => {
return None;
}
}
}
- _ => { /* type_of_def_id() will work or panic */ }
+ _ => { /* `type_of_def_id()` will work or panic */ }
}
let ret_ty = self.type_of(scope_def_id);
@@ -1579,7 +1581,7 @@
}
}
- // Here we check if the bound region is in Impl Item.
+ // Checks if the bound region is in Impl Item.
pub fn is_bound_region_in_impl_item(
&self,
suitable_region_binding_scope: DefId,
@@ -1599,23 +1601,15 @@
false
}
- /// Determine whether identifiers in the assembly have strict naming rules.
+ /// Determines whether identifiers in the assembly have strict naming rules.
/// Currently, only NVPTX* targets need it.
pub fn has_strict_asm_symbol_naming(&self) -> bool {
- self.gcx.sess.target.target.arch.contains("nvptx")
- }
-}
-
-impl<'tcx> TyCtxt<'tcx> {
- pub fn encode_metadata(self)
- -> EncodedMetadata
- {
- self.cstore.encode_metadata(self)
+ self.sess.target.target.arch.contains("nvptx")
}
}
impl<'tcx> GlobalCtxt<'tcx> {
- /// Call the closure with a local `TyCtxt` using the given arena.
+ /// Calls the closure with a local `TyCtxt` using the given arena.
/// `interners` is a slot passed so we can create a CtxtInterners
/// with the same lifetime as `arena`.
pub fn enter_local<F, R>(&'tcx self, f: F) -> R
@@ -1651,7 +1645,7 @@
/// It would be more efficient if `TypedArena` provided a way to
/// determine whether the address is in the allocated range.
///
-/// None is returned if the value or one of the components is not part
+/// `None` is returned if the value or one of the components is not part
/// of the provided context.
/// For `Ty`, `None` can be returned if either the type interner doesn't
/// contain the `TyKind` key or if the address of the interned
@@ -1662,7 +1656,6 @@
fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted>;
}
-
macro_rules! nop_lift {
($ty:ty => $lifted:ty) => {
impl<'a, 'tcx> Lift<'tcx> for $ty {
@@ -1709,7 +1702,7 @@
nop_list_lift!{CanonicalVarInfo => CanonicalVarInfo}
nop_list_lift!{ProjectionKind => ProjectionKind}
-// this is the impl for `&'a InternalSubsts<'a>`
+// This is the impl for `&'a InternalSubsts<'a>`.
nop_list_lift!{Kind<'a> => Kind<'tcx>}
pub mod tls {
@@ -1732,43 +1725,43 @@
use rustc_rayon_core as rayon_core;
/// This is the implicit state of rustc. It contains the current
- /// TyCtxt and query. It is updated when creating a local interner or
- /// executing a new query. Whenever there's a TyCtxt value available
- /// you should also have access to an ImplicitCtxt through the functions
+ /// `TyCtxt` and query. It is updated when creating a local interner or
+ /// executing a new query. Whenever there's a `TyCtxt` value available
+ /// you should also have access to an `ImplicitCtxt` through the functions
/// in this module.
#[derive(Clone)]
pub struct ImplicitCtxt<'a, 'tcx> {
- /// The current TyCtxt. Initially created by `enter_global` and updated
- /// by `enter_local` with a new local interner
+ /// The current `TyCtxt`. Initially created by `enter_global` and updated
+ /// by `enter_local` with a new local interner.
pub tcx: TyCtxt<'tcx>,
- /// The current query job, if any. This is updated by JobOwner::start in
- /// ty::query::plumbing when executing a query
+ /// The current query job, if any. This is updated by `JobOwner::start` in
+ /// `ty::query::plumbing` when executing a query.
pub query: Option<Lrc<query::QueryJob<'tcx>>>,
/// Where to store diagnostics for the current query job, if any.
- /// This is updated by JobOwner::start in ty::query::plumbing when executing a query
+ /// This is updated by `JobOwner::start` in `ty::query::plumbing` when executing a query.
pub diagnostics: Option<&'a Lock<ThinVec<Diagnostic>>>,
/// Used to prevent layout from recursing too deeply.
pub layout_depth: usize,
/// The current dep graph task. This is used to add dependencies to queries
- /// when executing them
+ /// when executing them.
pub task_deps: Option<&'a Lock<TaskDeps>>,
}
- /// Sets Rayon's thread local variable which is preserved for Rayon jobs
+ /// Sets Rayon's thread-local variable, which is preserved for Rayon jobs
/// to `value` during the call to `f`. It is restored to its previous value after.
- /// This is used to set the pointer to the new ImplicitCtxt.
+ /// This is used to set the pointer to the new `ImplicitCtxt`.
#[cfg(parallel_compiler)]
#[inline]
fn set_tlv<F: FnOnce() -> R, R>(value: usize, f: F) -> R {
rayon_core::tlv::with(value, f)
}
- /// Gets Rayon's thread local variable which is preserved for Rayon jobs.
- /// This is used to get the pointer to the current ImplicitCtxt.
+ /// Gets Rayon's thread-local variable, which is preserved for Rayon jobs.
+ /// This is used to get the pointer to the current `ImplicitCtxt`.
#[cfg(parallel_compiler)]
#[inline]
fn get_tlv() -> usize {
@@ -1777,13 +1770,13 @@
#[cfg(not(parallel_compiler))]
thread_local! {
- /// A thread local variable which stores a pointer to the current ImplicitCtxt.
+ /// A thread local variable that stores a pointer to the current `ImplicitCtxt`.
static TLV: Cell<usize> = Cell::new(0);
}
/// Sets TLV to `value` during the call to `f`.
/// It is restored to its previous value after.
- /// This is used to set the pointer to the new ImplicitCtxt.
+ /// This is used to set the pointer to the new `ImplicitCtxt`.
#[cfg(not(parallel_compiler))]
#[inline]
fn set_tlv<F: FnOnce() -> R, R>(value: usize, f: F) -> R {
@@ -1793,14 +1786,14 @@
f()
}
- /// This is used to get the pointer to the current ImplicitCtxt.
+ /// Gets the pointer to the current `ImplicitCtxt`.
#[cfg(not(parallel_compiler))]
fn get_tlv() -> usize {
TLV.with(|tlv| tlv.get())
}
/// This is a callback from libsyntax as it cannot access the implicit state
- /// in librustc otherwise
+ /// in librustc otherwise.
fn span_debug(span: syntax_pos::Span, f: &mut fmt::Formatter<'_>) -> fmt::Result {
with_opt(|tcx| {
if let Some(tcx) = tcx {
@@ -1825,7 +1818,7 @@
})
}
- /// Sets up the callbacks from libsyntax on the current thread
+ /// Sets up the callbacks from libsyntax on the current thread.
pub fn with_thread_locals<F, R>(f: F) -> R
where F: FnOnce() -> R
{
@@ -1850,7 +1843,7 @@
})
}
- /// Sets `context` as the new current ImplicitCtxt for the duration of the function `f`
+ /// Sets `context` as the new current `ImplicitCtxt` for the duration of the function `f`.
#[inline]
pub fn enter_context<'a, 'tcx, F, R>(context: &ImplicitCtxt<'a, 'tcx>, f: F) -> R
where
@@ -1861,19 +1854,19 @@
})
}
- /// Enters GlobalCtxt by setting up libsyntax callbacks and
- /// creating a initial TyCtxt and ImplicitCtxt.
- /// This happens once per rustc session and TyCtxts only exists
+ /// Enters `GlobalCtxt` by setting up libsyntax callbacks and
+ /// creating a initial `TyCtxt` and `ImplicitCtxt`.
+ /// This happens once per rustc session and `TyCtxt`s only exists
/// inside the `f` function.
pub fn enter_global<'tcx, F, R>(gcx: &'tcx GlobalCtxt<'tcx>, f: F) -> R
where
F: FnOnce(TyCtxt<'tcx>) -> R,
{
- // Update GCX_PTR to indicate there's a GlobalCtxt available
+ // Update `GCX_PTR` to indicate there's a `GlobalCtxt` available.
GCX_PTR.with(|lock| {
*lock.lock() = gcx as *const _ as usize;
});
- // Set GCX_PTR back to 0 when we exit
+ // Set `GCX_PTR` back to 0 when we exit.
let _on_drop = OnDrop(move || {
GCX_PTR.with(|lock| *lock.lock() = 0);
});
@@ -1894,12 +1887,12 @@
}
scoped_thread_local! {
- /// Stores a pointer to the GlobalCtxt if one is available.
- /// This is used to access the GlobalCtxt in the deadlock handler given to Rayon.
+ /// Stores a pointer to the `GlobalCtxt` if one is available.
+ /// This is used to access the `GlobalCtxt` in the deadlock handler given to Rayon.
pub static GCX_PTR: Lock<usize>
}
- /// Creates a TyCtxt and ImplicitCtxt based on the GCX_PTR thread local.
+ /// Creates a `TyCtxt` and `ImplicitCtxt` based on the `GCX_PTR` thread local.
/// This is used in the deadlock handler.
pub unsafe fn with_global<F, R>(f: F) -> R
where
@@ -1921,7 +1914,7 @@
enter_context(&icx, |_| f(tcx))
}
- /// Allows access to the current ImplicitCtxt in a closure if one is available
+ /// Allows access to the current `ImplicitCtxt` in a closure if one is available.
#[inline]
pub fn with_context_opt<F, R>(f: F) -> R
where
@@ -1931,16 +1924,16 @@
if context == 0 {
f(None)
} else {
- // We could get a ImplicitCtxt pointer from another thread.
- // Ensure that ImplicitCtxt is Sync
+ // We could get a `ImplicitCtxt` pointer from another thread.
+ // Ensure that `ImplicitCtxt` is `Sync`.
sync::assert_sync::<ImplicitCtxt<'_, '_>>();
unsafe { f(Some(&*(context as *const ImplicitCtxt<'_, '_>))) }
}
}
- /// Allows access to the current ImplicitCtxt.
- /// Panics if there is no ImplicitCtxt available
+ /// Allows access to the current `ImplicitCtxt`.
+ /// Panics if there is no `ImplicitCtxt` available.
#[inline]
pub fn with_context<F, R>(f: F) -> R
where
@@ -1949,11 +1942,11 @@
with_context_opt(|opt_context| f(opt_context.expect("no ImplicitCtxt stored in tls")))
}
- /// Allows access to the current ImplicitCtxt whose tcx field has the same global
- /// interner as the tcx argument passed in. This means the closure is given an ImplicitCtxt
- /// with the same 'tcx lifetime as the TyCtxt passed in.
- /// This will panic if you pass it a TyCtxt which has a different global interner from
- /// the current ImplicitCtxt's tcx field.
+ /// Allows access to the current `ImplicitCtxt` whose tcx field has the same global
+ /// interner as the tcx argument passed in. This means the closure is given an `ImplicitCtxt`
+ /// with the same `'tcx` lifetime as the `TyCtxt` passed in.
+ /// This will panic if you pass it a `TyCtxt` which has a different global interner from
+ /// the current `ImplicitCtxt`'s `tcx` field.
#[inline]
pub fn with_related_context<'tcx, F, R>(tcx: TyCtxt<'tcx>, f: F) -> R
where
@@ -1968,8 +1961,8 @@
})
}
- /// Allows access to the TyCtxt in the current ImplicitCtxt.
- /// Panics if there is no ImplicitCtxt available
+ /// Allows access to the `TyCtxt` in the current `ImplicitCtxt`.
+ /// Panics if there is no `ImplicitCtxt` available.
#[inline]
pub fn with<F, R>(f: F) -> R
where
@@ -1978,8 +1971,8 @@
with_context(|context| f(context.tcx))
}
- /// Allows access to the TyCtxt in the current ImplicitCtxt.
- /// The closure is passed None if there is no ImplicitCtxt available
+ /// Allows access to the `TyCtxt` in the current `ImplicitCtxt`.
+ /// The closure is passed None if there is no `ImplicitCtxt` available.
#[inline]
pub fn with_opt<F, R>(f: F) -> R
where
@@ -1991,7 +1984,7 @@
macro_rules! sty_debug_print {
($ctxt: expr, $($variant: ident),*) => {{
- // curious inner module to allow variant names to be used as
+ // Curious inner module to allow variant names to be used as
// variable names.
#[allow(non_snake_case)]
mod inner {
@@ -2265,9 +2258,9 @@
projs: _intern_projs(ProjectionKind)
);
-// This isn't a perfect fit: CanonicalVarInfo slices are always
+// This isn't a perfect fit: `CanonicalVarInfo` slices are always
// allocated in the global arena, so this `intern_method!` macro is
-// overly general. But we just return false for the code that checks
+// overly general. However, we just return `false` for the code that checks
// whether they belong in the thread-local arena, so no harm done, and
// seems better than open-coding the rest.
intern_method! {
@@ -2366,7 +2359,7 @@
#[inline]
pub fn mk_adt(self, def: &'tcx AdtDef, substs: SubstsRef<'tcx>) -> Ty<'tcx> {
- // take a copy of substs so that we own the vectors inside
+ // Take a copy of substs so that we own the vectors inside.
self.mk_ty(Adt(def, substs))
}
diff --git a/src/librustc/ty/error.rs b/src/librustc/ty/error.rs
index fe8f94a..62910ec 100644
--- a/src/librustc/ty/error.rs
+++ b/src/librustc/ty/error.rs
@@ -4,6 +4,7 @@
use std::fmt;
use rustc_target::spec::abi;
use syntax::ast;
+use syntax::errors::pluralise;
use errors::{Applicability, DiagnosticBuilder};
use syntax_pos::Span;
@@ -82,12 +83,6 @@
}
};
- macro_rules! pluralise {
- ($x:expr) => {
- if $x != 1 { "s" } else { "" }
- };
- }
-
match *self {
CyclicTy(_) => write!(f, "cyclic type of infinite size"),
Mismatch => write!(f, "types differ"),
@@ -200,7 +195,9 @@
ty::Array(_, n) => {
let n = tcx.lift_to_global(&n).unwrap();
match n.try_eval_usize(tcx, ty::ParamEnv::empty()) {
- Some(n) => format!("array of {} elements", n).into(),
+ Some(n) => {
+ format!("array of {} element{}", n, if n != 1 { "s" } else { "" }).into()
+ }
None => "array".into(),
}
}
diff --git a/src/librustc/ty/fold.rs b/src/librustc/ty/fold.rs
index 4b30412..1e08ae4 100644
--- a/src/librustc/ty/fold.rs
+++ b/src/librustc/ty/fold.rs
@@ -39,8 +39,8 @@
use std::fmt;
use crate::util::nodemap::FxHashSet;
-/// The TypeFoldable trait is implemented for every type that can be folded.
-/// Basically, every type that has a corresponding method in TypeFolder.
+/// This trait is implemented for every type that can be folded.
+/// Basically, every type that has a corresponding method in `TypeFolder`.
///
/// To implement this conveniently, use the
/// `BraceStructTypeFoldableImpl` etc macros found in `macros.rs`.
diff --git a/src/librustc/ty/inhabitedness/def_id_forest.rs b/src/librustc/ty/inhabitedness/def_id_forest.rs
index 4453624..63cc60d 100644
--- a/src/librustc/ty/inhabitedness/def_id_forest.rs
+++ b/src/librustc/ty/inhabitedness/def_id_forest.rs
@@ -4,20 +4,20 @@
use crate::ty::context::TyCtxt;
use crate::ty::{DefId, DefIdTree};
-/// Represents a forest of DefIds closed under the ancestor relation. That is,
-/// if a DefId representing a module is contained in the forest then all
-/// DefIds defined in that module or submodules are also implicitly contained
+/// Represents a forest of `DefId`s closed under the ancestor relation. That is,
+/// if a `DefId` representing a module is contained in the forest then all
+/// `DefId`s defined in that module or submodules are also implicitly contained
/// in the forest.
///
/// This is used to represent a set of modules in which a type is visibly
/// uninhabited.
#[derive(Clone)]
pub struct DefIdForest {
- /// The minimal set of DefIds required to represent the whole set.
- /// If A and B are DefIds in the DefIdForest, and A is a descendant
- /// of B, then only B will be in root_ids.
- /// We use a SmallVec here because (for its use for caching inhabitedness)
- /// its rare that this will contain even two ids.
+ /// The minimal set of `DefId`s required to represent the whole set.
+ /// If A and B are DefIds in the `DefIdForest`, and A is a descendant
+ /// of B, then only B will be in `root_ids`.
+ /// We use a `SmallVec` here because (for its use for caching inhabitedness)
+ /// its rare that this will contain even two IDs.
root_ids: SmallVec<[DefId; 1]>,
}
@@ -37,7 +37,7 @@
DefIdForest::from_id(crate_id)
}
- /// Creates a forest containing a DefId and all its descendants.
+ /// Creates a forest containing a `DefId` and all its descendants.
pub fn from_id(id: DefId) -> DefIdForest {
let mut root_ids = SmallVec::new();
root_ids.push(id);
diff --git a/src/librustc/ty/inhabitedness/mod.rs b/src/librustc/ty/inhabitedness/mod.rs
index 2b32916..1a0e351 100644
--- a/src/librustc/ty/inhabitedness/mod.rs
+++ b/src/librustc/ty/inhabitedness/mod.rs
@@ -1,3 +1,5 @@
+pub use self::def_id_forest::DefIdForest;
+
use crate::ty::context::TyCtxt;
use crate::ty::{AdtDef, VariantDef, FieldDef, Ty, TyS};
use crate::ty::{DefId, SubstsRef};
@@ -5,12 +7,10 @@
use crate::ty::TyKind::*;
use crate::ty;
-pub use self::def_id_forest::DefIdForest;
-
mod def_id_forest;
-// The methods in this module calculate DefIdForests of modules in which a
-// AdtDef/VariantDef/FieldDef is visibly uninhabited.
+// The methods in this module calculate `DefIdForest`s of modules in which a
+// `AdtDef`/`VariantDef`/`FieldDef` is visibly uninhabited.
//
// # Example
// ```rust
@@ -36,24 +36,25 @@
// y: c::AlsoSecretlyUninhabited,
// }
// ```
-// In this code, the type Foo will only be visibly uninhabited inside the
-// modules b, c and d. Calling uninhabited_from on Foo or its AdtDef will
-// return the forest of modules {b, c->d} (represented in a DefIdForest by the
-// set {b, c})
+// In this code, the type `Foo` will only be visibly uninhabited inside the
+// modules `b`, `c` and `d`. Calling `uninhabited_from` on `Foo` or its `AdtDef` will
+// return the forest of modules {`b`, `c`->`d`} (represented in a `DefIdForest` by the
+// set {`b`, `c`}).
//
-// We need this information for pattern-matching on Foo or types that contain
-// Foo.
+// We need this information for pattern-matching on `Foo` or types that contain
+// `Foo`.
//
// # Example
// ```rust
// let foo_result: Result<T, Foo> = ... ;
// let Ok(t) = foo_result;
// ```
-// This code should only compile in modules where the uninhabitedness of Foo is
+// This code should only compile in modules where the uninhabitedness of `Foo` is
// visible.
impl<'tcx> TyCtxt<'tcx> {
/// Checks whether a type is visibly uninhabited from a particular module.
+ ///
/// # Example
/// ```rust
/// enum Void {}
@@ -91,7 +92,7 @@
/// visible.
pub fn is_ty_uninhabited_from(self, module: DefId, ty: Ty<'tcx>) -> bool {
// To check whether this type is uninhabited at all (not just from the
- // given node) you could check whether the forest is empty.
+ // given node), you could check whether the forest is empty.
// ```
// forest.is_empty()
// ```
@@ -108,7 +109,7 @@
}
impl<'tcx> AdtDef {
- /// Calculate the forest of DefIds from which this adt is visibly uninhabited.
+ /// Calculates the forest of `DefId`s from which this ADT is visibly uninhabited.
fn uninhabited_from(&self, tcx: TyCtxt<'tcx>, substs: SubstsRef<'tcx>) -> DefIdForest {
// Non-exhaustive ADTs from other crates are always considered inhabited.
if self.is_variant_list_non_exhaustive() && !self.did.is_local() {
@@ -122,7 +123,7 @@
}
impl<'tcx> VariantDef {
- /// Calculate the forest of DefIds from which this variant is visibly uninhabited.
+ /// Calculates the forest of `DefId`s from which this variant is visibly uninhabited.
pub fn uninhabited_from(
&self,
tcx: TyCtxt<'tcx>,
@@ -148,7 +149,7 @@
}
impl<'tcx> FieldDef {
- /// Calculate the forest of DefIds from which this field is visibly uninhabited.
+ /// Calculates the forest of `DefId`s from which this field is visibly uninhabited.
fn uninhabited_from(
&self,
tcx: TyCtxt<'tcx>,
@@ -159,7 +160,7 @@
self.ty(tcx, substs).uninhabited_from(tcx)
};
// FIXME(canndrew): Currently enum fields are (incorrectly) stored with
- // Visibility::Invisible so we need to override self.vis if we're
+ // `Visibility::Invisible` so we need to override `self.vis` if we're
// dealing with an enum.
if is_enum {
data_uninhabitedness()
@@ -178,7 +179,7 @@
}
impl<'tcx> TyS<'tcx> {
- /// Calculate the forest of DefIds from which this type is visibly uninhabited.
+ /// Calculates the forest of `DefId`s from which this type is visibly uninhabited.
fn uninhabited_from(&self, tcx: TyCtxt<'tcx>) -> DefIdForest {
match self.sty {
Adt(def, substs) => def.uninhabited_from(tcx, substs),
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index 2da50f3..41e4295 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -590,7 +590,7 @@
pub type CanonicalTy<'tcx> = Canonical<'tcx, Ty<'tcx>>;
extern {
- /// A dummy type used to force List to by unsized without requiring fat pointers
+ /// A dummy type used to force `List` to by unsized without requiring fat pointers.
type OpaqueListContents;
}
diff --git a/src/librustc/ty/print/mod.rs b/src/librustc/ty/print/mod.rs
index 092e7c6..50789bf 100644
--- a/src/librustc/ty/print/mod.rs
+++ b/src/librustc/ty/print/mod.rs
@@ -27,7 +27,8 @@
/// which the associated types allow passing through the methods.
///
/// For pretty-printing/formatting in particular, see `PrettyPrinter`.
-// FIXME(eddyb) find a better name, this is more general than "printing".
+//
+// FIXME(eddyb) find a better name; this is more general than "printing".
pub trait Printer<'tcx>: Sized {
type Error;
@@ -46,6 +47,7 @@
) -> Result<Self::Path, Self::Error> {
self.default_print_def_path(def_id, substs)
}
+
fn print_impl_path(
self,
impl_def_id: DefId,
@@ -80,6 +82,7 @@
self,
cnum: CrateNum,
) -> Result<Self::Path, Self::Error>;
+
fn path_qualified(
self,
self_ty: Ty<'tcx>,
@@ -93,11 +96,13 @@
self_ty: Ty<'tcx>,
trait_ref: Option<ty::TraitRef<'tcx>>,
) -> Result<Self::Path, Self::Error>;
+
fn path_append(
self,
print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
disambiguated_data: &DisambiguatedDefPathData,
) -> Result<Self::Path, Self::Error>;
+
fn path_generic_args(
self,
print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
diff --git a/src/librustc/ty/print/pretty.rs b/src/librustc/ty/print/pretty.rs
index a72ecdb..d995801 100644
--- a/src/librustc/ty/print/pretty.rs
+++ b/src/librustc/ty/print/pretty.rs
@@ -8,10 +8,11 @@
use crate::ty::subst::{Kind, Subst, UnpackedKind};
use crate::ty::layout::{Integer, IntegerExt, Size};
use crate::mir::interpret::{ConstValue, sign_extend, Scalar, truncate};
-use syntax::ast;
+
use rustc_apfloat::ieee::{Double, Single};
use rustc_apfloat::Float;
use rustc_target::spec::abi::Abi;
+use syntax::ast;
use syntax::attr::{SignedInt, UnsignedInt};
use syntax::symbol::{kw, InternedString};
@@ -194,7 +195,7 @@
value.skip_binder().print(self)
}
- /// Print comma-separated elements.
+ /// Prints comma-separated elements.
fn comma_sep<T>(mut self, mut elems: impl Iterator<Item = T>) -> Result<Self, Self::Error>
where
T: Print<'tcx, Self, Output = Self, Error = Self::Error>,
@@ -209,14 +210,14 @@
Ok(self)
}
- /// Print `<...>` around what `f` prints.
+ /// Prints `<...>` around what `f` prints.
fn generic_delimiters(
self,
f: impl FnOnce(Self) -> Result<Self, Self::Error>,
) -> Result<Self, Self::Error>;
- /// Return `true` if the region should be printed in
- /// optional positions, e.g. `&'a T` or `dyn Tr + 'b`.
+ /// Returns `true` if the region should be printed in
+ /// optional positions, e.g., `&'a T` or `dyn Tr + 'b`.
/// This is typically the case for all non-`'_` regions.
fn region_should_not_be_omitted(
&self,
@@ -226,7 +227,7 @@
// Defaults (should not be overriden):
/// If possible, this returns a global path resolving to `def_id` that is visible
- /// from at least one local module and returns true. If the crate defining `def_id` is
+ /// from at least one local module, and returns `true`. If the crate defining `def_id` is
/// declared with an `extern crate`, the path is guaranteed to use the `extern crate`.
fn try_print_visible_def_path(
self,
@@ -267,11 +268,11 @@
// In local mode, when we encounter a crate other than
// LOCAL_CRATE, execution proceeds in one of two ways:
//
- // 1. for a direct dependency, where user added an
+ // 1. For a direct dependency, where user added an
// `extern crate` manually, we put the `extern
// crate` as the parent. So you wind up with
// something relative to the current crate.
- // 2. for an extern inferred from a path or an indirect crate,
+ // 2. For an extern inferred from a path or an indirect crate,
// where there is no explicit `extern crate`, we just prepend
// the crate name.
match self.tcx().extern_crate(def_id) {
@@ -304,13 +305,13 @@
let mut cur_def_key = self.tcx().def_key(def_id);
debug!("try_print_visible_def_path: cur_def_key={:?}", cur_def_key);
- // For a constructor we want the name of its parent rather than <unnamed>.
+ // For a constructor, we want the name of its parent rather than <unnamed>.
match cur_def_key.disambiguated_data.data {
DefPathData::Ctor => {
let parent = DefId {
krate: def_id.krate,
index: cur_def_key.parent
- .expect("DefPathData::Ctor/VariantData missing a parent"),
+ .expect("`DefPathData::Ctor` / `VariantData` missing a parent"),
};
cur_def_key = self.tcx().def_key(parent);
@@ -630,7 +631,7 @@
sep = ", ";
}
} else {
- // cross-crate closure types should only be
+ // Cross-crate closure types should only be
// visible in codegen bug reports, I imagine.
p!(write("@{:?}", did));
let mut sep = " ";
@@ -673,7 +674,7 @@
sep = ", ";
}
} else {
- // cross-crate closure types should only be
+ // Cross-crate closure types should only be
// visible in codegen bug reports, I imagine.
p!(write("@{:?}", did));
let mut sep = " ";
@@ -1173,6 +1174,7 @@
}
Ok(self)
}
+
fn path_qualified(
mut self,
self_ty: Ty<'tcx>,
@@ -1201,6 +1203,7 @@
self.empty_path = false;
Ok(self)
}
+
fn path_append(
mut self,
print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
@@ -1238,6 +1241,7 @@
Ok(self)
}
+
fn path_generic_args(
mut self,
print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs
index 674f894..4cef6a0 100644
--- a/src/librustc/ty/query/on_disk_cache.rs
+++ b/src/librustc/ty/query/on_disk_cache.rs
@@ -5,9 +5,6 @@
use crate::ich::{CachingSourceMapView, Fingerprint};
use crate::mir::{self, interpret};
use crate::mir::interpret::{AllocDecodingSession, AllocDecodingState};
-use rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque,
- SpecializedDecoder, SpecializedEncoder,
- UseSpecializedDecodable, UseSpecializedEncodable};
use crate::session::{CrateDisambiguator, Session};
use crate::ty::{self, Ty};
use crate::ty::codec::{self as ty_codec, TyDecoder, TyEncoder};
@@ -19,6 +16,10 @@
use rustc_data_structures::thin_vec::ThinVec;
use rustc_data_structures::sync::{Lrc, Lock, HashMapExt, Once};
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
+use rustc_serialize::{
+ Decodable, Decoder, Encodable, Encoder, SpecializedDecoder, SpecializedEncoder,
+ UseSpecializedDecodable, UseSpecializedEncodable, opaque,
+};
use std::mem;
use syntax::ast::{Ident, NodeId};
use syntax::source_map::{SourceMap, StableSourceFileId};
@@ -37,17 +38,16 @@
const TAG_VALID_SPAN: u8 = 0;
const TAG_INVALID_SPAN: u8 = 1;
-/// `OnDiskCache` provides an interface to incr. comp. data cached from the
+/// Provides an interface to incremental compilation data cached from the
/// previous compilation session. This data will eventually include the results
/// of a few selected queries (like `typeck_tables_of` and `mir_optimized`) and
/// any diagnostics that have been emitted during a query.
pub struct OnDiskCache<'sess> {
-
// The complete cache data in serialized form.
serialized_data: Vec<u8>,
- // This field collects all Diagnostics emitted during the current
- // compilation session.
+ // Collects all `Diagnostic`s emitted during the current compilation
+ // session.
current_diagnostics: Lock<FxHashMap<DepNodeIndex, Vec<Diagnostic>>>,
prev_cnums: Vec<(u32, String, CrateDisambiguator)>,
@@ -56,7 +56,7 @@
source_map: &'sess SourceMap,
file_index_to_stable_id: FxHashMap<SourceFileIndex, StableSourceFileId>,
- // These two fields caches that are populated lazily during decoding.
+ // Caches that are populated lazily during decoding.
file_index_to_file: Lock<FxHashMap<SourceFileIndex, Lrc<SourceFile>>>,
synthetic_syntax_contexts: Lock<FxHashMap<AbsoluteBytePos, SyntaxContext>>,
@@ -78,7 +78,7 @@
prev_cnums: Vec<(u32, String, CrateDisambiguator)>,
query_result_index: EncodedQueryResultIndex,
diagnostics_index: EncodedQueryResultIndex,
- // the location of all allocations
+ // The location of all allocations.
interpret_alloc_index: Vec<u32>,
}
@@ -104,28 +104,28 @@
}
impl<'sess> OnDiskCache<'sess> {
- /// Creates a new OnDiskCache instance from the serialized data in `data`.
- pub fn new(sess: &'sess Session, data: Vec<u8>, start_pos: usize) -> OnDiskCache<'sess> {
+ /// Creates a new `OnDiskCache` instance from the serialized data in `data`.
+ pub fn new(sess: &'sess Session, data: Vec<u8>, start_pos: usize) -> Self {
debug_assert!(sess.opts.incremental.is_some());
- // Wrapping in a scope so we can borrow `data`
+ // Wrap in a scope so we can borrow `data`.
let footer: Footer = {
let mut decoder = opaque::Decoder::new(&data[..], start_pos);
- // Decode the *position* of the footer which can be found in the
+ // Decode the *position* of the footer, which can be found in the
// last 8 bytes of the file.
decoder.set_position(data.len() - IntEncodedWithFixedSize::ENCODED_SIZE);
- let query_result_index_pos = IntEncodedWithFixedSize::decode(&mut decoder)
- .expect("Error while trying to decode query result index position.")
+ let footer_pos = IntEncodedWithFixedSize::decode(&mut decoder)
+ .expect("error while trying to decode footer position")
.0 as usize;
- // Decoder the file footer which contains all the lookup tables, etc.
- decoder.set_position(query_result_index_pos);
+ // Decode the file footer, which contains all the lookup tables, etc.
+ decoder.set_position(footer_pos);
decode_tagged(&mut decoder, TAG_FILE_FOOTER)
- .expect("Error while trying to decode query result index position.")
+ .expect("error while trying to decode footer position")
};
- OnDiskCache {
+ Self {
serialized_data: data,
file_index_to_stable_id: footer.file_index_to_stable_id,
file_index_to_file: Default::default(),
@@ -140,8 +140,8 @@
}
}
- pub fn new_empty(source_map: &'sess SourceMap) -> OnDiskCache<'sess> {
- OnDiskCache {
+ pub fn new_empty(source_map: &'sess SourceMap) -> Self {
+ Self {
serialized_data: Vec::new(),
file_index_to_stable_id: Default::default(),
file_index_to_file: Default::default(),
@@ -158,11 +158,11 @@
pub fn serialize<'tcx, E>(&self, tcx: TyCtxt<'tcx>, encoder: &mut E) -> Result<(), E::Error>
where
- E: ty_codec::TyEncoder,
+ E: TyEncoder,
{
- // Serializing the DepGraph should not modify it:
+ // Serializing the `DepGraph` should not modify it.
tcx.dep_graph.with_ignore(|| {
- // Allocate SourceFileIndices
+ // Allocate `SourceFileIndex`es.
let (file_to_file_index, file_index_to_stable_id) = {
let files = tcx.sess.source_map().files();
let mut file_to_file_index = FxHashMap::with_capacity_and_hasher(
@@ -197,7 +197,7 @@
// be in memory, so this should be a cheap operation.
tcx.dep_graph.exec_cache_promotions(tcx);
- // Encode query results
+ // Encode query results.
let mut query_result_index = EncodedQueryResultIndex::new();
time(tcx.sess, "encode query results", || {
@@ -221,29 +221,28 @@
Ok(())
})?;
- // Encode diagnostics
+ // Encode diagnostics.
let diagnostics_index: EncodedDiagnosticsIndex = self.current_diagnostics.borrow()
.iter()
- .map(|(dep_node_index, diagnostics)|
- {
- let pos = AbsoluteBytePos::new(encoder.position());
- // Let's make sure we get the expected type here:
- let diagnostics: &EncodedDiagnostics = diagnostics;
- let dep_node_index = SerializedDepNodeIndex::new(dep_node_index.index());
- encoder.encode_tagged(dep_node_index, diagnostics)?;
+ .map(|(dep_node_index, diagnostics)| {
+ let pos = AbsoluteBytePos::new(encoder.position());
+ // Let's make sure we get the expected type here.
+ let diagnostics: &EncodedDiagnostics = diagnostics;
+ let dep_node_index = SerializedDepNodeIndex::new(dep_node_index.index());
+ encoder.encode_tagged(dep_node_index, diagnostics)?;
- Ok((dep_node_index, pos))
- })
- .collect::<Result<_, _>>()?;
+ Ok((dep_node_index, pos))
+ })
+ .collect::<Result<_, _>>()?;
let interpret_alloc_index = {
let mut interpret_alloc_index = Vec::new();
let mut n = 0;
loop {
let new_n = encoder.interpret_allocs_inverse.len();
- // if we have found new ids, serialize those, too
+ // If we have found new IDs, serialize those too.
if n == new_n {
- // otherwise, abort
+ // Otherwise, abort.
break;
}
interpret_alloc_index.reserve(new_n - n);
@@ -263,13 +262,15 @@
};
let sorted_cnums = sorted_cnums_including_local_crate(tcx);
- let prev_cnums: Vec<_> = sorted_cnums.iter().map(|&cnum| {
- let crate_name = tcx.original_crate_name(cnum).as_str().to_string();
- let crate_disambiguator = tcx.crate_disambiguator(cnum);
- (cnum.as_u32(), crate_name, crate_disambiguator)
- }).collect();
+ let prev_cnums: Vec<_> = sorted_cnums.iter()
+ .map(|&cnum| {
+ let crate_name = tcx.original_crate_name(cnum).as_str().to_string();
+ let crate_disambiguator = tcx.crate_disambiguator(cnum);
+ (cnum.as_u32(), crate_name, crate_disambiguator)
+ })
+ .collect();
- // Encode the file footer
+ // Encode the file footer.
let footer_pos = encoder.position() as u64;
encoder.encode_tagged(TAG_FILE_FOOTER, &Footer {
file_index_to_stable_id,
@@ -371,7 +372,7 @@
{
let pos = index.get(&dep_node_index).cloned()?;
- // Initialize the cnum_map using the value from the thread which finishes the closure first
+ // Initialize `cnum_map` using the value from the thread that finishes the closure first.
self.cnum_map.init_nonlocking_same(|| {
Self::compute_cnum_map(tcx, &self.prev_cnums[..])
});
@@ -381,25 +382,21 @@
opaque: opaque::Decoder::new(&self.serialized_data[..], pos.to_usize()),
source_map: self.source_map,
cnum_map: self.cnum_map.get(),
+ synthetic_syntax_contexts: &self.synthetic_syntax_contexts,
file_index_to_file: &self.file_index_to_file,
file_index_to_stable_id: &self.file_index_to_stable_id,
- synthetic_syntax_contexts: &self.synthetic_syntax_contexts,
alloc_decoding_session: self.alloc_decoding_state.new_decoding_session(),
};
match decode_tagged(&mut decoder, dep_node_index) {
- Ok(value) => {
- Some(value)
- }
- Err(e) => {
- bug!("Could not decode cached {}: {}", debug_tag, e)
- }
+ Ok(v) => Some(v),
+ Err(e) => bug!("could not decode cached {}: {}", debug_tag, e),
}
}
- // This function builds mapping from previous-session-CrateNum to
- // current-session-CrateNum. There might be CrateNums from the previous
- // Session that don't occur in the current one. For these, the mapping
+ // This function builds mapping from previous-session-`CrateNum` to
+ // current-session-`CrateNum`. There might be `CrateNum`s from the previous
+ // `Session` that don't occur in the current one. For these, the mapping
// maps to None.
fn compute_cnum_map(
tcx: TyCtxt<'_>,
@@ -432,9 +429,9 @@
//- DECODING -------------------------------------------------------------------
-/// A decoder that can read the incr. comp. cache. It is similar to the one
-/// we use for crate metadata decoding in that it can rebase spans and
-/// eventually will also handle things that contain `Ty` instances.
+/// A decoder that can read fro the incr. comp. cache. It is similar to the one
+/// we use for crate metadata decoding in that it can rebase spans and eventually
+/// will also handle things that contain `Ty` instances.
struct CacheDecoder<'a, 'tcx> {
tcx: TyCtxt<'tcx>,
opaque: opaque::Decoder<'a>,
@@ -458,7 +455,7 @@
file_index_to_file.borrow_mut().entry(index).or_insert_with(|| {
let stable_id = file_index_to_stable_id[&index];
source_map.source_file_by_stable_id(stable_id)
- .expect("Failed to lookup SourceFile in new context.")
+ .expect("failed to lookup `SourceFile` in new context")
}).clone()
}
}
@@ -479,7 +476,7 @@
}
}
-// Decode something that was encoded with encode_tagged() and verify that the
+// Decodes something that was encoded with `encode_tagged()` and verify that the
// tag matches and the correct amount of bytes was read.
fn decode_tagged<D, T, V>(decoder: &mut D, expected_tag: T) -> Result<V, D::Error>
where
@@ -500,7 +497,7 @@
Ok(value)
}
-impl<'a, 'tcx> ty_codec::TyDecoder<'tcx> for CacheDecoder<'a, 'tcx> {
+impl<'a, 'tcx> TyDecoder<'tcx> for CacheDecoder<'a, 'tcx> {
#[inline]
fn tcx(&self) -> TyCtxt<'tcx> {
self.tcx
@@ -534,7 +531,7 @@
}
let ty = or_insert_with(self)?;
- // This may overwrite the entry, but it should overwrite with the same value
+ // This may overwrite the entry, but it should overwrite with the same value.
tcx.rcache.borrow_mut().insert_same(cache_key, ty);
Ok(ty)
}
@@ -553,7 +550,7 @@
fn map_encoded_cnum_to_current(&self, cnum: CrateNum) -> CrateNum {
self.cnum_map[cnum].unwrap_or_else(|| {
- bug!("Could not find new CrateNum for {:?}", cnum)
+ bug!("could not find new `CrateNum` for {:?}", cnum)
})
}
}
@@ -635,25 +632,25 @@
}
// This impl makes sure that we get a runtime error when we try decode a
-// DefIndex that is not contained in a DefId. Such a case would be problematic
-// because we would not know how to transform the DefIndex to the current
+// `DefIndex` that is not contained in a `DefId`. Such a case would be problematic
+// because we would not know how to transform the `DefIndex` to the current
// context.
impl<'a, 'tcx> SpecializedDecoder<DefIndex> for CacheDecoder<'a, 'tcx> {
fn specialized_decode(&mut self) -> Result<DefIndex, Self::Error> {
- bug!("Trying to decode DefIndex outside the context of a DefId")
+ bug!("trying to decode `DefIndex` outside the context of a `DefId`")
}
}
-// Both the CrateNum and the DefIndex of a DefId can change in between two
-// compilation sessions. We use the DefPathHash, which is stable across
-// sessions, to map the old DefId to the new one.
+// Both the `CrateNum` and the `DefIndex` of a `DefId` can change in between two
+// compilation sessions. We use the `DefPathHash`, which is stable across
+// sessions, to map the old DefId`` to the new one.
impl<'a, 'tcx> SpecializedDecoder<DefId> for CacheDecoder<'a, 'tcx> {
#[inline]
fn specialized_decode(&mut self) -> Result<DefId, Self::Error> {
- // Load the DefPathHash which is was we encoded the DefId as.
+ // Load the `DefPathHash` which is was we encoded the `DefId` as.
let def_path_hash = DefPathHash::decode(self)?;
- // Using the DefPathHash, we can lookup the new DefId
+ // Using the `DefPathHash`, we can lookup the new `DefId`.
Ok(self.tcx().def_path_hash_to_def_id.as_ref().unwrap()[&def_path_hash])
}
}
@@ -667,10 +664,10 @@
impl<'a, 'tcx> SpecializedDecoder<hir::HirId> for CacheDecoder<'a, 'tcx> {
fn specialized_decode(&mut self) -> Result<hir::HirId, Self::Error> {
- // Load the DefPathHash which is was we encoded the DefIndex as.
+ // Load the `DefPathHash` which is what we encoded the `DefIndex` as.
let def_path_hash = DefPathHash::decode(self)?;
- // Use the DefPathHash to map to the current DefId.
+ // Use the `DefPathHash` to map to the current `DefId`.
let def_id = self.tcx()
.def_path_hash_to_def_id
.as_ref()
@@ -678,10 +675,10 @@
debug_assert!(def_id.is_local());
- // The ItemLocalId needs no remapping.
+ // The `ItemLocalId` needs no remapping.
let local_id = hir::ItemLocalId::decode(self)?;
- // Reconstruct the HirId and look up the corresponding NodeId in the
+ // Reconstruct the `HirId` and look up the corresponding `NodeId` in the
// context of the current session.
Ok(hir::HirId {
owner: def_id.index,
@@ -690,8 +687,8 @@
}
}
-// NodeIds are not stable across compilation sessions, so we store them in their
-// HirId representation. This allows use to map them to the current NodeId.
+// `NodeId`s are not stable across compilation sessions, so we store them in their
+// `HirId` representation. This allows use to map them to the current `NodeId`.
impl<'a, 'tcx> SpecializedDecoder<NodeId> for CacheDecoder<'a, 'tcx> {
#[inline]
fn specialized_decode(&mut self) -> Result<NodeId, Self::Error> {
@@ -728,6 +725,7 @@
//- ENCODING -------------------------------------------------------------------
+/// An encoder that can write the incr. comp. cache.
struct CacheEncoder<'a, 'tcx, E: ty_codec::TyEncoder> {
tcx: TyCtxt<'tcx>,
encoder: &'a mut E,
@@ -742,7 +740,7 @@
impl<'a, 'tcx, E> CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
fn source_file_index(&mut self, source_file: Lrc<SourceFile>) -> SourceFileIndex {
self.file_to_file_index[&(&*source_file as *const SourceFile)]
@@ -753,11 +751,11 @@
/// encode the specified tag, then the given value, then the number of
/// bytes taken up by tag and value. On decoding, we can then verify that
/// we get the expected tag and read the expected number of bytes.
- fn encode_tagged<T: Encodable, V: Encodable>(&mut self,
- tag: T,
- value: &V)
- -> Result<(), E::Error>
- {
+ fn encode_tagged<T: Encodable, V: Encodable>(
+ &mut self,
+ tag: T,
+ value: &V
+ ) -> Result<(), E::Error> {
let start_pos = self.position();
tag.encode(self)?;
@@ -770,7 +768,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<interpret::AllocId> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
fn specialized_encode(&mut self, alloc_id: &interpret::AllocId) -> Result<(), Self::Error> {
use std::collections::hash_map::Entry;
@@ -790,10 +788,9 @@
impl<'a, 'tcx, E> SpecializedEncoder<Span> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
fn specialized_encode(&mut self, span: &Span) -> Result<(), Self::Error> {
-
if *span == DUMMY_SP {
return TAG_INVALID_SPAN.encode(self);
}
@@ -849,14 +846,14 @@
// We don't currently encode enough information to ensure hygiene works
// with incremental, so panic rather than risk incremental bugs.
- // FIXME: Handle hygiene in incremental
- bug!("Trying to encode Ident for incremental")
+ // FIXME: handle hygiene in incremental.
+ bug!("trying to encode `Ident` for incremental");
}
}
impl<'a, 'tcx, E> ty_codec::TyEncoder for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn position(&self) -> usize {
@@ -866,7 +863,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<CrateNum> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self, cnum: &CrateNum) -> Result<(), Self::Error> {
@@ -876,7 +873,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<Ty<'tcx>> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self, ty: &Ty<'tcx>) -> Result<(), Self::Error> {
@@ -887,7 +884,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<ty::GenericPredicates<'tcx>> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self,
@@ -900,7 +897,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<hir::HirId> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self, id: &hir::HirId) -> Result<(), Self::Error> {
@@ -918,7 +915,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<DefId> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self, id: &DefId) -> Result<(), Self::Error> {
@@ -929,7 +926,7 @@
impl<'a, 'tcx, E> SpecializedEncoder<LocalDefId> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self, id: &LocalDefId) -> Result<(), Self::Error> {
@@ -939,18 +936,18 @@
impl<'a, 'tcx, E> SpecializedEncoder<DefIndex> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
fn specialized_encode(&mut self, _: &DefIndex) -> Result<(), Self::Error> {
- bug!("Encoding DefIndex without context.")
+ bug!("encoding `DefIndex` without context");
}
}
-// NodeIds are not stable across compilation sessions, so we store them in their
-// HirId representation. This allows use to map them to the current NodeId.
+// `NodeId`s are not stable across compilation sessions, so we store them in their
+// `HirId` representation. This allows use to map them to the current `NodeId`.
impl<'a, 'tcx, E> SpecializedEncoder<NodeId> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
#[inline]
fn specialized_encode(&mut self, node_id: &NodeId) -> Result<(), Self::Error> {
@@ -967,7 +964,7 @@
impl<'a, 'tcx, E, T> SpecializedEncoder<mir::ClearCrossCrate<T>> for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
T: Encodable,
{
#[inline]
@@ -996,7 +993,7 @@
impl<'a, 'tcx, E> Encoder for CacheEncoder<'a, 'tcx, E>
where
- E: 'a + ty_codec::TyEncoder,
+ E: 'a + TyEncoder,
{
type Error = E::Error;
@@ -1040,7 +1037,7 @@
impl SpecializedEncoder<IntEncodedWithFixedSize> for opaque::Encoder {
fn specialized_encode(&mut self, x: &IntEncodedWithFixedSize) -> Result<(), Self::Error> {
let start_pos = self.position();
- for i in 0 .. IntEncodedWithFixedSize::ENCODED_SIZE {
+ for i in 0..IntEncodedWithFixedSize::ENCODED_SIZE {
((x.0 >> i * 8) as u8).encode(self)?;
}
let end_pos = self.position();
@@ -1085,10 +1082,10 @@
if Q::cache_on_disk(tcx, key.clone(), Some(&entry.value)) {
let dep_node = SerializedDepNodeIndex::new(entry.index.index());
- // Record position of the cache entry
+ // Record position of the cache entry.
query_result_index.push((dep_node, AbsoluteBytePos::new(encoder.position())));
- // Encode the type check tables with the SerializedDepNodeIndex
+ // Encode the type check tables with the `SerializedDepNodeIndex`
// as tag.
encoder.encode_tagged(dep_node, &entry.value)?;
}
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
index 4dce55f..d199a26 100644
--- a/src/librustc/ty/query/plumbing.rs
+++ b/src/librustc/ty/query/plumbing.rs
@@ -61,7 +61,7 @@
}
}
-// If enabled, send a message to the profile-queries thread
+// If enabled, sends a message to the profile-queries thread.
macro_rules! profq_msg {
($tcx:expr, $msg:expr) => {
if cfg!(debug_assertions) {
@@ -72,7 +72,7 @@
}
}
-// If enabled, format a key using its debug string, which can be
+// If enabled, formats a key using its debug string, which can be
// expensive to compute (in terms of time).
macro_rules! profq_query_msg {
($query:expr, $tcx:expr, $key:expr) => {{
@@ -98,7 +98,7 @@
impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> {
/// Either gets a `JobOwner` corresponding the query, allowing us to
- /// start executing the query, or it returns with the result of the query.
+ /// start executing the query, or returns with the result of the query.
/// If the query is executing elsewhere, this will wait for it.
/// If the query panicked, this will silently panic.
///
@@ -215,30 +215,30 @@
#[inline(never)]
#[cold]
fn drop(&mut self) {
- // Poison the query so jobs waiting on it panic
+ // Poison the query so jobs waiting on it panic.
let shard = self.cache.get_shard_by_value(&self.key);
shard.lock().active.insert(self.key.clone(), QueryResult::Poisoned);
// Also signal the completion of the job, so waiters
- // will continue execution
+ // will continue execution.
self.job.signal_complete();
}
}
#[derive(Clone)]
pub struct CycleError<'tcx> {
- /// The query and related span which uses the cycle
+ /// The query and related span that uses the cycle.
pub(super) usage: Option<(Span, Query<'tcx>)>,
pub(super) cycle: Vec<QueryInfo<'tcx>>,
}
-/// The result of `try_get_lock`
+/// The result of `try_get_lock`.
pub(super) enum TryGetJob<'a, 'tcx, D: QueryDescription<'tcx>> {
/// The query is not yet started. Contains a guard to the cache eventually used to start it.
NotYetStarted(JobOwner<'a, 'tcx, D>),
/// The query was already completed.
- /// Returns the result of the query and its dep node index
- /// if it succeeded or a cycle error if it failed
+ /// Returns the result of the query and its dep-node index
+ /// if it succeeded or a cycle error if it failed.
JobCompleted((D::Value, DepNodeIndex)),
/// Trying to execute the query resulted in a cycle.
@@ -246,7 +246,7 @@
}
impl<'tcx> TyCtxt<'tcx> {
- /// Executes a job by changing the ImplicitCtxt to point to the
+ /// Executes a job by changing the `ImplicitCtxt` to point to the
/// new query job while it executes. It returns the diagnostics
/// captured during execution and the actual result.
#[inline(always)]
@@ -259,11 +259,11 @@
where
F: FnOnce(TyCtxt<'tcx>) -> R,
{
- // The TyCtxt stored in TLS has the same global interner lifetime
+ // The `TyCtxt` stored in TLS has the same global interner lifetime
// as `self`, so we use `with_related_context` to relate the 'tcx lifetimes
- // when accessing the ImplicitCtxt
+ // when accessing the `ImplicitCtxt`.
tls::with_related_context(self, move |current_icx| {
- // Update the ImplicitCtxt to point to our new query job
+ // Update the `ImplicitCtxt` to point to our new query job.
let new_icx = tls::ImplicitCtxt {
tcx: self.global_tcx(),
query: Some(job),
@@ -272,7 +272,7 @@
task_deps: current_icx.task_deps,
};
- // Use the ImplicitCtxt while we execute the query
+ // Use the `ImplicitCtxt` while we execute the query.
tls::enter_context(&new_icx, |_| {
compute(self.global_tcx())
})
@@ -372,7 +372,7 @@
};
// Fast path for when incr. comp. is off. `to_dep_node` is
- // expensive for some DepKinds.
+ // expensive for some `DepKind`s.
if !self.dep_graph.is_fully_enabled() {
let null_dep_node = DepNode::new_no_params(crate::dep_graph::DepKind::Null);
return self.force_query_with_job::<Q>(key, job, null_dep_node).0;
@@ -410,7 +410,7 @@
if !Q::EVAL_ALWAYS {
// The diagnostics for this query will be
// promoted to the current session during
- // try_mark_green(), so we can ignore them here.
+ // `try_mark_green()`, so we can ignore them here.
let loaded = self.start_query(job.job.clone(), None, |tcx| {
let marked = tcx.dep_graph.try_mark_green_and_read(tcx, &dep_node);
marked.map(|(prev_dep_node_index, dep_node_index)| {
@@ -441,11 +441,11 @@
dep_node: &DepNode,
) -> Q::Value {
// Note this function can be called concurrently from the same query
- // We must ensure that this is handled correctly
+ // We must ensure that this is handled correctly.
debug_assert!(self.dep_graph.is_green(dep_node));
- // First we try to load the result from the on-disk cache
+ // First we try to load the result from the on-disk cache.
let result = if Q::cache_on_disk(self.global_tcx(), key.clone(), None) &&
self.sess.opts.debugging_opts.incremental_queries {
self.sess.profiler(|p| p.incremental_load_result_start(Q::NAME));
@@ -453,10 +453,10 @@
self.sess.profiler(|p| p.incremental_load_result_end(Q::NAME));
// We always expect to find a cached result for things that
- // can be forced from DepNode.
+ // can be forced from `DepNode`.
debug_assert!(!dep_node.kind.can_reconstruct_query_key() ||
result.is_some(),
- "Missing on-disk cache entry for {:?}",
+ "missing on-disk cache entry for {:?}",
dep_node);
result
} else {
@@ -475,8 +475,7 @@
self.sess.profiler(|p| p.start_query(Q::NAME));
- // The dep-graph for this computation is already in
- // place
+ // The dep-graph for this computation is already in-place.
let result = self.dep_graph.with_ignore(|| {
Q::compute(self, key)
});
@@ -485,7 +484,7 @@
result
};
- // If -Zincremental-verify-ich is specified, re-hash results from
+ // If `-Zincremental-verify-ich` is specified, re-hash results from
// the cache and make sure that they have the expected fingerprint.
if unlikely!(self.sess.opts.debugging_opts.incremental_verify_ich) {
self.incremental_verify_ich::<Q>(&result, dep_node, dep_node_index);
@@ -508,10 +507,12 @@
) {
use crate::ich::Fingerprint;
- assert!(Some(self.dep_graph.fingerprint_of(dep_node_index)) ==
+ assert!(
+ Some(self.dep_graph.fingerprint_of(dep_node_index)) ==
self.dep_graph.prev_fingerprint_of(dep_node),
- "Fingerprint for green query instance not loaded \
- from cache: {:?}", dep_node);
+ "fingerprint for green query instance not loaded from cache: {:?}",
+ dep_node,
+ );
debug!("BEGIN verify_ich({:?})", dep_node);
let mut hcx = self.create_stable_hashing_context();
@@ -521,8 +522,11 @@
let old_hash = self.dep_graph.fingerprint_of(dep_node_index);
- assert!(new_hash == old_hash, "Found unstable fingerprints \
- for {:?}", dep_node);
+ assert!(
+ new_hash == old_hash,
+ "found unstable fingerprints for {:?}",
+ dep_node,
+ );
}
#[inline(always)]
@@ -534,11 +538,11 @@
) -> (Q::Value, DepNodeIndex) {
// If the following assertion triggers, it can have two reasons:
// 1. Something is wrong with DepNode creation, either here or
- // in DepGraph::try_mark_green()
- // 2. Two distinct query keys get mapped to the same DepNode
- // (see for example #48923)
+ // in `DepGraph::try_mark_green()`.
+ // 2. Two distinct query keys get mapped to the same `DepNode`
+ // (see for example #48923).
assert!(!self.dep_graph.dep_node_exists(&dep_node),
- "Forcing query with already existing DepNode.\n\
+ "forcing query with already existing `DepNode`\n\
- query-key: {:?}\n\
- dep-node: {:?}",
key, dep_node);
@@ -584,7 +588,7 @@
}
/// Ensure that either this query has all green inputs or been executed.
- /// Executing query::ensure(D) is considered a read of the dep-node D.
+ /// Executing `query::ensure(D)` is considered a read of the dep-node `D`.
///
/// This function is particularly useful when executing passes for their
/// side-effects -- e.g., in order to report errors for erroneous programs.
@@ -899,13 +903,13 @@
}
}
- // FIXME(eddyb) Get more valid Span's on queries.
+ // FIXME(eddyb) Get more valid `Span`s on queries.
pub fn default_span(&self, tcx: TyCtxt<$tcx>, span: Span) -> Span {
if !span.is_dummy() {
return span;
}
- // The def_span query is used to calculate default_span,
- // so exit to avoid infinite recursion
+ // The `def_span` query is used to calculate `default_span`,
+ // so exit to avoid infinite recursion.
if let Query::def_span(..) = *self {
return span
}
@@ -1116,7 +1120,7 @@
impl<$tcx> Default for Providers<$tcx> {
fn default() -> Self {
$(fn $name<$tcx>(_: TyCtxt<$tcx>, key: $K) -> $R {
- bug!("tcx.{}({:?}) unsupported by its crate",
+ bug!("`tcx.{}({:?})` unsupported by its crate",
stringify!($name), key);
})*
Providers { $($name),* }
@@ -1128,26 +1132,26 @@
/// The red/green evaluation system will try to mark a specific DepNode in the
/// dependency graph as green by recursively trying to mark the dependencies of
-/// that DepNode as green. While doing so, it will sometimes encounter a DepNode
+/// that `DepNode` as green. While doing so, it will sometimes encounter a `DepNode`
/// where we don't know if it is red or green and we therefore actually have
/// to recompute its value in order to find out. Since the only piece of
-/// information that we have at that point is the DepNode we are trying to
+/// information that we have at that point is the `DepNode` we are trying to
/// re-evaluate, we need some way to re-run a query from just that. This is what
/// `force_from_dep_node()` implements.
///
-/// In the general case, a DepNode consists of a DepKind and an opaque
+/// In the general case, a `DepNode` consists of a `DepKind` and an opaque
/// GUID/fingerprint that will uniquely identify the node. This GUID/fingerprint
/// is usually constructed by computing a stable hash of the query-key that the
-/// DepNode corresponds to. Consequently, it is not in general possible to go
+/// `DepNode` corresponds to. Consequently, it is not in general possible to go
/// back from hash to query-key (since hash functions are not reversible). For
/// this reason `force_from_dep_node()` is expected to fail from time to time
-/// because we just cannot find out, from the DepNode alone, what the
+/// because we just cannot find out, from the `DepNode` alone, what the
/// corresponding query-key is and therefore cannot re-run the query.
///
/// The system deals with this case letting `try_mark_green` fail which forces
/// the root query to be re-evaluated.
///
-/// Now, if force_from_dep_node() would always fail, it would be pretty useless.
+/// Now, if `force_from_dep_node()` would always fail, it would be pretty useless.
/// Fortunately, we can use some contextual information that will allow us to
/// reconstruct query-keys for certain kinds of `DepNode`s. In particular, we
/// enforce by construction that the GUID/fingerprint of certain `DepNode`s is a
@@ -1171,9 +1175,9 @@
pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
use crate::dep_graph::RecoverKey;
- // We must avoid ever having to call force_from_dep_node() for a
- // DepNode::codegen_unit:
- // Since we cannot reconstruct the query key of a DepNode::codegen_unit, we
+ // We must avoid ever having to call `force_from_dep_node()` for a
+ // `DepNode::codegen_unit`:
+ // Since we cannot reconstruct the query key of a `DepNode::codegen_unit`, we
// would always end up having to evaluate the first caller of the
// `codegen_unit` query that *is* reconstructible. This might very well be
// the `compile_codegen_unit` query, thus re-codegenning the whole CGU just
@@ -1196,7 +1200,7 @@
if let Some(def_id) = dep_node.extract_def_id(tcx) {
def_id
} else {
- // return from the whole function
+ // Return from the whole function.
return false
}
}
@@ -1224,20 +1228,20 @@
rustc_dep_node_force!([dep_node, tcx]
// These are inputs that are expected to be pre-allocated and that
- // should therefore always be red or green already
+ // should therefore always be red or green already.
DepKind::AllLocalTraitImpls |
DepKind::Krate |
DepKind::CrateMetadata |
DepKind::HirBody |
DepKind::Hir |
- // This are anonymous nodes
+ // These are anonymous nodes.
DepKind::TraitSelect |
// We don't have enough information to reconstruct the query key of
- // these
+ // these.
DepKind::CompileCodegenUnit => {
- bug!("force_from_dep_node() - Encountered {:?}", dep_node)
+ bug!("force_from_dep_node: encountered {:?}", dep_node)
}
DepKind::Analysis => { force!(analysis, krate!()); }
diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs
index d2edf6f..e73a51e 100644
--- a/src/librustc/ty/sty.rs
+++ b/src/librustc/ty/sty.rs
@@ -644,7 +644,7 @@
impl<'tcx> rustc_serialize::UseSpecializedDecodable for &'tcx List<ExistentialPredicate<'tcx>> {}
impl<'tcx> List<ExistentialPredicate<'tcx>> {
- /// Returns the "principal def id" of this set of existential predicates.
+ /// Returns the "principal `DefId`" of this set of existential predicates.
///
/// A Rust trait object type consists (in addition to a lifetime bound)
/// of a set of trait bounds, which are separated into any number
@@ -1052,7 +1052,7 @@
}
}
-/// Signature of a function type, which I have arbitrarily
+/// Signature of a function type, which we have arbitrarily
/// decided to use to refer to the input/output types.
///
/// - `inputs`: is the list of arguments and their modes.
@@ -1076,7 +1076,8 @@
self.inputs_and_output[self.inputs_and_output.len() - 1]
}
- // Create a minimal `FnSig` to be used when encountering a `TyKind::Error` in a fallible method
+ // Creates a minimal `FnSig` to be used when encountering a `TyKind::Error` in a fallible
+ // method.
fn fake() -> FnSig<'tcx> {
FnSig {
inputs_and_output: List::empty(),
@@ -1118,7 +1119,6 @@
pub type CanonicalPolyFnSig<'tcx> = Canonical<'tcx, Binder<FnSig<'tcx>>>;
-
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord,
Hash, RustcEncodable, RustcDecodable, HashStable)]
pub struct ParamTy {
diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs
index a08c82a..78d94df 100644
--- a/src/librustc/ty/util.rs
+++ b/src/librustc/ty/util.rs
@@ -996,6 +996,24 @@
debug!("is_type_representable: {:?} is {:?}", self, r);
r
}
+
+ /// Peel off all reference types in this type until there are none left.
+ ///
+ /// This method is idempotent, i.e. `ty.peel_refs().peel_refs() == ty.peel_refs()`.
+ ///
+ /// # Examples
+ ///
+ /// - `u8` -> `u8`
+ /// - `&'a mut u8` -> `u8`
+ /// - `&'a &'b u8` -> `u8`
+ /// - `&'a *const &'b u8 -> *const &'b u8`
+ pub fn peel_refs(&'tcx self) -> Ty<'tcx> {
+ let mut ty = self;
+ while let Ref(_, inner_ty, _) = ty.sty {
+ ty = inner_ty;
+ }
+ ty
+ }
}
fn is_copy_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
diff --git a/src/librustc_ast_borrowck/borrowck/mod.rs b/src/librustc_ast_borrowck/borrowck/mod.rs
index 3bbd7ae..23d5480 100644
--- a/src/librustc_ast_borrowck/borrowck/mod.rs
+++ b/src/librustc_ast_borrowck/borrowck/mod.rs
@@ -9,7 +9,6 @@
use rustc::hir::HirId;
use rustc::hir::Node;
-use rustc::cfg;
use rustc::middle::borrowck::{BorrowCheckResult, SignalledError};
use rustc::hir::def_id::{DefId, LocalDefId};
use rustc::middle::mem_categorization as mc;
@@ -28,6 +27,7 @@
use rustc::hir;
+use crate::cfg;
use crate::dataflow::{DataFlowContext, BitwiseOperator, DataFlowOperator, KillFrom};
pub mod check_loans;
diff --git a/src/librustc_ast_borrowck/borrowck/move_data.rs b/src/librustc_ast_borrowck/borrowck/move_data.rs
index 887a0e2..67d8181 100644
--- a/src/librustc_ast_borrowck/borrowck/move_data.rs
+++ b/src/librustc_ast_borrowck/borrowck/move_data.rs
@@ -4,7 +4,7 @@
use crate::dataflow::{DataFlowContext, BitwiseOperator, DataFlowOperator, KillFrom};
use crate::borrowck::*;
-use rustc::cfg;
+use crate::cfg;
use rustc::ty::{self, TyCtxt};
use rustc::util::nodemap::FxHashMap;
diff --git a/src/librustc/cfg/construct.rs b/src/librustc_ast_borrowck/cfg/construct.rs
similarity index 84%
rename from src/librustc/cfg/construct.rs
rename to src/librustc_ast_borrowck/cfg/construct.rs
index 0dad2dd..0dc9990 100644
--- a/src/librustc/cfg/construct.rs
+++ b/src/librustc_ast_borrowck/cfg/construct.rs
@@ -1,11 +1,12 @@
use crate::cfg::*;
-use crate::middle::region;
-use rustc_data_structures::graph::implementation as graph;
-use crate::ty::{self, TyCtxt};
-use crate::hir::{self, PatKind};
-use crate::hir::def_id::DefId;
-use crate::hir::ptr::P;
+use rustc::hir::{self, PatKind};
+use rustc::hir::def_id::DefId;
+use rustc::hir::ptr::P;
+use rustc::middle::region;
+use rustc::ty::{self, TyCtxt};
+
+use rustc_data_structures::graph::implementation as graph;
struct CFGBuilder<'a, 'tcx> {
tcx: TyCtxt<'tcx>,
@@ -19,18 +20,18 @@
#[derive(Copy, Clone)]
struct BlockScope {
- block_expr_id: hir::ItemLocalId, // id of breakable block expr node
+ block_expr_id: hir::ItemLocalId, // ID of breakable block expr node
break_index: CFGIndex, // where to go on `break`
}
#[derive(Copy, Clone)]
struct LoopScope {
- loop_id: hir::ItemLocalId, // id of loop/while node
+ loop_id: hir::ItemLocalId, // ID of `loop`/`while` node
continue_index: CFGIndex, // where to go on a `loop`
- break_index: CFGIndex, // where to go on a `break`
+ break_index: CFGIndex, // where to go on a `break`
}
-pub fn construct(tcx: TyCtxt<'_>, body: &hir::Body) -> CFG {
+pub(super) fn construct(tcx: TyCtxt<'_>, body: &hir::Body) -> CFG {
let mut graph = graph::Graph::new();
let entry = graph.add_node(CFGNodeData::Entry);
@@ -103,9 +104,7 @@
let init_exit = self.opt_expr(&local.init, pred);
self.pat(&local.pat, init_exit)
}
- hir::StmtKind::Item(_) => {
- pred
- }
+ hir::StmtKind::Item(_) => pred,
hir::StmtKind::Expr(ref expr) |
hir::StmtKind::Semi(ref expr) => {
self.expr(&expr, pred)
@@ -154,12 +153,12 @@
}
}
- fn pats_all<'b, I: Iterator<Item=&'b P<hir::Pat>>>(
+ /// Handles case where all of the patterns must match.
+ fn pats_all<'b, I: Iterator<Item = &'b P<hir::Pat>>>(
&mut self,
pats: I,
- pred: CFGIndex
+ pred: CFGIndex,
) -> CFGIndex {
- //! Handles case where all of the patterns must match.
pats.fold(pred, |pred, pat| self.pat(&pat, pred))
}
@@ -185,15 +184,15 @@
// Note that `break` and `loop` statements
// may cause additional edges.
- let loopback = self.add_dummy_node(&[pred]); // 1
- let expr_exit = self.add_ast_node(expr.hir_id.local_id, &[]); // 2
+ let loopback = self.add_dummy_node(&[pred]); // 1
+ let expr_exit = self.add_ast_node(expr.hir_id.local_id, &[]); // 2
self.loop_scopes.push(LoopScope {
loop_id: expr.hir_id.local_id,
continue_index: loopback,
break_index: expr_exit,
});
- let body_exit = self.block(&body, loopback); // 3
- self.add_contained_edge(body_exit, loopback); // 4
+ let body_exit = self.block(&body, loopback); // 3
+ self.add_contained_edge(body_exit, loopback); // 4
self.loop_scopes.pop();
expr_exit
}
@@ -217,9 +216,9 @@
// v 3 v 4
// [..exit..]
//
- let l_exit = self.expr(&l, pred); // 1
- let r_exit = self.expr(&r, l_exit); // 2
- self.add_ast_node(expr.hir_id.local_id, &[l_exit, r_exit]) // 3,4
+ let l_exit = self.expr(&l, pred); // 1
+ let r_exit = self.expr(&r, l_exit); // 2
+ self.add_ast_node(expr.hir_id.local_id, &[l_exit, r_exit]) // 3,4
}
hir::ExprKind::Ret(ref v) => {
@@ -313,11 +312,13 @@
}
}
- fn call<'b, I: Iterator<Item=&'b hir::Expr>>(&mut self,
- call_expr: &hir::Expr,
- pred: CFGIndex,
- func_or_rcvr: &hir::Expr,
- args: I) -> CFGIndex {
+ fn call<'b, I: Iterator<Item = &'b hir::Expr>>(
+ &mut self,
+ call_expr: &hir::Expr,
+ pred: CFGIndex,
+ func_or_rcvr: &hir::Expr,
+ args: I,
+ ) -> CFGIndex {
let func_or_rcvr_exit = self.expr(func_or_rcvr, pred);
let ret = self.straightline(call_expr, func_or_rcvr_exit, args);
let m = self.tcx.hir().get_module_parent(call_expr.hir_id);
@@ -328,33 +329,38 @@
}
}
- fn exprs<'b, I: Iterator<Item=&'b hir::Expr>>(&mut self,
- exprs: I,
- pred: CFGIndex) -> CFGIndex {
- //! Constructs graph for `exprs` evaluated in order
+ /// Constructs graph for `exprs` evaluated in order.
+ fn exprs<'b, I: Iterator<Item = &'b hir::Expr>>(
+ &mut self,
+ exprs: I,
+ pred: CFGIndex,
+ ) -> CFGIndex {
exprs.fold(pred, |p, e| self.expr(e, p))
}
- fn opt_expr(&mut self,
- opt_expr: &Option<P<hir::Expr>>,
- pred: CFGIndex) -> CFGIndex {
- //! Constructs graph for `opt_expr` evaluated, if Some
+ /// Constructs graph for `opt_expr` evaluated, if `Some`.
+ fn opt_expr(
+ &mut self,
+ opt_expr: &Option<P<hir::Expr>>,
+ pred: CFGIndex,
+ ) -> CFGIndex {
opt_expr.iter().fold(pred, |p, e| self.expr(&e, p))
}
- fn straightline<'b, I: Iterator<Item=&'b hir::Expr>>(&mut self,
- expr: &hir::Expr,
- pred: CFGIndex,
- subexprs: I) -> CFGIndex {
- //! Handles case of an expression that evaluates `subexprs` in order
-
+ /// Handles case of an expression that evaluates `subexprs` in order.
+ fn straightline<'b, I: Iterator<Item = &'b hir::Expr>>(
+ &mut self,
+ expr: &hir::Expr,
+ pred: CFGIndex,
+ subexprs: I,
+ ) -> CFGIndex {
let subexprs_exit = self.exprs(subexprs, pred);
self.add_ast_node(expr.hir_id.local_id, &[subexprs_exit])
}
fn match_(&mut self, id: hir::ItemLocalId, discr: &hir::Expr,
arms: &[hir::Arm], pred: CFGIndex) -> CFGIndex {
- // The CFG for match expression is quite complex, so no ASCII
+ // The CFG for match expressions is quite complex, so no ASCII
// art for it (yet).
//
// The CFG generated below matches roughly what MIR contains.
@@ -369,13 +375,13 @@
//
// What is going on is explained in further comments.
- // Visit the discriminant expression
+ // Visit the discriminant expression.
let discr_exit = self.expr(discr, pred);
// Add a node for the exit of the match expression as a whole.
let expr_exit = self.add_ast_node(id, &[]);
- // Keep track of the previous guard expressions
+ // Keep track of the previous guard expressions.
let mut prev_guard = None;
let match_scope = region::Scope { id, data: region::ScopeData::Node };
@@ -388,12 +394,12 @@
// Visit the pattern, coming from the discriminant exit
let mut pat_exit = self.pat(&pat, discr_exit);
- // If there is a guard expression, handle it here
+ // If there is a guard expression, handle it here.
if let Some(ref guard) = arm.guard {
// Add a dummy node for the previous guard
- // expression to target
+ // expression to target.
let guard_start = self.add_dummy_node(&[pat_exit]);
- // Visit the guard expression
+ // Visit the guard expression.
let guard_exit = match guard {
hir::Guard::If(ref e) => (&**e, self.expr(e, guard_start)),
};
@@ -407,24 +413,23 @@
self.add_exiting_edge(prev_guard, prev_index, match_scope, guard_start);
}
- // Push the guard onto the list of previous guards
+ // Push the guard onto the list of previous guards.
prev_guard = Some(guard_exit);
- // Update the exit node for the pattern
+ // Update the exit node for the pattern.
pat_exit = guard_exit.1;
}
- // Add an edge from the exit of this pattern to the
- // exit of the arm
+ // Add an edge from the exit of this pattern to the exit of the arm.
self.add_contained_edge(pat_exit, bindings_exit);
}
- // Visit the body of this arm
+ // Visit the body of this arm.
let body_exit = self.expr(&arm.body, bindings_exit);
let arm_exit = self.add_ast_node(arm.hir_id.local_id, &[body_exit]);
- // Link the body to the exit of the expression
+ // Link the body to the exit of the expression.
self.add_contained_edge(arm_exit, expr_exit);
}
@@ -451,18 +456,22 @@
node
}
- fn add_contained_edge(&mut self,
- source: CFGIndex,
- target: CFGIndex) {
+ fn add_contained_edge(
+ &mut self,
+ source: CFGIndex,
+ target: CFGIndex,
+ ) {
let data = CFGEdgeData {exiting_scopes: vec![] };
self.graph.add_edge(source, target, data);
}
- fn add_exiting_edge(&mut self,
- from_expr: &hir::Expr,
- from_index: CFGIndex,
- target_scope: region::Scope,
- to_index: CFGIndex) {
+ fn add_exiting_edge(
+ &mut self,
+ from_expr: &hir::Expr,
+ from_index: CFGIndex,
+ target_scope: region::Scope,
+ to_index: CFGIndex,
+ ) {
let mut data = CFGEdgeData { exiting_scopes: vec![] };
let mut scope = region::Scope {
id: from_expr.hir_id.local_id,
@@ -476,9 +485,11 @@
self.graph.add_edge(from_index, to_index, data);
}
- fn add_returning_edge(&mut self,
- _from_expr: &hir::Expr,
- from_index: CFGIndex) {
+ fn add_returning_edge(
+ &mut self,
+ _from_expr: &hir::Expr,
+ from_index: CFGIndex,
+ ) {
let data = CFGEdgeData {
exiting_scopes: self.loop_scopes.iter()
.rev()
@@ -488,11 +499,12 @@
self.graph.add_edge(from_index, self.fn_exit, data);
}
- fn find_scope_edge(&self,
- expr: &hir::Expr,
- destination: hir::Destination,
- scope_cf_kind: ScopeCfKind) -> (region::Scope, CFGIndex) {
-
+ fn find_scope_edge(
+ &self,
+ expr: &hir::Expr,
+ destination: hir::Destination,
+ scope_cf_kind: ScopeCfKind,
+ ) -> (region::Scope, CFGIndex) {
match destination.target_id {
Ok(loop_id) => {
for b in &self.breakable_block_scopes {
@@ -519,7 +531,7 @@
});
}
}
- span_bug!(expr.span, "no scope for id {}", loop_id);
+ span_bug!(expr.span, "no scope for ID {}", loop_id);
}
Err(err) => span_bug!(expr.span, "scope error: {}", err),
}
diff --git a/src/librustc/cfg/graphviz.rs b/src/librustc_ast_borrowck/cfg/graphviz.rs
similarity index 87%
rename from src/librustc/cfg/graphviz.rs
rename to src/librustc_ast_borrowck/cfg/graphviz.rs
index 9181200..99c6b49 100644
--- a/src/librustc/cfg/graphviz.rs
+++ b/src/librustc_ast_borrowck/cfg/graphviz.rs
@@ -1,21 +1,18 @@
-/// This module provides linkage between rustc::middle::graph and
+/// This module provides linkage between `rustc::middle::graph` and
/// libgraphviz traits.
-// For clarity, rename the graphviz crate locally to dot.
-use graphviz as dot;
-
use crate::cfg;
-use crate::hir;
-use crate::ty::TyCtxt;
+use rustc::hir;
+use rustc::ty::TyCtxt;
-pub type Node<'a> = (cfg::CFGIndex, &'a cfg::CFGNode);
-pub type Edge<'a> = &'a cfg::CFGEdge;
+pub(crate) type Node<'a> = (cfg::CFGIndex, &'a cfg::CFGNode);
+pub(crate) type Edge<'a> = &'a cfg::CFGEdge;
pub struct LabelledCFG<'a, 'tcx> {
pub tcx: TyCtxt<'tcx>,
pub cfg: &'a cfg::CFG,
pub name: String,
- /// `labelled_edges` controls whether we emit labels on the edges
+ /// `labelled_edges` controls whether we emit labels on the edges.
pub labelled_edges: bool,
}
@@ -28,12 +25,12 @@
};
let s = self.tcx.hir().node_to_string(hir_id);
- // Replacing newlines with \\l causes each line to be left-aligned,
+ // Replacing newlines with `\\l` causes each line to be left-aligned,
// improving presentation of (long) pretty-printed expressions.
if s.contains("\n") {
let mut s = s.replace("\n", "\\l");
// Apparently left-alignment applies to the line that precedes
- // \l, not the line that follows; so, add \l at end of string
+ // `\l`, not the line that follows; so, add `\l` at end of string
// if not already present, ensuring last line gets left-aligned
// as well.
let mut last_two: Vec<_> =
@@ -112,8 +109,7 @@
}
}
-impl<'a, 'hir> dot::GraphWalk<'a> for LabelledCFG<'a, 'hir>
-{
+impl<'a, 'hir> dot::GraphWalk<'a> for LabelledCFG<'a, 'hir> {
type Node = Node<'a>;
type Edge = Edge<'a>;
fn nodes(&'a self) -> dot::Nodes<'a, Node<'a>> { self.cfg.nodes() }
diff --git a/src/librustc_ast_borrowck/cfg/mod.rs b/src/librustc_ast_borrowck/cfg/mod.rs
new file mode 100644
index 0000000..981199c
--- /dev/null
+++ b/src/librustc_ast_borrowck/cfg/mod.rs
@@ -0,0 +1,55 @@
+//! Module that constructs a control-flow graph representing an item.
+//! Uses `Graph` as the underlying representation.
+
+use rustc_data_structures::graph::implementation as graph;
+use rustc::ty::TyCtxt;
+use rustc::hir;
+use rustc::hir::def_id::DefId;
+
+mod construct;
+pub mod graphviz;
+
+pub struct CFG {
+ owner_def_id: DefId,
+ pub(crate) graph: CFGGraph,
+ pub(crate) entry: CFGIndex,
+ exit: CFGIndex,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum CFGNodeData {
+ AST(hir::ItemLocalId),
+ Entry,
+ Exit,
+ Dummy,
+ Unreachable,
+}
+
+impl CFGNodeData {
+ pub(crate) fn id(&self) -> hir::ItemLocalId {
+ if let CFGNodeData::AST(id) = *self {
+ id
+ } else {
+ hir::DUMMY_ITEM_LOCAL_ID
+ }
+ }
+}
+
+#[derive(Debug)]
+pub struct CFGEdgeData {
+ pub(crate) exiting_scopes: Vec<hir::ItemLocalId>
+}
+
+pub(crate) type CFGIndex = graph::NodeIndex;
+
+pub(crate) type CFGGraph = graph::Graph<CFGNodeData, CFGEdgeData>;
+
+pub(crate) type CFGNode = graph::Node<CFGNodeData>;
+
+pub(crate) type CFGEdge = graph::Edge<CFGEdgeData>;
+
+impl CFG {
+ pub fn new(tcx: TyCtxt<'_>, body: &hir::Body) -> CFG {
+ construct::construct(tcx, body)
+ }
+}
diff --git a/src/librustc_ast_borrowck/dataflow.rs b/src/librustc_ast_borrowck/dataflow.rs
index 3a4c8c9..a856290 100644
--- a/src/librustc_ast_borrowck/dataflow.rs
+++ b/src/librustc_ast_borrowck/dataflow.rs
@@ -3,9 +3,7 @@
//! and thus uses bitvectors. Your job is simply to specify the so-called
//! GEN and KILL bits for each expression.
-use rustc::cfg;
-use rustc::cfg::CFGIndex;
-use rustc::ty::TyCtxt;
+use crate::cfg::{self, CFGIndex};
use std::mem;
use std::usize;
use log::debug;
@@ -16,6 +14,7 @@
use rustc::hir;
use rustc::hir::intravisit;
use rustc::hir::print as pprust;
+use rustc::ty::TyCtxt;
#[derive(Copy, Clone, Debug)]
pub enum EntryOrExit {
diff --git a/src/librustc_ast_borrowck/graphviz.rs b/src/librustc_ast_borrowck/graphviz.rs
index 7a8a23c..c077dc8 100644
--- a/src/librustc_ast_borrowck/graphviz.rs
+++ b/src/librustc_ast_borrowck/graphviz.rs
@@ -4,13 +4,12 @@
pub use Variant::*;
-pub use rustc::cfg::graphviz::{Node, Edge};
-use rustc::cfg::graphviz as cfg_dot;
-
+pub(crate) use crate::cfg::graphviz::{Node, Edge};
+use crate::cfg::graphviz as cfg_dot;
+use crate::cfg::CFGIndex;
use crate::borrowck::{self, BorrowckCtxt, LoanPath};
use crate::dataflow::{DataFlowOperator, DataFlowContext, EntryOrExit};
use log::debug;
-use rustc::cfg::CFGIndex;
use std::rc::Rc;
#[derive(Debug, Copy, Clone)]
diff --git a/src/librustc_ast_borrowck/lib.rs b/src/librustc_ast_borrowck/lib.rs
index dc81827..aea97fe 100644
--- a/src/librustc_ast_borrowck/lib.rs
+++ b/src/librustc_ast_borrowck/lib.rs
@@ -18,5 +18,6 @@
pub mod graphviz;
mod dataflow;
+pub mod cfg;
pub use borrowck::provide;
diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml
index 5e1b0ea..98efa6a 100644
--- a/src/librustc_codegen_llvm/Cargo.toml
+++ b/src/librustc_codegen_llvm/Cargo.toml
@@ -11,11 +11,7 @@
test = false
[dependencies]
-cc = "1.0.1" # Used to locate MSVC
-num_cpus = "1.0"
-tempfile = "3.0"
rustc_llvm = { path = "../librustc_llvm" }
-memmap = "0.6"
[features]
# This is used to convince Cargo to separately cache builds of `rustc_codegen_llvm`
diff --git a/src/librustc_codegen_llvm/back/archive.rs b/src/librustc_codegen_llvm/back/archive.rs
index e3b7cb2..68d3f90 100644
--- a/src/librustc_codegen_llvm/back/archive.rs
+++ b/src/librustc_codegen_llvm/back/archive.rs
@@ -12,6 +12,7 @@
use rustc_codegen_ssa::{METADATA_FILENAME, RLIB_BYTECODE_EXTENSION};
use rustc_codegen_ssa::back::archive::{ArchiveBuilder, find_library};
use rustc::session::Session;
+use syntax::symbol::Symbol;
struct ArchiveConfig<'a> {
pub sess: &'a Session,
@@ -109,7 +110,7 @@
/// Adds all of the contents of a native library to this archive. This will
/// search in the relevant locations for a library named `name`.
- fn add_native_library(&mut self, name: &str) {
+ fn add_native_library(&mut self, name: Symbol) {
let location = find_library(name, &self.config.lib_search_paths,
self.config.sess);
self.add_archive(&location, |_| false).unwrap_or_else(|e| {
diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs
index cad2bcd..6dedf10 100644
--- a/src/librustc_codegen_llvm/debuginfo/mod.rs
+++ b/src/librustc_codegen_llvm/debuginfo/mod.rs
@@ -32,7 +32,7 @@
use libc::c_uint;
use std::cell::RefCell;
-use std::ffi::CString;
+use std::ffi::{CStr, CString};
use syntax_pos::{self, Span, Pos};
use syntax::ast;
@@ -224,8 +224,37 @@
gdb::insert_reference_to_gdb_debug_scripts_section_global(self)
}
- fn set_value_name(&mut self, value: &'ll Value, name: &str) {
- let cname = SmallCStr::new(name);
+ fn set_var_name(&mut self, value: &'ll Value, name: impl ToString) {
+ // Avoid wasting time if LLVM value names aren't even enabled.
+ if self.sess().fewer_names() {
+ return;
+ }
+
+ // Only function parameters and instructions are local to a function,
+ // don't change the name of anything else (e.g. globals).
+ let param_or_inst = unsafe {
+ llvm::LLVMIsAArgument(value).is_some() ||
+ llvm::LLVMIsAInstruction(value).is_some()
+ };
+ if !param_or_inst {
+ return;
+ }
+
+ let old_name = unsafe {
+ CStr::from_ptr(llvm::LLVMGetValueName(value))
+ };
+ match old_name.to_str() {
+ Ok("") => {}
+ Ok(_) => {
+ // Avoid replacing the name if it already exists.
+ // While we could combine the names somehow, it'd
+ // get noisy quick, and the usefulness is dubious.
+ return;
+ }
+ Err(_) => return,
+ }
+
+ let cname = CString::new(name.to_string()).unwrap();
unsafe {
llvm::LLVMSetValueName(value, cname.as_ptr());
}
diff --git a/src/librustc_codegen_llvm/error_codes.rs b/src/librustc_codegen_llvm/error_codes.rs
index c6b5dc0..042e51e 100644
--- a/src/librustc_codegen_llvm/error_codes.rs
+++ b/src/librustc_codegen_llvm/error_codes.rs
@@ -1,4 +1,4 @@
-register_long_diagnostics! {
+register_diagnostics! {
E0511: r##"
Invalid monomorphization of an intrinsic function was used. Erroneous code
diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs
index 2fd7888..9f2c303 100644
--- a/src/librustc_codegen_llvm/lib.rs
+++ b/src/librustc_codegen_llvm/lib.rs
@@ -14,7 +14,6 @@
#![feature(in_band_lifetimes)]
#![feature(libc)]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![feature(optin_builtin_traits)]
#![feature(concat_idents)]
#![feature(link_args)]
@@ -256,7 +255,7 @@
}
fn diagnostics(&self) -> &[(&'static str, &'static str)] {
- &DIAGNOSTICS
+ &error_codes::DIAGNOSTICS
}
fn target_features(&self, sess: &Session) -> Vec<Symbol> {
@@ -425,5 +424,3 @@
}
}
}
-
-__build_diagnostic_array! { librustc_codegen_llvm, DIAGNOSTICS }
diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs
index 9f94105..b07214f 100644
--- a/src/librustc_codegen_llvm/llvm/ffi.rs
+++ b/src/librustc_codegen_llvm/llvm/ffi.rs
@@ -806,6 +806,7 @@
pub fn LLVMRustRemoveFunctionAttributes(Fn: &Value, index: c_uint, attr: Attribute);
// Operations on parameters
+ pub fn LLVMIsAArgument(Val: &Value) -> Option<&Value>;
pub fn LLVMCountParams(Fn: &Value) -> c_uint;
pub fn LLVMGetParam(Fn: &Value, Index: c_uint) -> &Value;
@@ -818,6 +819,7 @@
pub fn LLVMDeleteBasicBlock(BB: &BasicBlock);
// Operations on instructions
+ pub fn LLVMIsAInstruction(Val: &Value) -> Option<&Value>;
pub fn LLVMGetFirstBasicBlock(Fn: &Value) -> &BasicBlock;
// Operations on call sites
diff --git a/src/librustc_codegen_ssa/back/archive.rs b/src/librustc_codegen_ssa/back/archive.rs
index 23d580e..8d2120a 100644
--- a/src/librustc_codegen_ssa/back/archive.rs
+++ b/src/librustc_codegen_ssa/back/archive.rs
@@ -1,9 +1,10 @@
use rustc::session::Session;
+use syntax::symbol::Symbol;
use std::io;
use std::path::{Path, PathBuf};
-pub fn find_library(name: &str, search_paths: &[PathBuf], sess: &Session)
+pub fn find_library(name: Symbol, search_paths: &[PathBuf], sess: &Session)
-> PathBuf {
// On Windows, static libraries sometimes show up as libfoo.a and other
// times show up as foo.lib
@@ -40,7 +41,7 @@
lto: bool,
skip_objects: bool,
) -> io::Result<()>;
- fn add_native_library(&mut self, name: &str);
+ fn add_native_library(&mut self, name: Symbol);
fn update_symbols(&mut self);
fn build(self);
diff --git a/src/librustc_codegen_ssa/back/command.rs b/src/librustc_codegen_ssa/back/command.rs
index 596978f..2d84d67 100644
--- a/src/librustc_codegen_ssa/back/command.rs
+++ b/src/librustc_codegen_ssa/back/command.rs
@@ -8,6 +8,7 @@
use std::process::{self, Output};
use rustc_target::spec::LldFlavor;
+use syntax::symbol::Symbol;
#[derive(Clone)]
pub struct Command {
@@ -51,6 +52,11 @@
self
}
+ pub fn sym_arg(&mut self, arg: Symbol) -> &mut Command {
+ self.arg(&arg.as_str());
+ self
+ }
+
pub fn args<I>(&mut self, args: I) -> &mut Command
where
I: IntoIterator<Item: AsRef<OsStr>>,
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index 74cde92..9b044d9 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -13,6 +13,7 @@
use rustc_data_structures::fx::FxHashSet;
use rustc_fs_util::fix_windows_verbatim_for_gcc;
use rustc_target::spec::{PanicStrategy, RelroLevel, LinkerFlavor};
+use syntax::symbol::Symbol;
use crate::{METADATA_FILENAME, RLIB_BYTECODE_EXTENSION, CrateInfo, CodegenResults};
use super::archive::ArchiveBuilder;
@@ -316,7 +317,7 @@
NativeLibraryKind::NativeUnknown => continue,
}
if let Some(name) = lib.name {
- ab.add_native_library(&name.as_str());
+ ab.add_native_library(name);
}
}
@@ -1276,15 +1277,14 @@
let search_path = archive_search_paths(sess);
for lib in relevant_libs {
let name = match lib.name {
- Some(ref l) => l,
+ Some(l) => l,
None => continue,
};
match lib.kind {
- NativeLibraryKind::NativeUnknown => cmd.link_dylib(&name.as_str()),
- NativeLibraryKind::NativeFramework => cmd.link_framework(&name.as_str()),
- NativeLibraryKind::NativeStaticNobundle => cmd.link_staticlib(&name.as_str()),
- NativeLibraryKind::NativeStatic => cmd.link_whole_staticlib(&name.as_str(),
- &search_path)
+ NativeLibraryKind::NativeUnknown => cmd.link_dylib(name),
+ NativeLibraryKind::NativeFramework => cmd.link_framework(name),
+ NativeLibraryKind::NativeStaticNobundle => cmd.link_staticlib(name),
+ NativeLibraryKind::NativeStatic => cmd.link_whole_staticlib(name, &search_path)
}
}
}
@@ -1597,7 +1597,7 @@
cmd.include_path(&fix_windows_verbatim_for_gcc(dir));
}
let filestem = cratepath.file_stem().unwrap().to_str().unwrap();
- cmd.link_rust_dylib(&unlib(&sess.target, filestem),
+ cmd.link_rust_dylib(Symbol::intern(&unlib(&sess.target, filestem)),
parent.unwrap_or(Path::new("")));
}
}
@@ -1640,22 +1640,22 @@
for &(cnum, _) in crates {
for lib in codegen_results.crate_info.native_libraries[&cnum].iter() {
let name = match lib.name {
- Some(ref l) => l,
+ Some(l) => l,
None => continue,
};
if !relevant_lib(sess, &lib) {
continue
}
match lib.kind {
- NativeLibraryKind::NativeUnknown => cmd.link_dylib(&name.as_str()),
- NativeLibraryKind::NativeFramework => cmd.link_framework(&name.as_str()),
+ NativeLibraryKind::NativeUnknown => cmd.link_dylib(name),
+ NativeLibraryKind::NativeFramework => cmd.link_framework(name),
NativeLibraryKind::NativeStaticNobundle => {
// Link "static-nobundle" native libs only if the crate they originate from
// is being linked statically to the current crate. If it's linked dynamically
// or is an rlib already included via some other dylib crate, the symbols from
// native libs will have already been included in that dylib.
if data[cnum.as_usize() - 1] == Linkage::Static {
- cmd.link_staticlib(&name.as_str())
+ cmd.link_staticlib(name)
}
},
// ignore statically included native libraries here as we've
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs
index de481d2..c42cd02 100644
--- a/src/librustc_codegen_ssa/back/linker.rs
+++ b/src/librustc_codegen_ssa/back/linker.rs
@@ -17,6 +17,7 @@
use rustc::ty::TyCtxt;
use rustc_target::spec::{LinkerFlavor, LldFlavor};
use rustc_serialize::{json, Encoder};
+use syntax::symbol::Symbol;
/// For all the linkers we support, and information they might
/// need out of the shared crate context before we get rid of it.
@@ -99,13 +100,13 @@
/// used to dispatch on whether a GNU-like linker (generally `ld.exe`) or an
/// MSVC linker (e.g., `link.exe`) is being used.
pub trait Linker {
- fn link_dylib(&mut self, lib: &str);
- fn link_rust_dylib(&mut self, lib: &str, path: &Path);
- fn link_framework(&mut self, framework: &str);
- fn link_staticlib(&mut self, lib: &str);
+ fn link_dylib(&mut self, lib: Symbol);
+ fn link_rust_dylib(&mut self, lib: Symbol, path: &Path);
+ fn link_framework(&mut self, framework: Symbol);
+ fn link_staticlib(&mut self, lib: Symbol);
fn link_rlib(&mut self, lib: &Path);
fn link_whole_rlib(&mut self, lib: &Path);
- fn link_whole_staticlib(&mut self, lib: &str, search_path: &[PathBuf]);
+ fn link_whole_staticlib(&mut self, lib: Symbol, search_path: &[PathBuf]);
fn include_path(&mut self, path: &Path);
fn framework_path(&mut self, path: &Path);
fn output_filename(&mut self, path: &Path);
@@ -215,9 +216,13 @@
}
impl<'a> Linker for GccLinker<'a> {
- fn link_dylib(&mut self, lib: &str) { self.hint_dynamic(); self.cmd.arg(format!("-l{}", lib)); }
- fn link_staticlib(&mut self, lib: &str) {
- self.hint_static(); self.cmd.arg(format!("-l{}", lib));
+ fn link_dylib(&mut self, lib: Symbol) {
+ self.hint_dynamic();
+ self.cmd.arg(format!("-l{}", lib));
+ }
+ fn link_staticlib(&mut self, lib: Symbol) {
+ self.hint_static();
+ self.cmd.arg(format!("-l{}", lib));
}
fn link_rlib(&mut self, lib: &Path) { self.hint_static(); self.cmd.arg(lib); }
fn include_path(&mut self, path: &Path) { self.cmd.arg("-L").arg(path); }
@@ -232,14 +237,14 @@
fn build_static_executable(&mut self) { self.cmd.arg("-static"); }
fn args(&mut self, args: &[String]) { self.cmd.args(args); }
- fn link_rust_dylib(&mut self, lib: &str, _path: &Path) {
+ fn link_rust_dylib(&mut self, lib: Symbol, _path: &Path) {
self.hint_dynamic();
self.cmd.arg(format!("-l{}", lib));
}
- fn link_framework(&mut self, framework: &str) {
+ fn link_framework(&mut self, framework: Symbol) {
self.hint_dynamic();
- self.cmd.arg("-framework").arg(framework);
+ self.cmd.arg("-framework").sym_arg(framework);
}
// Here we explicitly ask that the entire archive is included into the
@@ -248,7 +253,7 @@
// don't otherwise explicitly reference them. This can occur for
// libraries which are just providing bindings, libraries with generic
// functions, etc.
- fn link_whole_staticlib(&mut self, lib: &str, search_path: &[PathBuf]) {
+ fn link_whole_staticlib(&mut self, lib: Symbol, search_path: &[PathBuf]) {
self.hint_static();
let target = &self.sess.target.target;
if !target.options.is_like_osx {
@@ -539,11 +544,11 @@
}
}
- fn link_dylib(&mut self, lib: &str) {
+ fn link_dylib(&mut self, lib: Symbol) {
self.cmd.arg(&format!("{}.lib", lib));
}
- fn link_rust_dylib(&mut self, lib: &str, path: &Path) {
+ fn link_rust_dylib(&mut self, lib: Symbol, path: &Path) {
// When producing a dll, the MSVC linker may not actually emit a
// `foo.lib` file if the dll doesn't actually export any symbols, so we
// check to see if the file is there and just omit linking to it if it's
@@ -554,7 +559,7 @@
}
}
- fn link_staticlib(&mut self, lib: &str) {
+ fn link_staticlib(&mut self, lib: Symbol) {
self.cmd.arg(&format!("{}.lib", lib));
}
@@ -605,11 +610,11 @@
fn framework_path(&mut self, _path: &Path) {
bug!("frameworks are not supported on windows")
}
- fn link_framework(&mut self, _framework: &str) {
+ fn link_framework(&mut self, _framework: Symbol) {
bug!("frameworks are not supported on windows")
}
- fn link_whole_staticlib(&mut self, lib: &str, _search_path: &[PathBuf]) {
+ fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {
// not supported?
self.link_staticlib(lib);
}
@@ -740,8 +745,8 @@
self.cmd.arg("-L").arg(path);
}
- fn link_staticlib(&mut self, lib: &str) {
- self.cmd.arg("-l").arg(lib);
+ fn link_staticlib(&mut self, lib: Symbol) {
+ self.cmd.arg("-l").sym_arg(lib);
}
fn output_filename(&mut self, path: &Path) {
@@ -752,12 +757,12 @@
self.cmd.arg(path);
}
- fn link_dylib(&mut self, lib: &str) {
+ fn link_dylib(&mut self, lib: Symbol) {
// Emscripten always links statically
self.link_staticlib(lib);
}
- fn link_whole_staticlib(&mut self, lib: &str, _search_path: &[PathBuf]) {
+ fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {
// not supported?
self.link_staticlib(lib);
}
@@ -767,7 +772,7 @@
self.link_rlib(lib);
}
- fn link_rust_dylib(&mut self, lib: &str, _path: &Path) {
+ fn link_rust_dylib(&mut self, lib: Symbol, _path: &Path) {
self.link_dylib(lib);
}
@@ -803,7 +808,7 @@
bug!("frameworks are not supported on Emscripten")
}
- fn link_framework(&mut self, _framework: &str) {
+ fn link_framework(&mut self, _framework: Symbol) {
bug!("frameworks are not supported on Emscripten")
}
@@ -948,12 +953,12 @@
}
impl<'a> Linker for WasmLd<'a> {
- fn link_dylib(&mut self, lib: &str) {
- self.cmd.arg("-l").arg(lib);
+ fn link_dylib(&mut self, lib: Symbol) {
+ self.cmd.arg("-l").sym_arg(lib);
}
- fn link_staticlib(&mut self, lib: &str) {
- self.cmd.arg("-l").arg(lib);
+ fn link_staticlib(&mut self, lib: Symbol) {
+ self.cmd.arg("-l").sym_arg(lib);
}
fn link_rlib(&mut self, lib: &Path) {
@@ -995,16 +1000,16 @@
self.cmd.args(args);
}
- fn link_rust_dylib(&mut self, lib: &str, _path: &Path) {
- self.cmd.arg("-l").arg(lib);
+ fn link_rust_dylib(&mut self, lib: Symbol, _path: &Path) {
+ self.cmd.arg("-l").sym_arg(lib);
}
- fn link_framework(&mut self, _framework: &str) {
+ fn link_framework(&mut self, _framework: Symbol) {
panic!("frameworks not supported")
}
- fn link_whole_staticlib(&mut self, lib: &str, _search_path: &[PathBuf]) {
- self.cmd.arg("-l").arg(lib);
+ fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {
+ self.cmd.arg("-l").sym_arg(lib);
}
fn link_whole_rlib(&mut self, lib: &Path) {
@@ -1162,19 +1167,19 @@
::std::mem::replace(&mut self.cmd, Command::new(""))
}
- fn link_dylib(&mut self, _lib: &str) {
+ fn link_dylib(&mut self, _lib: Symbol) {
panic!("external dylibs not supported")
}
- fn link_rust_dylib(&mut self, _lib: &str, _path: &Path) {
+ fn link_rust_dylib(&mut self, _lib: Symbol, _path: &Path) {
panic!("external dylibs not supported")
}
- fn link_staticlib(&mut self, _lib: &str) {
+ fn link_staticlib(&mut self, _lib: Symbol) {
panic!("staticlibs not supported")
}
- fn link_whole_staticlib(&mut self, _lib: &str, _search_path: &[PathBuf]) {
+ fn link_whole_staticlib(&mut self, _lib: Symbol, _search_path: &[PathBuf]) {
panic!("staticlibs not supported")
}
@@ -1182,7 +1187,7 @@
panic!("frameworks not supported")
}
- fn link_framework(&mut self, _framework: &str) {
+ fn link_framework(&mut self, _framework: Symbol) {
panic!("frameworks not supported")
}
diff --git a/src/librustc_codegen_ssa/error_codes.rs b/src/librustc_codegen_ssa/error_codes.rs
index 8d46dcb..8ff41c2 100644
--- a/src/librustc_codegen_ssa/error_codes.rs
+++ b/src/librustc_codegen_ssa/error_codes.rs
@@ -1,4 +1,4 @@
-register_long_diagnostics! {
+syntax::register_diagnostics! {
E0668: r##"
Malformed inline assembly rejected by LLVM.
diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs
index 68640ab..90bf964 100644
--- a/src/librustc_codegen_ssa/lib.rs
+++ b/src/librustc_codegen_ssa/lib.rs
@@ -4,7 +4,6 @@
#![feature(box_syntax)]
#![feature(core_intrinsics)]
#![feature(libc)]
-#![feature(rustc_diagnostic_macros)]
#![feature(stmt_expr_attributes)]
#![feature(try_blocks)]
#![feature(in_band_lifetimes)]
@@ -35,8 +34,6 @@
use rustc::middle::cstore::{LibSource, CrateSource, NativeLibrary};
use syntax_pos::symbol::Symbol;
-// N.B., this module needs to be declared first so diagnostics are
-// registered before they are used.
mod error_codes;
pub mod common;
@@ -158,5 +155,3 @@
pub linker_info: back::linker::LinkerInfo,
pub crate_info: CrateInfo,
}
-
-__build_diagnostic_array! { librustc_codegen_ssa, DIAGNOSTICS }
diff --git a/src/librustc_codegen_ssa/mir/mod.rs b/src/librustc_codegen_ssa/mir/mod.rs
index 8acb3ba..00e9ca0 100644
--- a/src/librustc_codegen_ssa/mir/mod.rs
+++ b/src/librustc_codegen_ssa/mir/mod.rs
@@ -518,19 +518,19 @@
PassMode::Ignore(IgnoreMode::CVarArgs) => {}
PassMode::Direct(_) => {
let llarg = bx.get_param(llarg_idx);
- bx.set_value_name(llarg, &name);
+ bx.set_var_name(llarg, &name);
llarg_idx += 1;
return local(
OperandRef::from_immediate_or_packed_pair(bx, llarg, arg.layout));
}
PassMode::Pair(..) => {
- let a = bx.get_param(llarg_idx);
- bx.set_value_name(a, &(name.clone() + ".0"));
- llarg_idx += 1;
+ let (a, b) = (bx.get_param(llarg_idx), bx.get_param(llarg_idx + 1));
+ llarg_idx += 2;
- let b = bx.get_param(llarg_idx);
- bx.set_value_name(b, &(name + ".1"));
- llarg_idx += 1;
+ // FIXME(eddyb) these are scalar components,
+ // maybe extract the high-level fields?
+ bx.set_var_name(a, format_args!("{}.0", name));
+ bx.set_var_name(b, format_args!("{}.1", name));
return local(OperandRef {
val: OperandValue::Pair(a, b),
@@ -546,7 +546,7 @@
// already put it in a temporary alloca and gave it up.
// FIXME: lifetimes
let llarg = bx.get_param(llarg_idx);
- bx.set_value_name(llarg, &name);
+ bx.set_var_name(llarg, &name);
llarg_idx += 1;
PlaceRef::new_sized(llarg, arg.layout)
} else if arg.is_unsized_indirect() {
diff --git a/src/librustc_codegen_ssa/mir/statement.rs b/src/librustc_codegen_ssa/mir/statement.rs
index 3617f3a..594f45c 100644
--- a/src/librustc_codegen_ssa/mir/statement.rs
+++ b/src/librustc_codegen_ssa/mir/statement.rs
@@ -29,7 +29,21 @@
self.codegen_rvalue_unsized(bx, cg_indirect_dest, rvalue)
}
LocalRef::Operand(None) => {
- let (bx, operand) = self.codegen_rvalue_operand(bx, rvalue);
+ let (mut bx, operand) = self.codegen_rvalue_operand(bx, rvalue);
+ if let Some(name) = self.mir.local_decls[index].name {
+ match operand.val {
+ OperandValue::Ref(x, ..) |
+ OperandValue::Immediate(x) => {
+ bx.set_var_name(x, name);
+ }
+ OperandValue::Pair(a, b) => {
+ // FIXME(eddyb) these are scalar components,
+ // maybe extract the high-level fields?
+ bx.set_var_name(a, format_args!("{}.0", name));
+ bx.set_var_name(b, format_args!("{}.1", name));
+ }
+ }
+ }
self.locals[index] = LocalRef::Operand(Some(operand));
bx
}
diff --git a/src/librustc_codegen_ssa/traits/debuginfo.rs b/src/librustc_codegen_ssa/traits/debuginfo.rs
index be2fa72..9c16b86 100644
--- a/src/librustc_codegen_ssa/traits/debuginfo.rs
+++ b/src/librustc_codegen_ssa/traits/debuginfo.rs
@@ -57,5 +57,5 @@
span: Span,
);
fn insert_reference_to_gdb_debug_scripts_section_global(&mut self);
- fn set_value_name(&mut self, value: Self::Value, name: &str);
+ fn set_var_name(&mut self, value: Self::Value, name: impl ToString);
}
diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs
index 4ea375b..1201446 100644
--- a/src/librustc_codegen_utils/lib.rs
+++ b/src/librustc_codegen_utils/lib.rs
@@ -10,7 +10,6 @@
#![feature(core_intrinsics)]
#![feature(never_type)]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![feature(in_band_lifetimes)]
#![recursion_limit="256"]
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
index b030517..a839ee5 100644
--- a/src/librustc_driver/Cargo.toml
+++ b/src/librustc_driver/Cargo.toml
@@ -12,7 +12,7 @@
[dependencies]
graphviz = { path = "../libgraphviz" }
log = "0.4"
-env_logger = { version = "0.5", default-features = false }
+env_logger = { version = "0.6", default-features = false }
rustc = { path = "../librustc" }
rustc_target = { path = "../librustc_target" }
rustc_ast_borrowck = { path = "../librustc_ast_borrowck" }
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 9a6a12e..a912ea3 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -9,7 +9,6 @@
#![feature(box_syntax)]
#![cfg_attr(unix, feature(libc))]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![feature(set_stdio)]
#![feature(no_debug)]
#![feature(integer_atomics)]
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
index cb17401..c4d3ad9 100644
--- a/src/librustc_driver/pretty.rs
+++ b/src/librustc_driver/pretty.rs
@@ -1,7 +1,5 @@
//! The various pretty-printing routines.
-use rustc::cfg;
-use rustc::cfg::graphviz::LabelledCFG;
use rustc::hir;
use rustc::hir::map as hir_map;
use rustc::hir::map::blocks;
@@ -14,6 +12,7 @@
use rustc_interface::util::ReplaceBodyWithLoop;
use rustc_ast_borrowck as borrowck;
use rustc_ast_borrowck::graphviz as borrowck_dot;
+use rustc_ast_borrowck::cfg::{self, graphviz::LabelledCFG};
use rustc_mir::util::{write_mir_pretty, write_mir_graphviz};
use syntax::ast;
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 6585633..c1fba41 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -845,3 +845,10 @@
}
}
}
+
+#[macro_export]
+macro_rules! pluralise {
+ ($x:expr) => {
+ if $x != 1 { "s" } else { "" }
+ };
+}
diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml
index a931ad3..659c4c8 100644
--- a/src/librustc_incremental/Cargo.toml
+++ b/src/librustc_incremental/Cargo.toml
@@ -12,7 +12,7 @@
[dependencies]
graphviz = { path = "../libgraphviz" }
log = "0.4"
-rand = "0.6"
+rand = "0.7"
rustc = { path = "../librustc" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
diff --git a/src/librustc_incremental/assert_module_sources.rs b/src/librustc_incremental/assert_module_sources.rs
index 046fdc7..e08eeaf 100644
--- a/src/librustc_incremental/assert_module_sources.rs
+++ b/src/librustc_incremental/assert_module_sources.rs
@@ -27,7 +27,7 @@
use rustc::ty::TyCtxt;
use std::collections::BTreeSet;
use syntax::ast;
-use syntax::symbol::{Symbol, sym};
+use syntax::symbol::{InternedString, Symbol, sym};
use rustc::ich::{ATTR_PARTITION_REUSED, ATTR_PARTITION_CODEGENED,
ATTR_EXPECTED_CGU_REUSE};
@@ -45,8 +45,8 @@
.collect_and_partition_mono_items(LOCAL_CRATE)
.1
.iter()
- .map(|cgu| format!("{}", cgu.name()))
- .collect::<BTreeSet<String>>();
+ .map(|cgu| *cgu.name())
+ .collect::<BTreeSet<InternedString>>();
let ams = AssertModuleSource {
tcx,
@@ -61,7 +61,7 @@
struct AssertModuleSource<'tcx> {
tcx: TyCtxt<'tcx>,
- available_cgus: BTreeSet<String>,
+ available_cgus: BTreeSet<InternedString>,
}
impl AssertModuleSource<'tcx> {
@@ -127,7 +127,7 @@
debug!("mapping '{}' to cgu name '{}'", self.field(attr, MODULE), cgu_name);
- if !self.available_cgus.contains(&cgu_name.as_str()[..]) {
+ if !self.available_cgus.contains(&cgu_name) {
self.tcx.sess.span_err(attr.span,
&format!("no module named `{}` (mangled: {}). \
Available modules: {}",
@@ -135,7 +135,7 @@
cgu_name,
self.available_cgus
.iter()
- .cloned()
+ .map(|cgu| cgu.as_str().to_string())
.collect::<Vec<_>>()
.join(", ")));
}
diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml
index 16b377d..f629310 100644
--- a/src/librustc_interface/Cargo.toml
+++ b/src/librustc_interface/Cargo.toml
@@ -34,3 +34,4 @@
rustc_privacy = { path = "../librustc_privacy" }
rustc_resolve = { path = "../librustc_resolve" }
tempfile = "3.0.5"
+once_cell = "1"
diff --git a/src/librustc_interface/build.rs b/src/librustc_interface/build.rs
new file mode 100644
index 0000000..79a343e
--- /dev/null
+++ b/src/librustc_interface/build.rs
@@ -0,0 +1,4 @@
+fn main() {
+ println!("cargo:rerun-if-changed=build.rs");
+ println!("cargo:rerun-if-env-changed=RUSTC_INSTALL_BINDIR");
+}
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index 24b4496..3cfae16 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -34,7 +34,7 @@
use rustc_resolve::{Resolver, ResolverArenas};
use rustc_traits;
use rustc_typeck as typeck;
-use syntax::{self, ast, diagnostics, visit};
+use syntax::{self, ast, visit};
use syntax::early_buffered_lints::BufferedEarlyLint;
use syntax::ext::base::{NamedSyntaxExtension, ExtCtxt};
use syntax::mut_visit::MutVisitor;
@@ -230,10 +230,12 @@
crate_name: &str,
) -> Result<(ast::Crate, PluginInfo)> {
krate = time(sess, "attributes injection", || {
- syntax::attr::inject(krate, &sess.parse_sess, &sess.opts.debugging_opts.crate_attr)
+ syntax_ext::cmdline_attrs::inject(
+ krate, &sess.parse_sess, &sess.opts.debugging_opts.crate_attr
+ )
});
- let (mut krate, features) = syntax::config::features(
+ let (krate, features) = syntax::config::features(
krate,
&sess.parse_sess,
sess.edition(),
@@ -268,16 +270,6 @@
middle::recursion_limit::update_limits(sess, &krate);
});
- krate = time(sess, "crate injection", || {
- let alt_std_name = sess.opts.alt_std_name.as_ref().map(|s| &**s);
- let (krate, name) =
- syntax_ext::standard_library_imports::inject(krate, alt_std_name, sess.edition());
- if let Some(name) = name {
- sess.parse_sess.injected_crate_name.set(name);
- }
- krate
- });
-
let registrars = time(sess, "plugin loading", || {
plugin::load::load_plugins(
sess,
@@ -291,21 +283,6 @@
let mut registry = Registry::new(sess, krate.span);
time(sess, "plugin registration", || {
- if sess.features_untracked().rustc_diagnostic_macros {
- registry.register_macro(
- "__diagnostic_used",
- diagnostics::plugin::expand_diagnostic_used,
- );
- registry.register_macro(
- "__register_diagnostic",
- diagnostics::plugin::expand_register_diagnostic,
- );
- registry.register_macro(
- "__build_diagnostic_array",
- diagnostics::plugin::expand_build_diagnostic_array,
- );
- }
-
for registrar in registrars {
registry.args_hidden = Some(registrar.args);
(registrar.fun)(&mut registry);
@@ -370,6 +347,21 @@
&resolver_arenas,
);
syntax_ext::register_builtin_macros(&mut resolver, sess.edition());
+
+ krate = time(sess, "crate injection", || {
+ let alt_std_name = sess.opts.alt_std_name.as_ref().map(|s| Symbol::intern(s));
+ let (krate, name) = syntax_ext::standard_library_imports::inject(
+ krate,
+ &mut resolver,
+ &sess.parse_sess,
+ alt_std_name,
+ );
+ if let Some(name) = name {
+ sess.parse_sess.injected_crate_name.set(name);
+ }
+ krate
+ });
+
syntax_ext::plugin_macro_defs::inject(
&mut krate, &mut resolver, plugin_info.syntax_exts, sess.edition()
);
diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
index f007a0c..b81f814 100644
--- a/src/librustc_interface/util.rs
+++ b/src/librustc_interface/util.rs
@@ -43,17 +43,17 @@
pub fn diagnostics_registry() -> Registry {
let mut all_errors = Vec::new();
- all_errors.extend_from_slice(&rustc::DIAGNOSTICS);
- all_errors.extend_from_slice(&rustc_typeck::DIAGNOSTICS);
- all_errors.extend_from_slice(&rustc_resolve::DIAGNOSTICS);
- all_errors.extend_from_slice(&rustc_privacy::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_typeck::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_resolve::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_privacy::error_codes::DIAGNOSTICS);
// FIXME: need to figure out a way to get these back in here
// all_errors.extend_from_slice(get_codegen_backend(sess).diagnostics());
- all_errors.extend_from_slice(&rustc_metadata::DIAGNOSTICS);
- all_errors.extend_from_slice(&rustc_passes::DIAGNOSTICS);
- all_errors.extend_from_slice(&rustc_plugin::DIAGNOSTICS);
- all_errors.extend_from_slice(&rustc_mir::DIAGNOSTICS);
- all_errors.extend_from_slice(&syntax::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_metadata::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_passes::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_plugin::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&rustc_mir::error_codes::DIAGNOSTICS);
+ all_errors.extend_from_slice(&syntax::error_codes::DIAGNOSTICS);
Registry::new(&all_errors)
}
@@ -289,20 +289,39 @@
backend
}
-pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend> {
- // For now we only allow this function to be called once as it'll dlopen a
- // few things, which seems to work best if we only do that once. In
- // general this assertion never trips due to the once guard in `get_codegen_backend`,
- // but there's a few manual calls to this function in this file we protect
- // against.
- static LOADED: AtomicBool = AtomicBool::new(false);
- assert!(!LOADED.fetch_or(true, Ordering::SeqCst),
- "cannot load the default codegen backend twice");
+// This is used for rustdoc, but it uses similar machinery to codegen backend
+// loading, so we leave the code here. It is potentially useful for other tools
+// that want to invoke the rustc binary while linking to rustc as well.
+pub fn rustc_path<'a>() -> Option<&'a Path> {
+ static RUSTC_PATH: once_cell::sync::OnceCell<Option<PathBuf>> =
+ once_cell::sync::OnceCell::new();
+ const BIN_PATH: &str = env!("RUSTC_INSTALL_BINDIR");
+
+ RUSTC_PATH.get_or_init(|| get_rustc_path_inner(BIN_PATH)).as_ref().map(|v| &**v)
+}
+
+fn get_rustc_path_inner(bin_path: &str) -> Option<PathBuf> {
+ sysroot_candidates().iter()
+ .filter_map(|sysroot| {
+ let candidate = sysroot.join(bin_path).join(if cfg!(target_os = "windows") {
+ "rustc.exe"
+ } else {
+ "rustc"
+ });
+ if candidate.exists() {
+ Some(candidate)
+ } else {
+ None
+ }
+ })
+ .next()
+}
+
+fn sysroot_candidates() -> Vec<PathBuf> {
let target = session::config::host_triple();
let mut sysroot_candidates = vec![filesearch::get_or_default_sysroot()];
- let path = current_dll_path()
- .and_then(|s| s.canonicalize().ok());
+ let path = current_dll_path().and_then(|s| s.canonicalize().ok());
if let Some(dll) = path {
// use `parent` twice to chop off the file name and then also the
// directory containing the dll which should be either `lib` or `bin`.
@@ -327,69 +346,7 @@
}
}
- let sysroot = sysroot_candidates.iter()
- .map(|sysroot| {
- let libdir = filesearch::relative_target_lib_path(&sysroot, &target);
- sysroot.join(libdir).with_file_name(
- option_env!("CFG_CODEGEN_BACKENDS_DIR").unwrap_or("codegen-backends"))
- })
- .filter(|f| {
- info!("codegen backend candidate: {}", f.display());
- f.exists()
- })
- .next();
- let sysroot = sysroot.unwrap_or_else(|| {
- let candidates = sysroot_candidates.iter()
- .map(|p| p.display().to_string())
- .collect::<Vec<_>>()
- .join("\n* ");
- let err = format!("failed to find a `codegen-backends` folder \
- in the sysroot candidates:\n* {}", candidates);
- early_error(ErrorOutputType::default(), &err);
- });
- info!("probing {} for a codegen backend", sysroot.display());
-
- let d = sysroot.read_dir().unwrap_or_else(|e| {
- let err = format!("failed to load default codegen backend, couldn't \
- read `{}`: {}", sysroot.display(), e);
- early_error(ErrorOutputType::default(), &err);
- });
-
- let mut file: Option<PathBuf> = None;
-
- let expected_name = format!("rustc_codegen_llvm-{}", backend_name);
- for entry in d.filter_map(|e| e.ok()) {
- let path = entry.path();
- let filename = match path.file_name().and_then(|s| s.to_str()) {
- Some(s) => s,
- None => continue,
- };
- if !(filename.starts_with(DLL_PREFIX) && filename.ends_with(DLL_SUFFIX)) {
- continue
- }
- let name = &filename[DLL_PREFIX.len() .. filename.len() - DLL_SUFFIX.len()];
- if name != expected_name {
- continue
- }
- if let Some(ref prev) = file {
- let err = format!("duplicate codegen backends found\n\
- first: {}\n\
- second: {}\n\
- ", prev.display(), path.display());
- early_error(ErrorOutputType::default(), &err);
- }
- file = Some(path.clone());
- }
-
- match file {
- Some(ref s) => return load_backend_from_dylib(s),
- None => {
- let err = format!("failed to load default codegen backend for `{}`, \
- no appropriate codegen dylib found in `{}`",
- backend_name, sysroot.display());
- early_error(ErrorOutputType::default(), &err);
- }
- }
+ return sysroot_candidates;
#[cfg(unix)]
fn current_dll_path() -> Option<PathBuf> {
@@ -459,6 +416,85 @@
}
}
+pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend> {
+ // For now we only allow this function to be called once as it'll dlopen a
+ // few things, which seems to work best if we only do that once. In
+ // general this assertion never trips due to the once guard in `get_codegen_backend`,
+ // but there's a few manual calls to this function in this file we protect
+ // against.
+ static LOADED: AtomicBool = AtomicBool::new(false);
+ assert!(!LOADED.fetch_or(true, Ordering::SeqCst),
+ "cannot load the default codegen backend twice");
+
+ let target = session::config::host_triple();
+ let sysroot_candidates = sysroot_candidates();
+
+ let sysroot = sysroot_candidates.iter()
+ .map(|sysroot| {
+ let libdir = filesearch::relative_target_lib_path(&sysroot, &target);
+ sysroot.join(libdir).with_file_name(
+ option_env!("CFG_CODEGEN_BACKENDS_DIR").unwrap_or("codegen-backends"))
+ })
+ .filter(|f| {
+ info!("codegen backend candidate: {}", f.display());
+ f.exists()
+ })
+ .next();
+ let sysroot = sysroot.unwrap_or_else(|| {
+ let candidates = sysroot_candidates.iter()
+ .map(|p| p.display().to_string())
+ .collect::<Vec<_>>()
+ .join("\n* ");
+ let err = format!("failed to find a `codegen-backends` folder \
+ in the sysroot candidates:\n* {}", candidates);
+ early_error(ErrorOutputType::default(), &err);
+ });
+ info!("probing {} for a codegen backend", sysroot.display());
+
+ let d = sysroot.read_dir().unwrap_or_else(|e| {
+ let err = format!("failed to load default codegen backend, couldn't \
+ read `{}`: {}", sysroot.display(), e);
+ early_error(ErrorOutputType::default(), &err);
+ });
+
+ let mut file: Option<PathBuf> = None;
+
+ let expected_name = format!("rustc_codegen_llvm-{}", backend_name);
+ for entry in d.filter_map(|e| e.ok()) {
+ let path = entry.path();
+ let filename = match path.file_name().and_then(|s| s.to_str()) {
+ Some(s) => s,
+ None => continue,
+ };
+ if !(filename.starts_with(DLL_PREFIX) && filename.ends_with(DLL_SUFFIX)) {
+ continue
+ }
+ let name = &filename[DLL_PREFIX.len() .. filename.len() - DLL_SUFFIX.len()];
+ if name != expected_name {
+ continue
+ }
+ if let Some(ref prev) = file {
+ let err = format!("duplicate codegen backends found\n\
+ first: {}\n\
+ second: {}\n\
+ ", prev.display(), path.display());
+ early_error(ErrorOutputType::default(), &err);
+ }
+ file = Some(path.clone());
+ }
+
+ match file {
+ Some(ref s) => return load_backend_from_dylib(s),
+ None => {
+ let err = format!("failed to load default codegen backend for `{}`, \
+ no appropriate codegen dylib found in `{}`",
+ backend_name, sysroot.display());
+ early_error(ErrorOutputType::default(), &err);
+ }
+ }
+
+}
+
pub(crate) fn compute_crate_disambiguator(session: &Session) -> CrateDisambiguator {
use std::hash::Hasher;
diff --git a/src/librustc_lint/error_codes.rs b/src/librustc_lint/error_codes.rs
index d7c39b7..ea2e1d9 100644
--- a/src/librustc_lint/error_codes.rs
+++ b/src/librustc_lint/error_codes.rs
@@ -1,5 +1,4 @@
-use syntax::register_diagnostics;
-
-register_diagnostics! {
+syntax::register_diagnostics! {
+;
E0721, // `await` keyword
}
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index 2783316..0e05401 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -15,7 +15,6 @@
#![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![recursion_limit="256"]
@@ -436,7 +435,12 @@
id: LintId::of(INDIRECT_STRUCTURAL_MATCH),
reference: "issue #62411 <https://github.com/rust-lang/rust/issues/62411>",
edition: None,
- }
+ },
+ FutureIncompatibleInfo {
+ id: LintId::of(SOFT_UNSTABLE),
+ reference: "issue #64266 <https://github.com/rust-lang/rust/issues/64266>",
+ edition: None,
+ },
]);
// Register renamed and removed lints.
diff --git a/src/librustc_lint/types.rs b/src/librustc_lint/types.rs
index 217e10a..3b8c06b 100644
--- a/src/librustc_lint/types.rs
+++ b/src/librustc_lint/types.rs
@@ -624,7 +624,7 @@
AdtKind::Struct => {
if !def.repr.c() && !def.repr.transparent() {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "this struct has unspecified layout",
help: Some("consider adding a `#[repr(C)]` or \
`#[repr(transparent)]` attribute to this struct"),
@@ -633,7 +633,7 @@
if def.non_enum_variant().fields.is_empty() {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "this struct has no fields",
help: Some("consider adding a member to this struct"),
};
@@ -669,7 +669,7 @@
AdtKind::Union => {
if !def.repr.c() && !def.repr.transparent() {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "this union has unspecified layout",
help: Some("consider adding a `#[repr(C)]` or \
`#[repr(transparent)]` attribute to this union"),
@@ -678,7 +678,7 @@
if def.non_enum_variant().fields.is_empty() {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "this union has no fields",
help: Some("consider adding a field to this union"),
};
@@ -721,7 +721,7 @@
// Special-case types like `Option<extern fn()>`.
if !is_repr_nullable_ptr(cx, ty, def, substs) {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "enum has no representation hint",
help: Some("consider adding a `#[repr(C)]`, \
`#[repr(transparent)]`, or integer `#[repr(...)]` \
@@ -750,7 +750,7 @@
}
FfiPhantom(..) => {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "this enum contains a PhantomData field",
help: None,
};
@@ -764,13 +764,13 @@
}
ty::Char => FfiUnsafe {
- ty: ty,
+ ty,
reason: "the `char` type has no C equivalent",
help: Some("consider using `u32` or `libc::wchar_t` instead"),
},
ty::Int(ast::IntTy::I128) | ty::Uint(ast::UintTy::U128) => FfiUnsafe {
- ty: ty,
+ ty,
reason: "128-bit integers don't currently have a known stable ABI",
help: None,
},
@@ -779,25 +779,25 @@
ty::Bool | ty::Int(..) | ty::Uint(..) | ty::Float(..) | ty::Never => FfiSafe,
ty::Slice(_) => FfiUnsafe {
- ty: ty,
+ ty,
reason: "slices have no C equivalent",
help: Some("consider using a raw pointer instead"),
},
ty::Dynamic(..) => FfiUnsafe {
- ty: ty,
+ ty,
reason: "trait objects have no C equivalent",
help: None,
},
ty::Str => FfiUnsafe {
- ty: ty,
+ ty,
reason: "string slices have no C equivalent",
help: Some("consider using `*const u8` and a length instead"),
},
ty::Tuple(..) => FfiUnsafe {
- ty: ty,
+ ty,
reason: "tuples have unspecified layout",
help: Some("consider using a struct instead"),
},
@@ -811,7 +811,7 @@
match sig.abi() {
Abi::Rust | Abi::RustIntrinsic | Abi::PlatformIntrinsic | Abi::RustCall => {
return FfiUnsafe {
- ty: ty,
+ ty,
reason: "this function pointer has Rust-specific calling convention",
help: Some("consider using an `extern fn(...) -> ...` \
function pointer instead"),
@@ -855,11 +855,76 @@
ty::UnnormalizedProjection(..) |
ty::Projection(..) |
ty::Opaque(..) |
- ty::FnDef(..) => bug!("Unexpected type in foreign function"),
+ ty::FnDef(..) => bug!("unexpected type in foreign function: {:?}", ty),
+ }
+ }
+
+ fn emit_ffi_unsafe_type_lint(
+ &mut self,
+ ty: Ty<'tcx>,
+ sp: Span,
+ note: &str,
+ help: Option<&str>,
+ ) {
+ let mut diag = self.cx.struct_span_lint(
+ IMPROPER_CTYPES,
+ sp,
+ &format!("`extern` block uses type `{}`, which is not FFI-safe", ty),
+ );
+ diag.span_label(sp, "not FFI-safe");
+ if let Some(help) = help {
+ diag.help(help);
+ }
+ diag.note(note);
+ if let ty::Adt(def, _) = ty.sty {
+ if let Some(sp) = self.cx.tcx.hir().span_if_local(def.did) {
+ diag.span_note(sp, "type defined here");
+ }
+ }
+ diag.emit();
+ }
+
+ fn check_for_opaque_ty(&mut self, sp: Span, ty: Ty<'tcx>) -> bool {
+ use crate::rustc::ty::TypeFoldable;
+
+ struct ProhibitOpaqueTypes<'tcx> {
+ ty: Option<Ty<'tcx>>,
+ };
+
+ impl<'tcx> ty::fold::TypeVisitor<'tcx> for ProhibitOpaqueTypes<'tcx> {
+ fn visit_ty(&mut self, ty: Ty<'tcx>) -> bool {
+ if let ty::Opaque(..) = ty.sty {
+ self.ty = Some(ty);
+ true
+ } else {
+ ty.super_visit_with(self)
+ }
+ }
+ }
+
+ let mut visitor = ProhibitOpaqueTypes { ty: None };
+ ty.visit_with(&mut visitor);
+ if let Some(ty) = visitor.ty {
+ self.emit_ffi_unsafe_type_lint(
+ ty,
+ sp,
+ "opaque types have no C equivalent",
+ None,
+ );
+ true
+ } else {
+ false
}
}
fn check_type_for_ffi_and_report_errors(&mut self, sp: Span, ty: Ty<'tcx>) {
+ // We have to check for opaque types before `normalize_erasing_regions`,
+ // which will replace opaque types with their underlying concrete type.
+ if self.check_for_opaque_ty(sp, ty) {
+ // We've already emitted an error due to an opaque type.
+ return;
+ }
+
// it is only OK to use this function because extern fns cannot have
// any generic types right now:
let ty = self.cx.tcx.normalize_erasing_regions(ParamEnv::reveal_all(), ty);
@@ -867,24 +932,10 @@
match self.check_type_for_ffi(&mut FxHashSet::default(), ty) {
FfiResult::FfiSafe => {}
FfiResult::FfiPhantom(ty) => {
- self.cx.span_lint(IMPROPER_CTYPES,
- sp,
- &format!("`extern` block uses type `{}` which is not FFI-safe: \
- composed only of PhantomData", ty));
+ self.emit_ffi_unsafe_type_lint(ty, sp, "composed only of `PhantomData`", None);
}
- FfiResult::FfiUnsafe { ty: unsafe_ty, reason, help } => {
- let msg = format!("`extern` block uses type `{}` which is not FFI-safe: {}",
- unsafe_ty, reason);
- let mut diag = self.cx.struct_span_lint(IMPROPER_CTYPES, sp, &msg);
- if let Some(s) = help {
- diag.help(s);
- }
- if let ty::Adt(def, _) = unsafe_ty.sty {
- if let Some(sp) = self.cx.tcx.hir().span_if_local(def.did) {
- diag.span_note(sp, "type defined here");
- }
- }
- diag.emit();
+ FfiResult::FfiUnsafe { ty, reason, help } => {
+ self.emit_ffi_unsafe_type_lint(ty, sp, reason, help);
}
}
}
diff --git a/src/librustc_metadata/error_codes.rs b/src/librustc_metadata/error_codes.rs
index 0708a62..cd8e95e 100644
--- a/src/librustc_metadata/error_codes.rs
+++ b/src/librustc_metadata/error_codes.rs
@@ -1,6 +1,4 @@
-use syntax::{register_diagnostics, register_long_diagnostics};
-
-register_long_diagnostics! {
+syntax::register_diagnostics! {
E0454: r##"
A link name was given with an empty name. Erroneous code example:
@@ -84,10 +82,7 @@
(through Cargo or the `-L` option of rustc example). Plugins are crates as
well, and you link to them the same way.
"##,
-
-}
-
-register_diagnostics! {
+;
E0456, // plugin `..` is not available for triple `..`
E0457, // plugin `..` only found in rlib format, but must be available...
E0514, // metadata version mismatch
@@ -97,5 +92,6 @@
E0464, // multiple matching crates for `..`
E0465, // multiple .. candidates for `..` found
E0519, // local crate and dependency have same (crate-name, disambiguator)
- E0523, // two dependencies have same (crate-name, disambiguator) but different SVH
+ // two dependencies have same (crate-name, disambiguator) but different SVH
+ E0523,
}
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index c96d02d..e6104e6 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -8,7 +8,6 @@
#![feature(nll)]
#![feature(proc_macro_internals)]
#![feature(proc_macro_quote)]
-#![feature(rustc_diagnostic_macros)]
#![feature(rustc_private)]
#![feature(slice_patterns)]
#![feature(specialization)]
@@ -23,7 +22,7 @@
#[macro_use]
extern crate rustc_data_structures;
-mod error_codes;
+pub mod error_codes;
mod index;
mod encoder;
@@ -68,5 +67,3 @@
sess.unwrap().abort_if_errors();
}
}
-
-__build_diagnostic_array! { librustc_metadata, DIAGNOSTICS }
diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs
index 66971bb..ada1a8c 100644
--- a/src/librustc_metadata/native_libs.rs
+++ b/src/librustc_metadata/native_libs.rs
@@ -8,7 +8,7 @@
use syntax::attr;
use syntax::source_map::Span;
use syntax::feature_gate::{self, GateIssue};
-use syntax::symbol::{Symbol, sym};
+use syntax::symbol::{kw, sym, Symbol};
use syntax::{span_err, struct_span_err};
pub fn collect(tcx: TyCtxt<'_>) -> Vec<NativeLibrary> {
@@ -132,7 +132,7 @@
impl Collector<'tcx> {
fn register_native_lib(&mut self, span: Option<Span>, lib: NativeLibrary) {
- if lib.name.as_ref().map(|s| s.as_str().is_empty()).unwrap_or(false) {
+ if lib.name.as_ref().map(|&s| s == kw::Invalid).unwrap_or(false) {
match span {
Some(span) => {
struct_span_err!(self.tcx.sess, span, E0454,
@@ -159,7 +159,7 @@
sym::link_cfg,
span.unwrap(),
GateIssue::Language,
- "is feature gated");
+ "is unstable");
}
if lib.kind == cstore::NativeStaticNobundle &&
!self.tcx.features().static_nobundle {
@@ -167,7 +167,7 @@
sym::static_nobundle,
span.unwrap_or_else(|| syntax_pos::DUMMY_SP),
GateIssue::Language,
- "kind=\"static-nobundle\" is feature gated");
+ "kind=\"static-nobundle\" is unstable");
}
self.libs.push(lib);
}
diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs
index 94323b1..f949b52 100644
--- a/src/librustc_mir/build/matches/mod.rs
+++ b/src/librustc_mir/build/matches/mod.rs
@@ -1345,13 +1345,9 @@
/// any, and then branches to the arm. Returns the block for the case where
/// the guard fails.
///
- /// Note: we check earlier that if there is a guard, there cannot be move
- /// bindings (unless feature(bind_by_move_pattern_guards) is used). This
- /// isn't really important for the self-consistency of this fn, but the
- /// reason for it should be clear: after we've done the assignments, if
- /// there were move bindings, further tests would be a use-after-move.
- /// bind_by_move_pattern_guards avoids this by only moving the binding once
- /// the guard has evaluated to true (see below).
+ /// Note: we do not check earlier that if there is a guard,
+ /// there cannot be move bindings. We avoid a use-after-move by only
+ /// moving the binding once the guard has evaluated to true (see below).
fn bind_and_guard_matched_candidate<'pat>(
&mut self,
candidate: Candidate<'pat, 'tcx>,
diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs
index db67902..3e02497 100644
--- a/src/librustc_mir/const_eval.rs
+++ b/src/librustc_mir/const_eval.rs
@@ -383,7 +383,7 @@
return Ok(());
}
// An intrinsic that we do not support
- let intrinsic_name = &ecx.tcx.item_name(instance.def_id()).as_str()[..];
+ let intrinsic_name = ecx.tcx.item_name(instance.def_id());
Err(
ConstEvalError::NeedsRfc(format!("calling intrinsic `{}`", intrinsic_name)).into()
)
diff --git a/src/librustc_mir/error_codes.rs b/src/librustc_mir/error_codes.rs
index 22432db..ba299e9 100644
--- a/src/librustc_mir/error_codes.rs
+++ b/src/librustc_mir/error_codes.rs
@@ -1,4 +1,4 @@
-register_long_diagnostics! {
+syntax::register_diagnostics! {
E0001: r##"
@@ -157,81 +157,6 @@
See also the error E0303.
"##,
-E0008: r##"
-Names bound in match arms retain their type in pattern guards. As such, if a
-name is bound by move in a pattern, it should also be moved to wherever it is
-referenced in the pattern guard code. Doing so however would prevent the name
-from being available in the body of the match arm. Consider the following:
-
-```compile_fail,E0008
-match Some("hi".to_string()) {
- Some(s) if s.len() == 0 => {}, // use s.
- _ => {},
-}
-```
-
-The variable `s` has type `String`, and its use in the guard is as a variable of
-type `String`. The guard code effectively executes in a separate scope to the
-body of the arm, so the value would be moved into this anonymous scope and
-therefore becomes unavailable in the body of the arm.
-
-The problem above can be solved by using the `ref` keyword.
-
-```
-match Some("hi".to_string()) {
- Some(ref s) if s.len() == 0 => {},
- _ => {},
-}
-```
-
-Though this example seems innocuous and easy to solve, the problem becomes clear
-when it encounters functions which consume the value:
-
-```compile_fail,E0008
-struct A{}
-
-impl A {
- fn consume(self) -> usize {
- 0
- }
-}
-
-fn main() {
- let a = Some(A{});
- match a {
- Some(y) if y.consume() > 0 => {}
- _ => {}
- }
-}
-```
-
-In this situation, even the `ref` keyword cannot solve it, since borrowed
-content cannot be moved. This problem cannot be solved generally. If the value
-can be cloned, here is a not-so-specific solution:
-
-```
-#[derive(Clone)]
-struct A{}
-
-impl A {
- fn consume(self) -> usize {
- 0
- }
-}
-
-fn main() {
- let a = Some(A{});
- match a{
- Some(ref y) if y.clone().consume() > 0 => {}
- _ => {}
- }
-}
-```
-
-If the value will be consumed in the pattern guard, using its clone will not
-move its ownership, so the code works.
-"##,
-
E0009: r##"
In a pattern, all values that don't implement the `Copy` trait have to be bound
the same way. The goal here is to avoid binding simultaneously by-move and
@@ -475,13 +400,15 @@
"##,
E0301: r##"
+#### Note: this error code is no longer emitted by the compiler.
+
Mutable borrows are not allowed in pattern guards, because matching cannot have
side effects. Side effects could alter the matched object or the environment
on which the match depends in such a way, that the match would not be
exhaustive. For instance, the following would not match any arm if mutable
borrows were allowed:
-```compile_fail,E0301
+```compile_fail,E0596
match Some(()) {
None => { },
option if option.take().is_none() => {
@@ -493,13 +420,15 @@
"##,
E0302: r##"
+#### Note: this error code is no longer emitted by the compiler.
+
Assignments are not allowed in pattern guards, because matching cannot have
side effects. Side effects could alter the matched object or the environment
on which the match depends in such a way, that the match would not be
exhaustive. For instance, the following would not match any arm if assignments
were allowed:
-```compile_fail,E0302
+```compile_fail,E0594
match Some(()) {
None => { },
option if { option = None; false } => { },
@@ -1717,7 +1646,14 @@
"##,
E0507: r##"
-You tried to move out of a value which was borrowed. Erroneous code example:
+You tried to move out of a value which was borrowed.
+
+This can also happen when using a type implementing `Fn` or `FnMut`, as neither
+allows moving out of them (they usually represent closures which can be called
+more than once). Much of the text following applies equally well to non-`FnOnce`
+closure bodies.
+
+Erroneous code example:
```compile_fail,E0507
use std::cell::RefCell;
@@ -1989,7 +1925,6 @@
could cause the match to be non-exhaustive:
```compile_fail,E0510
-#![feature(bind_by_move_pattern_guards)]
let mut x = Some(0);
match x {
None => (),
@@ -2448,9 +2383,10 @@
There are some known bugs that trigger this message.
"##,
-}
-register_diagnostics! {
+;
+
+// E0008, // cannot bind by-move into a pattern guard
// E0298, // cannot compare constants
// E0299, // mismatched types between arms
// E0471, // constant evaluation error (in pattern)
diff --git a/src/librustc_mir/hair/pattern/_match.rs b/src/librustc_mir/hair/pattern/_match.rs
index 222750e..a6d955f 100644
--- a/src/librustc_mir/hair/pattern/_match.rs
+++ b/src/librustc_mir/hair/pattern/_match.rs
@@ -517,9 +517,9 @@
pub struct Witness<'tcx>(Vec<Pattern<'tcx>>);
impl<'tcx> Witness<'tcx> {
- pub fn single_pattern(&self) -> &Pattern<'tcx> {
+ pub fn single_pattern(self) -> Pattern<'tcx> {
assert_eq!(self.0.len(), 1);
- &self.0[0]
+ self.0.into_iter().next().unwrap()
}
fn push_wild_constructor<'a>(
diff --git a/src/librustc_mir/hair/pattern/check_match.rs b/src/librustc_mir/hair/pattern/check_match.rs
index 5352888..161c58a 100644
--- a/src/librustc_mir/hair/pattern/check_match.rs
+++ b/src/librustc_mir/hair/pattern/check_match.rs
@@ -5,11 +5,6 @@
use super::{Pattern, PatternContext, PatternError, PatternKind};
use rustc::middle::borrowck::SignalledError;
-use rustc::middle::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor};
-use rustc::middle::expr_use_visitor::{LoanCause, MutateMode};
-use rustc::middle::expr_use_visitor as euv;
-use rustc::middle::mem_categorization::cmt_;
-use rustc::middle::region;
use rustc::session::Session;
use rustc::ty::{self, Ty, TyCtxt};
use rustc::ty::subst::{InternalSubsts, SubstsRef};
@@ -36,9 +31,7 @@
let mut visitor = MatchVisitor {
tcx,
- body_owner: def_id,
tables: tcx.body_tables(body_id),
- region_scope_tree: &tcx.region_scope_tree(def_id),
param_env: tcx.param_env(def_id),
identity_substs: InternalSubsts::identity_for_item(tcx, def_id),
signalled_error: SignalledError::NoErrorsSeen,
@@ -53,15 +46,13 @@
struct MatchVisitor<'a, 'tcx> {
tcx: TyCtxt<'tcx>,
- body_owner: DefId,
tables: &'a ty::TypeckTables<'tcx>,
param_env: ty::ParamEnv<'tcx>,
identity_substs: SubstsRef<'tcx>,
- region_scope_tree: &'a region::ScopeTree,
signalled_error: SignalledError,
}
-impl<'a, 'tcx> Visitor<'tcx> for MatchVisitor<'a, 'tcx> {
+impl<'tcx> Visitor<'tcx> for MatchVisitor<'_, 'tcx> {
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
NestedVisitorMap::None
}
@@ -98,8 +89,7 @@
}
}
-
-impl<'a, 'tcx> PatternContext<'a, 'tcx> {
+impl PatternContext<'_, '_> {
fn report_inlining_errors(&self, pat_span: Span) {
for error in &self.errors {
match *error {
@@ -131,7 +121,7 @@
}
}
-impl<'a, 'tcx> MatchVisitor<'a, 'tcx> {
+impl<'tcx> MatchVisitor<'_, 'tcx> {
fn check_patterns(&mut self, has_guard: bool, pats: &[P<Pat>]) {
check_legality_of_move_bindings(self, has_guard, pats);
for pat in pats {
@@ -151,11 +141,8 @@
// Second, if there is a guard on each arm, make sure it isn't
// assigning or borrowing anything mutably.
- if let Some(ref guard) = arm.guard {
+ if arm.guard.is_some() {
self.signalled_error = SignalledError::SawSomeError;
- if !self.tcx.features().bind_by_move_pattern_guards {
- check_for_mutation_in_guard(self, &guard);
- }
}
// Third, perform some lints.
@@ -277,37 +264,26 @@
expand_pattern(cx, pattern)
]].into_iter().collect();
- let wild_pattern = Pattern {
- ty: pattern_ty,
- span: DUMMY_SP,
- kind: box PatternKind::Wild,
- };
- let witness = match is_useful(cx, &pats, &[&wild_pattern], ConstructWitness) {
- UsefulWithWitness(witness) => witness,
- NotUseful => return,
- Useful => bug!()
+ let witnesses = match check_not_useful(cx, pattern_ty, &pats) {
+ Ok(_) => return,
+ Err(err) => err,
};
- let pattern_string = witness[0].single_pattern().to_string();
+ let joined_patterns = joined_uncovered_patterns(&witnesses);
let mut err = struct_span_err!(
self.tcx.sess, pat.span, E0005,
- "refutable pattern in {}: `{}` not covered",
- origin, pattern_string
+ "refutable pattern in {}: {} not covered",
+ origin, joined_patterns
);
- let label_msg = match pat.node {
- PatKind::Path(hir::QPath::Resolved(None, ref path))
- if path.segments.len() == 1 && path.segments[0].args.is_none() => {
+ err.span_label(pat.span, match &pat.node {
+ PatKind::Path(hir::QPath::Resolved(None, path))
+ if path.segments.len() == 1 && path.segments[0].args.is_none() => {
format!("interpreted as {} {} pattern, not new variable",
path.res.article(), path.res.descr())
}
- _ => format!("pattern `{}` not covered", pattern_string),
- };
- err.span_label(pat.span, label_msg);
- if let ty::Adt(def, _) = pattern_ty.sty {
- if let Some(sp) = self.tcx.hir().span_if_local(def.did){
- err.span_label(sp, format!("`{}` defined here", pattern_ty));
- }
- }
+ _ => pattern_not_convered_label(&witnesses, &joined_patterns),
+ });
+ adt_defined_here(cx, &mut err, pattern_ty, &witnesses);
err.emit();
});
}
@@ -362,9 +338,9 @@
}
// Check for unreachable patterns
-fn check_arms<'a, 'tcx>(
- cx: &mut MatchCheckCtxt<'a, 'tcx>,
- arms: &[(Vec<(&'a Pattern<'tcx>, &hir::Pat)>, Option<&hir::Expr>)],
+fn check_arms<'tcx>(
+ cx: &mut MatchCheckCtxt<'_, 'tcx>,
+ arms: &[(Vec<(&Pattern<'tcx>, &hir::Pat)>, Option<&hir::Expr>)],
source: hir::MatchSource,
) {
let mut seen = Matrix::empty();
@@ -445,104 +421,124 @@
}
}
-fn check_exhaustive<'p, 'a, 'tcx>(
- cx: &mut MatchCheckCtxt<'a, 'tcx>,
- scrut_ty: Ty<'tcx>,
- sp: Span,
- matrix: &Matrix<'p, 'tcx>,
-) {
- let wild_pattern = Pattern {
- ty: scrut_ty,
- span: DUMMY_SP,
- kind: box PatternKind::Wild,
- };
+fn check_not_useful(
+ cx: &mut MatchCheckCtxt<'_, 'tcx>,
+ ty: Ty<'tcx>,
+ matrix: &Matrix<'_, 'tcx>,
+) -> Result<(), Vec<Pattern<'tcx>>> {
+ let wild_pattern = Pattern { ty, span: DUMMY_SP, kind: box PatternKind::Wild };
match is_useful(cx, matrix, &[&wild_pattern], ConstructWitness) {
- UsefulWithWitness(pats) => {
- let witnesses = if pats.is_empty() {
- vec![&wild_pattern]
- } else {
- pats.iter().map(|w| w.single_pattern()).collect()
- };
-
- const LIMIT: usize = 3;
- let joined_patterns = match witnesses.len() {
- 0 => bug!(),
- 1 => format!("`{}`", witnesses[0]),
- 2..=LIMIT => {
- let (tail, head) = witnesses.split_last().unwrap();
- let head: Vec<_> = head.iter().map(|w| w.to_string()).collect();
- format!("`{}` and `{}`", head.join("`, `"), tail)
- }
- _ => {
- let (head, tail) = witnesses.split_at(LIMIT);
- let head: Vec<_> = head.iter().map(|w| w.to_string()).collect();
- format!("`{}` and {} more", head.join("`, `"), tail.len())
- }
- };
-
- let label_text = match witnesses.len() {
- 1 => format!("pattern {} not covered", joined_patterns),
- _ => format!("patterns {} not covered", joined_patterns),
- };
- let mut err = create_e0004(cx.tcx.sess, sp, format!(
- "non-exhaustive patterns: {} not covered",
- joined_patterns,
- ));
- err.span_label(sp, label_text);
- // point at the definition of non-covered enum variants
- if let ty::Adt(def, _) = scrut_ty.sty {
- if let Some(sp) = cx.tcx.hir().span_if_local(def.did){
- err.span_label(sp, format!("`{}` defined here", scrut_ty));
- }
- }
- let patterns = witnesses.iter().map(|p| (**p).clone()).collect::<Vec<Pattern<'_>>>();
- if patterns.len() < 4 {
- for sp in maybe_point_at_variant(cx, scrut_ty, patterns.as_slice()) {
- err.span_label(sp, "not covered");
- }
- }
- err.help("ensure that all possible cases are being handled, \
- possibly by adding wildcards or more match arms");
- err.emit();
- }
- NotUseful => {
- // This is good, wildcard pattern isn't reachable
- }
- _ => bug!()
+ NotUseful => Ok(()), // This is good, wildcard pattern isn't reachable.
+ UsefulWithWitness(pats) => Err(if pats.is_empty() {
+ vec![wild_pattern]
+ } else {
+ pats.into_iter().map(|w| w.single_pattern()).collect()
+ }),
+ Useful => bug!(),
}
}
-fn maybe_point_at_variant(
- cx: &mut MatchCheckCtxt<'a, 'tcx>,
- ty: Ty<'tcx>,
- patterns: &[Pattern<'_>],
-) -> Vec<Span> {
+fn check_exhaustive<'tcx>(
+ cx: &mut MatchCheckCtxt<'_, 'tcx>,
+ scrut_ty: Ty<'tcx>,
+ sp: Span,
+ matrix: &Matrix<'_, 'tcx>,
+) {
+ let witnesses = match check_not_useful(cx, scrut_ty, matrix) {
+ Ok(_) => return,
+ Err(err) => err,
+ };
+
+ let joined_patterns = joined_uncovered_patterns(&witnesses);
+ let mut err = create_e0004(
+ cx.tcx.sess, sp,
+ format!("non-exhaustive patterns: {} not covered", joined_patterns),
+ );
+ err.span_label(sp, pattern_not_convered_label(&witnesses, &joined_patterns));
+ adt_defined_here(cx, &mut err, scrut_ty, &witnesses);
+ err.help(
+ "ensure that all possible cases are being handled, \
+ possibly by adding wildcards or more match arms"
+ )
+ .emit();
+}
+
+fn joined_uncovered_patterns(witnesses: &[Pattern<'_>]) -> String {
+ const LIMIT: usize = 3;
+ match witnesses {
+ [] => bug!(),
+ [witness] => format!("`{}`", witness),
+ [head @ .., tail] if head.len() < LIMIT => {
+ let head: Vec<_> = head.iter().map(<_>::to_string).collect();
+ format!("`{}` and `{}`", head.join("`, `"), tail)
+ }
+ _ => {
+ let (head, tail) = witnesses.split_at(LIMIT);
+ let head: Vec<_> = head.iter().map(<_>::to_string).collect();
+ format!("`{}` and {} more", head.join("`, `"), tail.len())
+ }
+ }
+}
+
+fn pattern_not_convered_label(witnesses: &[Pattern<'_>], joined_patterns: &str) -> String {
+ format!("pattern{} {} not covered", rustc_errors::pluralise!(witnesses.len()), joined_patterns)
+}
+
+/// Point at the definition of non-covered `enum` variants.
+fn adt_defined_here(
+ cx: &MatchCheckCtxt<'_, '_>,
+ err: &mut DiagnosticBuilder<'_>,
+ ty: Ty<'_>,
+ witnesses: &[Pattern<'_>],
+) {
+ let ty = ty.peel_refs();
+ if let ty::Adt(def, _) = ty.sty {
+ if let Some(sp) = cx.tcx.hir().span_if_local(def.did) {
+ err.span_label(sp, format!("`{}` defined here", ty));
+ }
+
+ if witnesses.len() < 4 {
+ for sp in maybe_point_at_variant(ty, &witnesses) {
+ err.span_label(sp, "not covered");
+ }
+ }
+ }
+}
+
+fn maybe_point_at_variant(ty: Ty<'_>, patterns: &[Pattern<'_>]) -> Vec<Span> {
let mut covered = vec![];
if let ty::Adt(def, _) = ty.sty {
// Don't point at variants that have already been covered due to other patterns to avoid
- // visual clutter
+ // visual clutter.
for pattern in patterns {
- let pk: &PatternKind<'_> = &pattern.kind;
- if let PatternKind::Variant { adt_def, variant_index, subpatterns, .. } = pk {
- if adt_def.did == def.did {
+ use PatternKind::{AscribeUserType, Deref, Variant, Or, Leaf};
+ match &*pattern.kind {
+ AscribeUserType { subpattern, .. } | Deref { subpattern } => {
+ covered.extend(maybe_point_at_variant(ty, slice::from_ref(&subpattern)));
+ }
+ Variant { adt_def, variant_index, subpatterns, .. } if adt_def.did == def.did => {
let sp = def.variants[*variant_index].ident.span;
if covered.contains(&sp) {
continue;
}
covered.push(sp);
- let subpatterns = subpatterns.iter()
+
+ let pats = subpatterns.iter()
.map(|field_pattern| field_pattern.pattern.clone())
- .collect::<Vec<_>>();
- covered.extend(
- maybe_point_at_variant(cx, ty, subpatterns.as_slice()),
- );
+ .collect::<Box<[_]>>();
+ covered.extend(maybe_point_at_variant(ty, &pats));
}
- }
- if let PatternKind::Leaf { subpatterns } = pk {
- let subpatterns = subpatterns.iter()
- .map(|field_pattern| field_pattern.pattern.clone())
- .collect::<Vec<_>>();
- covered.extend(maybe_point_at_variant(cx, ty, subpatterns.as_slice()));
+ Leaf { subpatterns } => {
+ let pats = subpatterns.iter()
+ .map(|field_pattern| field_pattern.pattern.clone())
+ .collect::<Box<[_]>>();
+ covered.extend(maybe_point_at_variant(ty, &pats));
+ }
+ Or { pats } => {
+ let pats = pats.iter().cloned().collect::<Box<[_]>>();
+ covered.extend(maybe_point_at_variant(ty, &pats));
+ }
+ _ => {}
}
}
}
@@ -582,19 +578,10 @@
"cannot bind by-move with sub-bindings")
.span_label(p.span, "binds an already bound by-move value by moving it")
.emit();
- } else if has_guard {
- if !cx.tcx.features().bind_by_move_pattern_guards {
- let mut err = struct_span_err!(cx.tcx.sess, p.span, E0008,
- "cannot bind by-move into a pattern guard");
- err.span_label(p.span, "moves value into pattern guard");
- if cx.tcx.sess.opts.unstable_features.is_nightly_build() {
- err.help("add `#![feature(bind_by_move_pattern_guards)]` to the \
- crate attributes to enable");
- }
- err.emit();
+ } else if !has_guard {
+ if let Some(_by_ref_span) = by_ref_span {
+ span_vec.push(p.span);
}
- } else if let Some(_by_ref_span) = by_ref_span {
- span_vec.push(p.span);
}
};
@@ -636,67 +623,6 @@
}
}
-/// Ensures that a pattern guard doesn't borrow by mutable reference or assign.
-//
-// FIXME: this should be done by borrowck.
-fn check_for_mutation_in_guard(cx: &MatchVisitor<'_, '_>, guard: &hir::Guard) {
- let mut checker = MutationChecker {
- cx,
- };
- match guard {
- hir::Guard::If(expr) =>
- ExprUseVisitor::new(&mut checker,
- cx.tcx,
- cx.body_owner,
- cx.param_env,
- cx.region_scope_tree,
- cx.tables,
- None).walk_expr(expr),
- };
-}
-
-struct MutationChecker<'a, 'tcx> {
- cx: &'a MatchVisitor<'a, 'tcx>,
-}
-
-impl<'a, 'tcx> Delegate<'tcx> for MutationChecker<'a, 'tcx> {
- fn matched_pat(&mut self, _: &Pat, _: &cmt_<'_>, _: euv::MatchMode) {}
- fn consume(&mut self, _: hir::HirId, _: Span, _: &cmt_<'_>, _: ConsumeMode) {}
- fn consume_pat(&mut self, _: &Pat, _: &cmt_<'_>, _: ConsumeMode) {}
- fn borrow(&mut self,
- _: hir::HirId,
- span: Span,
- _: &cmt_<'_>,
- _: ty::Region<'tcx>,
- kind:ty:: BorrowKind,
- _: LoanCause) {
- match kind {
- ty::MutBorrow => {
- let mut err = struct_span_err!(self.cx.tcx.sess, span, E0301,
- "cannot mutably borrow in a pattern guard");
- err.span_label(span, "borrowed mutably in pattern guard");
- if self.cx.tcx.sess.opts.unstable_features.is_nightly_build() {
- err.help("add `#![feature(bind_by_move_pattern_guards)]` to the \
- crate attributes to enable");
- }
- err.emit();
- }
- ty::ImmBorrow | ty::UniqueImmBorrow => {}
- }
- }
- fn decl_without_init(&mut self, _: hir::HirId, _: Span) {}
- fn mutate(&mut self, _: hir::HirId, span: Span, _: &cmt_<'_>, mode: MutateMode) {
- match mode {
- MutateMode::JustWrite | MutateMode::WriteAndRead => {
- struct_span_err!(self.cx.tcx.sess, span, E0302, "cannot assign in a pattern guard")
- .span_label(span, "assignment in pattern guard")
- .emit();
- }
- MutateMode::Init => {}
- }
- }
-}
-
/// Forbids bindings in `@` patterns. This is necessary for memory safety,
/// because of the way rvalues are handled in the borrow check. (See issue
/// #14587.)
@@ -709,7 +635,7 @@
bindings_allowed: bool
}
-impl<'a, 'b, 'tcx, 'v> Visitor<'v> for AtBindingPatternVisitor<'a, 'b, 'tcx> {
+impl<'v> Visitor<'v> for AtBindingPatternVisitor<'_, '_, '_> {
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'v> {
NestedVisitorMap::None
}
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index cccf7b9..f27db35 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -14,7 +14,6 @@
#![feature(const_fn)]
#![feature(decl_macro)]
#![feature(exhaustive_patterns)]
-#![feature(rustc_diagnostic_macros)]
#![feature(never_type)]
#![feature(specialization)]
#![feature(try_trait)]
@@ -32,7 +31,7 @@
#[macro_use] extern crate rustc_data_structures;
#[macro_use] extern crate syntax;
-mod error_codes;
+pub mod error_codes;
mod borrow_check;
mod build;
@@ -62,5 +61,3 @@
};
providers.type_name = interpret::type_name;
}
-
-__build_diagnostic_array! { librustc_mir, DIAGNOSTICS }
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index a77421c..32b49ee 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -25,11 +25,13 @@
use syntax::symbol::sym;
use syntax_pos::{Span, DUMMY_SP};
+use std::borrow::Cow;
use std::cell::Cell;
use std::fmt;
use std::ops::{Deref, Index, IndexMut};
use std::usize;
+use rustc::hir::HirId;
use crate::transform::{MirPass, MirSource};
use super::promote_consts::{self, Candidate, TempState};
@@ -1596,51 +1598,24 @@
}
let def_id = src.def_id();
- let id = tcx.hir().as_local_hir_id(def_id).unwrap();
- let mut const_promoted_temps = None;
- let mode = match tcx.hir().body_owner_kind(id) {
- hir::BodyOwnerKind::Closure => Mode::NonConstFn,
- hir::BodyOwnerKind::Fn => {
- if tcx.is_const_fn(def_id) {
- Mode::ConstFn
- } else {
- Mode::NonConstFn
- }
- }
- hir::BodyOwnerKind::Const => {
- const_promoted_temps = Some(tcx.mir_const_qualif(def_id).1);
- Mode::Const
- }
- hir::BodyOwnerKind::Static(hir::MutImmutable) => Mode::Static,
- hir::BodyOwnerKind::Static(hir::MutMutable) => Mode::StaticMut,
- };
+ let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
+
+ let mode = determine_mode(tcx, hir_id, def_id);
debug!("run_pass: mode={:?}", mode);
- if mode == Mode::NonConstFn || mode == Mode::ConstFn {
+ if let Mode::NonConstFn | Mode::ConstFn = mode {
// This is ugly because Checker holds onto mir,
// which can't be mutated until its scope ends.
let (temps, candidates) = {
let mut checker = Checker::new(tcx, def_id, body, mode);
- if mode == Mode::ConstFn {
+ if let Mode::ConstFn = mode {
if tcx.sess.opts.debugging_opts.unleash_the_miri_inside_of_you {
checker.check_const();
} else if tcx.is_min_const_fn(def_id) {
- // enforce `min_const_fn` for stable const fns
+ // Enforce `min_const_fn` for stable `const fn`s.
use super::qualify_min_const_fn::is_min_const_fn;
if let Err((span, err)) = is_min_const_fn(tcx, def_id, body) {
- let mut diag = struct_span_err!(
- tcx.sess,
- span,
- E0723,
- "{}",
- err,
- );
- diag.note("for more information, see issue \
- https://github.com/rust-lang/rust/issues/57563");
- diag.help(
- "add `#![feature(const_fn)]` to the crate attributes to enable",
- );
- diag.emit();
+ error_min_const_fn_violation(tcx, span, err);
} else {
// this should not produce any errors, but better safe than sorry
// FIXME(#53819)
@@ -1664,107 +1639,119 @@
promote_consts::promote_candidates(def_id, body, tcx, temps, candidates)
);
} else {
- if !body.control_flow_destroyed.is_empty() {
- let mut locals = body.vars_iter();
- if let Some(local) = locals.next() {
- let span = body.local_decls[local].source_info.span;
- let mut error = tcx.sess.struct_span_err(
- span,
- &format!(
- "new features like let bindings are not permitted in {}s \
- which also use short circuiting operators",
- mode,
- ),
- );
- for (span, kind) in body.control_flow_destroyed.iter() {
- error.span_note(
- *span,
- &format!("use of {} here does not actually short circuit due to \
- the const evaluator presently not being able to do control flow. \
- See https://github.com/rust-lang/rust/issues/49146 for more \
- information.", kind),
- );
- }
- for local in locals {
- let span = body.local_decls[local].source_info.span;
- error.span_note(
- span,
- "more locals defined here",
- );
- }
- error.emit();
- }
- }
- let promoted_temps = if mode == Mode::Const {
- // Already computed by `mir_const_qualif`.
- const_promoted_temps.unwrap()
- } else {
- Checker::new(tcx, def_id, body, mode).check_const().1
- };
+ check_short_circuiting_in_const_local(tcx, body, mode);
- // In `const` and `static` everything without `StorageDead`
- // is `'static`, we don't have to create promoted MIR fragments,
- // just remove `Drop` and `StorageDead` on "promoted" locals.
- debug!("run_pass: promoted_temps={:?}", promoted_temps);
- for block in body.basic_blocks_mut() {
- block.statements.retain(|statement| {
- match statement.kind {
- StatementKind::StorageDead(index) => {
- !promoted_temps.contains(index)
- }
- _ => true
- }
- });
- let terminator = block.terminator_mut();
- match terminator.kind {
- TerminatorKind::Drop {
- location: Place {
- base: PlaceBase::Local(index),
- projection: None,
- },
- target,
- ..
- } => {
- if promoted_temps.contains(index) {
- terminator.kind = TerminatorKind::Goto {
- target,
- };
- }
- }
- _ => {}
- }
- }
+ let promoted_temps = match mode {
+ Mode::Const => tcx.mir_const_qualif(def_id).1,
+ _ => Checker::new(tcx, def_id, body, mode).check_const().1,
+ };
+ remove_drop_and_storage_dead_on_promoted_locals(body, promoted_temps);
}
- // Statics must be Sync.
- if mode == Mode::Static {
- // `#[thread_local]` statics don't have to be `Sync`.
- for attr in &tcx.get_attrs(def_id)[..] {
- if attr.check_name(sym::thread_local) {
- return;
- }
- }
- let ty = body.return_ty();
- tcx.infer_ctxt().enter(|infcx| {
- let param_env = ty::ParamEnv::empty();
- let cause = traits::ObligationCause::new(body.span, id, traits::SharedStatic);
- let mut fulfillment_cx = traits::FulfillmentContext::new();
- fulfillment_cx.register_bound(&infcx,
- param_env,
- ty,
- tcx.require_lang_item(
- lang_items::SyncTraitLangItem,
- Some(body.span)
- ),
- cause);
- if let Err(err) = fulfillment_cx.select_all_or_error(&infcx) {
- infcx.report_fulfillment_errors(&err, None, false);
- }
- });
+ if mode == Mode::Static && !tcx.has_attr(def_id, sym::thread_local) {
+ // `static`s (not `static mut`s) which are not `#[thread_local]` must be `Sync`.
+ check_static_is_sync(tcx, body, hir_id);
}
}
}
+fn determine_mode(tcx: TyCtxt<'_>, hir_id: HirId, def_id: DefId) -> Mode {
+ match tcx.hir().body_owner_kind(hir_id) {
+ hir::BodyOwnerKind::Closure => Mode::NonConstFn,
+ hir::BodyOwnerKind::Fn if tcx.is_const_fn(def_id) => Mode::ConstFn,
+ hir::BodyOwnerKind::Fn => Mode::NonConstFn,
+ hir::BodyOwnerKind::Const => Mode::Const,
+ hir::BodyOwnerKind::Static(hir::MutImmutable) => Mode::Static,
+ hir::BodyOwnerKind::Static(hir::MutMutable) => Mode::StaticMut,
+ }
+}
+
+fn error_min_const_fn_violation(tcx: TyCtxt<'_>, span: Span, msg: Cow<'_, str>) {
+ struct_span_err!(tcx.sess, span, E0723, "{}", msg)
+ .note("for more information, see issue https://github.com/rust-lang/rust/issues/57563")
+ .help("add `#![feature(const_fn)]` to the crate attributes to enable")
+ .emit();
+}
+
+fn check_short_circuiting_in_const_local(tcx: TyCtxt<'_>, body: &mut Body<'tcx>, mode: Mode) {
+ if body.control_flow_destroyed.is_empty() {
+ return;
+ }
+
+ let mut locals = body.vars_iter();
+ if let Some(local) = locals.next() {
+ let span = body.local_decls[local].source_info.span;
+ let mut error = tcx.sess.struct_span_err(
+ span,
+ &format!(
+ "new features like let bindings are not permitted in {}s \
+ which also use short circuiting operators",
+ mode,
+ ),
+ );
+ for (span, kind) in body.control_flow_destroyed.iter() {
+ error.span_note(
+ *span,
+ &format!("use of {} here does not actually short circuit due to \
+ the const evaluator presently not being able to do control flow. \
+ See https://github.com/rust-lang/rust/issues/49146 for more \
+ information.", kind),
+ );
+ }
+ for local in locals {
+ let span = body.local_decls[local].source_info.span;
+ error.span_note(span, "more locals defined here");
+ }
+ error.emit();
+ }
+}
+
+/// In `const` and `static` everything without `StorageDead`
+/// is `'static`, we don't have to create promoted MIR fragments,
+/// just remove `Drop` and `StorageDead` on "promoted" locals.
+fn remove_drop_and_storage_dead_on_promoted_locals(
+ body: &mut Body<'tcx>,
+ promoted_temps: &BitSet<Local>,
+) {
+ debug!("run_pass: promoted_temps={:?}", promoted_temps);
+
+ for block in body.basic_blocks_mut() {
+ block.statements.retain(|statement| {
+ match statement.kind {
+ StatementKind::StorageDead(index) => !promoted_temps.contains(index),
+ _ => true
+ }
+ });
+ let terminator = block.terminator_mut();
+ match terminator.kind {
+ TerminatorKind::Drop {
+ location: Place {
+ base: PlaceBase::Local(index),
+ projection: None,
+ },
+ target,
+ ..
+ } if promoted_temps.contains(index) => {
+ terminator.kind = TerminatorKind::Goto { target };
+ }
+ _ => {}
+ }
+ }
+}
+
+fn check_static_is_sync(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>, hir_id: HirId) {
+ let ty = body.return_ty();
+ tcx.infer_ctxt().enter(|infcx| {
+ let cause = traits::ObligationCause::new(body.span, hir_id, traits::SharedStatic);
+ let mut fulfillment_cx = traits::FulfillmentContext::new();
+ let sync_def_id = tcx.require_lang_item(lang_items::SyncTraitLangItem, Some(body.span));
+ fulfillment_cx.register_bound(&infcx, ty::ParamEnv::empty(), ty, sync_def_id, cause);
+ if let Err(err) = fulfillment_cx.select_all_or_error(&infcx) {
+ infcx.report_fulfillment_errors(&err, None, false);
+ }
+ });
+}
+
fn args_required_const(tcx: TyCtxt<'_>, def_id: DefId) -> Option<FxHashSet<usize>> {
let attrs = tcx.get_attrs(def_id);
let attr = attrs.iter().find(|a| a.check_name(sym::rustc_args_required_const))?;
diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index ac27019..c35c9e4 100644
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -227,12 +227,12 @@
pass_name: &str,
disambiguator: &dyn Display,
source: MirSource<'tcx>,
-) -> io::Result<fs::File> {
+) -> io::Result<io::BufWriter<fs::File>> {
let file_path = dump_path(tcx, extension, pass_num, pass_name, disambiguator, source);
if let Some(parent) = file_path.parent() {
fs::create_dir_all(parent)?;
}
- fs::File::create(&file_path)
+ Ok(io::BufWriter::new(fs::File::create(&file_path)?))
}
/// Write out a human-readable textual representation for the given MIR.
diff --git a/src/librustc_passes/error_codes.rs b/src/librustc_passes/error_codes.rs
index a30cd8a..af07c79 100644
--- a/src/librustc_passes/error_codes.rs
+++ b/src/librustc_passes/error_codes.rs
@@ -1,6 +1,4 @@
-use syntax::{register_diagnostics, register_long_diagnostics};
-
-register_long_diagnostics! {
+syntax::register_diagnostics! {
/*
E0014: r##"
Constants can only be initialized by a constant value or, in a future
@@ -320,10 +318,8 @@
```
Switch to the Rust 2018 edition to use `async fn`.
-"##
-}
-
-register_diagnostics! {
+"##,
+;
E0226, // only a single explicit lifetime bound is permitted
E0472, // asm! is unsupported on this target
E0561, // patterns aren't allowed in function pointer types
diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs
index 5614b57..a5a8315 100644
--- a/src/librustc_passes/lib.rs
+++ b/src/librustc_passes/lib.rs
@@ -8,8 +8,7 @@
#![feature(in_band_lifetimes)]
#![feature(nll)]
-#![feature(bind_by_move_pattern_guards)]
-#![feature(rustc_diagnostic_macros)]
+#![cfg_attr(bootstrap, feature(bind_by_move_pattern_guards))]
#![recursion_limit="256"]
@@ -18,7 +17,7 @@
use rustc::ty::query::Providers;
-mod error_codes;
+pub mod error_codes;
pub mod ast_validation;
pub mod rvalue_promotion;
@@ -26,8 +25,6 @@
pub mod layout_test;
pub mod loops;
-__build_diagnostic_array! { librustc_passes, DIAGNOSTICS }
-
pub fn provide(providers: &mut Providers<'_>) {
rvalue_promotion::provide(providers);
loops::provide(providers);
diff --git a/src/librustc_plugin/error_codes.rs b/src/librustc_plugin/error_codes.rs
index b5f6a8d..7b3f01c 100644
--- a/src/librustc_plugin/error_codes.rs
+++ b/src/librustc_plugin/error_codes.rs
@@ -1,9 +1,4 @@
-use syntax::{register_diagnostics, register_long_diagnostics};
-
-register_long_diagnostics! {
-
-}
-
-register_diagnostics! {
- E0498 // malformed plugin attribute
+syntax::register_diagnostics! {
+;
+ E0498, // malformed plugin attribute
}
diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs
index 952bc9f..4e1a47c 100644
--- a/src/librustc_plugin/lib.rs
+++ b/src/librustc_plugin/lib.rs
@@ -54,15 +54,12 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![recursion_limit="256"]
pub use registry::Registry;
-mod error_codes;
+pub mod error_codes;
pub mod registry;
pub mod load;
pub mod build;
-
-__build_diagnostic_array! { librustc_plugin, DIAGNOSTICS }
diff --git a/src/librustc_privacy/error_codes.rs b/src/librustc_privacy/error_codes.rs
index 70a799d..6706646 100644
--- a/src/librustc_privacy/error_codes.rs
+++ b/src/librustc_privacy/error_codes.rs
@@ -1,4 +1,4 @@
-register_long_diagnostics! {
+syntax::register_diagnostics! {
E0445: r##"
A private trait was used on a public type parameter bound. Erroneous code
@@ -154,8 +154,5 @@
```
"##,
-}
-
-register_diagnostics! {
// E0450, moved into resolve
}
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 1460589..1e61f78 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -2,7 +2,6 @@
#![feature(in_band_lifetimes)]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![recursion_limit="256"]
@@ -31,7 +30,7 @@
use std::{cmp, fmt, mem};
use std::marker::PhantomData;
-mod error_codes;
+pub mod error_codes;
////////////////////////////////////////////////////////////////////////////////
/// Generic infrastructure used to implement specific visitors below.
@@ -2035,5 +2034,3 @@
};
krate.visit_all_item_likes(&mut DeepVisitor::new(&mut visitor));
}
-
-__build_diagnostic_array! { librustc_privacy, DIAGNOSTICS }
diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs
index 165a4c7..11dcf5b 100644
--- a/src/librustc_resolve/build_reduced_graph.rs
+++ b/src/librustc_resolve/build_reduced_graph.rs
@@ -31,7 +31,7 @@
use syntax::attr;
use syntax::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
-use syntax::ast::{MetaItemKind, StmtKind, TraitItem, TraitItemKind, Variant};
+use syntax::ast::{MetaItemKind, StmtKind, TraitItem, TraitItemKind};
use syntax::ext::base::{MacroKind, SyntaxExtension};
use syntax::ext::expand::AstFragment;
use syntax::ext::hygiene::ExpnId;
@@ -126,7 +126,8 @@
crate fn macro_def_scope(&mut self, expn_id: ExpnId) -> Module<'a> {
let def_id = match self.macro_defs.get(&expn_id) {
Some(def_id) => *def_id,
- None => return self.graph_root,
+ None => return self.ast_transform_scopes.get(&expn_id)
+ .unwrap_or(&self.graph_root),
};
if let Some(id) = self.definitions.as_local_node_id(def_id) {
self.local_macro_def_scopes[&id]
@@ -579,7 +580,7 @@
}
/// Constructs the reduced graph for one item.
- fn build_reduced_graph_for_item(&mut self, item: &Item) {
+ fn build_reduced_graph_for_item(&mut self, item: &'b Item) {
let parent_scope = &self.parent_scope;
let parent = parent_scope.module;
let expansion = parent_scope.expansion;
@@ -715,22 +716,17 @@
self.r.define(parent, ident, TypeNS, (res, vis, sp, expansion));
}
- ItemKind::Enum(ref enum_definition, _) => {
- let module_kind = ModuleKind::Def(
- DefKind::Enum,
- self.r.definitions.local_def_id(item.id),
- ident.name,
- );
+ ItemKind::Enum(_, _) => {
+ let def_id = self.r.definitions.local_def_id(item.id);
+ self.r.variant_vis.insert(def_id, vis);
+ let module_kind = ModuleKind::Def(DefKind::Enum, def_id, ident.name);
let module = self.r.new_module(parent,
module_kind,
parent.normal_ancestor_id,
expansion,
item.span);
self.r.define(parent, ident, TypeNS, (module, vis, sp, expansion));
-
- for variant in &(*enum_definition).variants {
- self.build_reduced_graph_for_variant(variant, module, vis);
- }
+ self.parent_scope.module = module;
}
ItemKind::TraitAlias(..) => {
@@ -815,40 +811,6 @@
}
}
- // Constructs the reduced graph for one variant. Variants exist in the
- // type and value namespaces.
- fn build_reduced_graph_for_variant(&mut self,
- variant: &Variant,
- parent: Module<'a>,
- vis: ty::Visibility) {
- let expn_id = self.parent_scope.expansion;
- let ident = variant.ident;
-
- // Define a name in the type namespace.
- let def_id = self.r.definitions.local_def_id(variant.id);
- let res = Res::Def(DefKind::Variant, def_id);
- self.r.define(parent, ident, TypeNS, (res, vis, variant.span, expn_id));
-
- // If the variant is marked as non_exhaustive then lower the visibility to within the
- // crate.
- let mut ctor_vis = vis;
- let has_non_exhaustive = attr::contains_name(&variant.attrs, sym::non_exhaustive);
- if has_non_exhaustive && vis == ty::Visibility::Public {
- ctor_vis = ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX));
- }
-
- // Define a constructor name in the value namespace.
- // Braced variants, unlike structs, generate unusable names in
- // value namespace, they are reserved for possible future use.
- // It's ok to use the variant's id as a ctor id since an
- // error will be reported on any use of such resolution anyway.
- let ctor_node_id = variant.data.ctor_id().unwrap_or(variant.id);
- let ctor_def_id = self.r.definitions.local_def_id(ctor_node_id);
- let ctor_kind = CtorKind::from_ast(&variant.data);
- let ctor_res = Res::Def(DefKind::Ctor(CtorOf::Variant, ctor_kind), ctor_def_id);
- self.r.define(parent, ident, ValueNS, (ctor_res, ctor_vis, variant.span, expn_id));
- }
-
/// Constructs the reduced graph for one foreign item.
fn build_reduced_graph_for_foreign_item(&mut self, item: &ForeignItem) {
let (res, ns) = match item.node {
@@ -1188,7 +1150,6 @@
ItemKind::Mod(..) => self.contains_macro_use(&item.attrs),
_ => false,
};
-
let orig_current_module = self.parent_scope.module;
let orig_current_legacy_scope = self.parent_scope.legacy;
self.build_reduced_graph_for_item(item);
@@ -1252,9 +1213,7 @@
let expansion = self.parent_scope.expansion;
self.r.define(parent, item.ident, ns, (res, vis, item.span, expansion));
- self.parent_scope.module = parent.parent.unwrap(); // nearest normal ancestor
visit::walk_trait_item(self, item);
- self.parent_scope.module = parent;
}
fn visit_token(&mut self, t: Token) {
@@ -1273,4 +1232,92 @@
}
visit::walk_attribute(self, attr);
}
+
+ fn visit_arm(&mut self, arm: &'b ast::Arm) {
+ if arm.is_placeholder {
+ self.visit_invoc(arm.id);
+ } else {
+ visit::walk_arm(self, arm);
+ }
+ }
+
+ fn visit_field(&mut self, f: &'b ast::Field) {
+ if f.is_placeholder {
+ self.visit_invoc(f.id);
+ } else {
+ visit::walk_field(self, f);
+ }
+ }
+
+ fn visit_field_pattern(&mut self, fp: &'b ast::FieldPat) {
+ if fp.is_placeholder {
+ self.visit_invoc(fp.id);
+ } else {
+ visit::walk_field_pattern(self, fp);
+ }
+ }
+
+ fn visit_generic_param(&mut self, param: &'b ast::GenericParam) {
+ if param.is_placeholder {
+ self.visit_invoc(param.id);
+ } else {
+ visit::walk_generic_param(self, param);
+ }
+ }
+
+ fn visit_param(&mut self, p: &'b ast::Param) {
+ if p.is_placeholder {
+ self.visit_invoc(p.id);
+ } else {
+ visit::walk_param(self, p);
+ }
+ }
+
+ fn visit_struct_field(&mut self, sf: &'b ast::StructField) {
+ if sf.is_placeholder {
+ self.visit_invoc(sf.id);
+ } else {
+ visit::walk_struct_field(self, sf);
+ }
+ }
+
+ // Constructs the reduced graph for one variant. Variants exist in the
+ // type and value namespaces.
+ fn visit_variant(&mut self, variant: &'b ast::Variant) {
+ if variant.is_placeholder {
+ self.visit_invoc(variant.id);
+ return;
+ }
+
+ let parent = self.parent_scope.module;
+ let vis = self.r.variant_vis[&parent.def_id().expect("enum without def-id")];
+ let expn_id = self.parent_scope.expansion;
+ let ident = variant.ident;
+
+ // Define a name in the type namespace.
+ let def_id = self.r.definitions.local_def_id(variant.id);
+ let res = Res::Def(DefKind::Variant, def_id);
+ self.r.define(parent, ident, TypeNS, (res, vis, variant.span, expn_id));
+
+ // If the variant is marked as non_exhaustive then lower the visibility to within the
+ // crate.
+ let mut ctor_vis = vis;
+ let has_non_exhaustive = attr::contains_name(&variant.attrs, sym::non_exhaustive);
+ if has_non_exhaustive && vis == ty::Visibility::Public {
+ ctor_vis = ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX));
+ }
+
+ // Define a constructor name in the value namespace.
+ // Braced variants, unlike structs, generate unusable names in
+ // value namespace, they are reserved for possible future use.
+ // It's ok to use the variant's id as a ctor id since an
+ // error will be reported on any use of such resolution anyway.
+ let ctor_node_id = variant.data.ctor_id().unwrap_or(variant.id);
+ let ctor_def_id = self.r.definitions.local_def_id(ctor_node_id);
+ let ctor_kind = CtorKind::from_ast(&variant.data);
+ let ctor_res = Res::Def(DefKind::Ctor(CtorOf::Variant, ctor_kind), ctor_def_id);
+ self.r.define(parent, ident, ValueNS, (ctor_res, ctor_vis, variant.span, expn_id));
+
+ visit::walk_variant(self, variant);
+ }
}
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index b79e0c2..c479912 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -604,6 +604,14 @@
if lookup_ident.span.rust_2018() {
let extern_prelude_names = self.extern_prelude.clone();
for (ident, _) in extern_prelude_names.into_iter() {
+ if ident.span.from_expansion() {
+ // Idents are adjusted to the root context before being
+ // resolved in the extern prelude, so reporting this to the
+ // user is no help. This skips the injected
+ // `extern crate std` in the 2018 edition, which would
+ // otherwise cause duplicate suggestions.
+ continue;
+ }
if let Some(crate_id) = self.crate_loader.maybe_process_path_extern(ident.name,
ident.span) {
let crate_root = self.get_module(DefId {
diff --git a/src/librustc_resolve/error_codes.rs b/src/librustc_resolve/error_codes.rs
index 1faaf97..adbff67 100644
--- a/src/librustc_resolve/error_codes.rs
+++ b/src/librustc_resolve/error_codes.rs
@@ -1,9 +1,7 @@
-use syntax::{register_diagnostics, register_long_diagnostics};
-
// Error messages for EXXXX errors. Each message should start and end with a
// new line, and be wrapped to 80 characters. In vim you can `:set tw=80` and
// use `gq` to wrap paragraphs. Use `:set tw=0` to disable.
-register_long_diagnostics! {
+syntax::register_diagnostics! {
E0128: r##"
Type parameter defaults can only use parameters that occur before them.
@@ -1662,10 +1660,7 @@
}
```
"##,
-
-}
-
-register_diagnostics! {
+;
// E0153, unused error code
// E0157, unused error code
// E0257,
diff --git a/src/librustc_resolve/late.rs b/src/librustc_resolve/late.rs
index 3ddaf2d..aae283b 100644
--- a/src/librustc_resolve/late.rs
+++ b/src/librustc_resolve/late.rs
@@ -298,18 +298,18 @@
}
fn error_code(self, has_unexpected_resolution: bool) -> &'static str {
- __diagnostic_used!(E0404);
- __diagnostic_used!(E0405);
- __diagnostic_used!(E0412);
- __diagnostic_used!(E0422);
- __diagnostic_used!(E0423);
- __diagnostic_used!(E0425);
- __diagnostic_used!(E0531);
- __diagnostic_used!(E0532);
- __diagnostic_used!(E0573);
- __diagnostic_used!(E0574);
- __diagnostic_used!(E0575);
- __diagnostic_used!(E0576);
+ syntax::diagnostic_used!(E0404);
+ syntax::diagnostic_used!(E0405);
+ syntax::diagnostic_used!(E0412);
+ syntax::diagnostic_used!(E0422);
+ syntax::diagnostic_used!(E0423);
+ syntax::diagnostic_used!(E0425);
+ syntax::diagnostic_used!(E0531);
+ syntax::diagnostic_used!(E0532);
+ syntax::diagnostic_used!(E0573);
+ syntax::diagnostic_used!(E0574);
+ syntax::diagnostic_used!(E0575);
+ syntax::diagnostic_used!(E0576);
match (self, has_unexpected_resolution) {
(PathSource::Trait(_), true) => "E0404",
(PathSource::Trait(_), false) => "E0405",
diff --git a/src/librustc_resolve/late/diagnostics.rs b/src/librustc_resolve/late/diagnostics.rs
index a822fa0..0c86d84 100644
--- a/src/librustc_resolve/late/diagnostics.rs
+++ b/src/librustc_resolve/late/diagnostics.rs
@@ -113,7 +113,7 @@
// Emit special messages for unresolved `Self` and `self`.
if is_self_type(path, ns) {
- __diagnostic_used!(E0411);
+ syntax::diagnostic_used!(E0411);
err.code(DiagnosticId::Error("E0411".into()));
err.span_label(span, format!("`Self` is only available in impls, traits, \
and type definitions"));
@@ -122,7 +122,7 @@
if is_self_value(path, ns) {
debug!("smart_resolve_path_fragment: E0424, source={:?}", source);
- __diagnostic_used!(E0424);
+ syntax::diagnostic_used!(E0424);
err.code(DiagnosticId::Error("E0424".into()));
err.span_label(span, match source {
PathSource::Pat => {
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 9b92bb7..f97fcb0 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -14,7 +14,6 @@
#![feature(label_break_value)]
#![feature(mem_take)]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![recursion_limit="256"]
@@ -68,9 +67,7 @@
type Res = def::Res<NodeId>;
-// N.B., this module needs to be declared first so diagnostics are
-// registered before they are used.
-mod error_codes;
+pub mod error_codes;
mod diagnostics;
mod late;
mod macros;
@@ -538,7 +535,11 @@
}
fn nearest_item_scope(&'a self) -> Module<'a> {
- if self.is_trait() { self.parent.unwrap() } else { self }
+ match self.kind {
+ ModuleKind::Def(DefKind::Enum, ..) | ModuleKind::Def(DefKind::Trait, ..) =>
+ self.parent.expect("enum or trait module without a parent"),
+ _ => self,
+ }
}
fn is_ancestor_of(&self, mut other: &Self) -> bool {
@@ -880,6 +881,10 @@
/// There will be an anonymous module created around `g` with the ID of the
/// entry block for `f`.
block_map: NodeMap<Module<'a>>,
+ /// A fake module that contains no definition and no prelude. Used so that
+ /// some AST passes can generate identifiers that only resolve to local or
+ /// language items.
+ empty_module: Module<'a>,
module_map: FxHashMap<DefId, Module<'a>>,
extern_module_map: FxHashMap<(DefId, bool /* MacrosOnly? */), Module<'a>>,
binding_parent_modules: FxHashMap<PtrKey<'a, NameBinding<'a>>, Module<'a>>,
@@ -914,6 +919,7 @@
non_macro_attrs: [Lrc<SyntaxExtension>; 2],
macro_defs: FxHashMap<ExpnId, DefId>,
local_macro_def_scopes: FxHashMap<NodeId, Module<'a>>,
+ ast_transform_scopes: FxHashMap<ExpnId, Module<'a>>,
unused_macros: NodeMap<Span>,
proc_macro_stubs: NodeSet,
/// Traces collected during macro resolution and validated when it's complete.
@@ -946,6 +952,10 @@
/// Features enabled for this crate.
active_features: FxHashSet<Symbol>,
+
+ /// Stores enum visibilities to properly build a reduced graph
+ /// when visiting the correspondent variants.
+ variant_vis: DefIdMap<ty::Visibility>,
}
/// Nothing really interesting here; it just provides memory for the rest of the crate.
@@ -1081,6 +1091,21 @@
no_implicit_prelude: attr::contains_name(&krate.attrs, sym::no_implicit_prelude),
..ModuleData::new(None, root_module_kind, root_def_id, ExpnId::root(), krate.span)
});
+ let empty_module_kind = ModuleKind::Def(
+ DefKind::Mod,
+ root_def_id,
+ kw::Invalid,
+ );
+ let empty_module = arenas.alloc_module(ModuleData {
+ no_implicit_prelude: true,
+ ..ModuleData::new(
+ Some(graph_root),
+ empty_module_kind,
+ root_def_id,
+ ExpnId::root(),
+ DUMMY_SP,
+ )
+ });
let mut module_map = FxHashMap::default();
module_map.insert(DefId::local(CRATE_DEF_INDEX), graph_root);
@@ -1140,10 +1165,12 @@
label_res_map: Default::default(),
export_map: FxHashMap::default(),
trait_map: Default::default(),
+ empty_module,
module_map,
block_map: Default::default(),
extern_module_map: FxHashMap::default(),
binding_parent_modules: FxHashMap::default(),
+ ast_transform_scopes: FxHashMap::default(),
glob_map: Default::default(),
@@ -1191,6 +1218,7 @@
features.declared_lib_features.iter().map(|(feat, ..)| *feat)
.chain(features.declared_lang_features.iter().map(|(feat, ..)| *feat))
.collect(),
+ variant_vis: Default::default()
}
}
@@ -1618,7 +1646,7 @@
}
if let ModuleKind::Block(..) = module.kind {
- return Some(module.parent.unwrap());
+ return Some(module.parent.unwrap().nearest_item_scope());
}
None
@@ -2818,5 +2846,3 @@
}
}
}
-
-__build_diagnostic_array! { librustc_resolve, DIAGNOSTICS }
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 7224bd7..bd8b5e1 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -8,6 +8,7 @@
use crate::Namespace::*;
use crate::resolve_imports::ImportResolver;
use rustc::hir::def::{self, DefKind, NonMacroAttrKind};
+use rustc::hir::def_id;
use rustc::middle::stability;
use rustc::{ty, lint, span_bug};
use syntax::ast::{self, NodeId, Ident};
@@ -15,7 +16,7 @@
use syntax::edition::Edition;
use syntax::ext::base::{self, InvocationRes, Indeterminate, SpecialDerives};
use syntax::ext::base::{MacroKind, SyntaxExtension};
-use syntax::ext::expand::{AstFragment, Invocation, InvocationKind};
+use syntax::ext::expand::{AstFragment, AstFragmentKind, Invocation, InvocationKind};
use syntax::ext::hygiene::{self, ExpnId, ExpnData, ExpnKind};
use syntax::ext::tt::macro_rules;
use syntax::feature_gate::{emit_feature_err, is_builtin_attr_name};
@@ -25,6 +26,7 @@
use std::{mem, ptr};
use rustc_data_structures::sync::Lrc;
+use syntax_pos::hygiene::AstPass;
type Res = def::Res<NodeId>;
@@ -95,16 +97,6 @@
self.session.next_node_id()
}
- fn get_module_scope(&mut self, id: NodeId) -> ExpnId {
- let expn_id = ExpnId::fresh(Some(ExpnData::default(
- ExpnKind::Macro(MacroKind::Attr, sym::test_case), DUMMY_SP, self.session.edition()
- )));
- let module = self.module_map[&self.definitions.local_def_id(id)];
- self.invocation_parent_scopes.insert(expn_id, ParentScope::module(module));
- self.definitions.set_invocation_parent(expn_id, module.def_id().unwrap().index);
- expn_id
- }
-
fn resolve_dollar_crates(&mut self) {
hygiene::update_dollar_crate_names(|ctxt| {
let ident = Ident::new(kw::DollarCrate, DUMMY_SP.with_ctxt(ctxt));
@@ -136,6 +128,37 @@
}
}
+ // Create a new Expansion with a definition site of the provided module, or
+ // a fake empty `#[no_implicit_prelude]` module if no module is provided.
+ fn expansion_for_ast_pass(
+ &mut self,
+ call_site: Span,
+ pass: AstPass,
+ features: &[Symbol],
+ parent_module_id: Option<NodeId>,
+ ) -> ExpnId {
+ let expn_id = ExpnId::fresh(Some(ExpnData::allow_unstable(
+ ExpnKind::AstPass(pass),
+ call_site,
+ self.session.edition(),
+ features.into(),
+ )));
+
+ let parent_scope = if let Some(module_id) = parent_module_id {
+ let parent_def_id = self.definitions.local_def_id(module_id);
+ self.definitions.add_parent_module_of_macro_def(expn_id, parent_def_id);
+ self.module_map[&parent_def_id]
+ } else {
+ self.definitions.add_parent_module_of_macro_def(
+ expn_id,
+ def_id::DefId::local(def_id::CRATE_DEF_INDEX),
+ );
+ self.empty_module
+ };
+ self.ast_transform_scopes.insert(expn_id, parent_scope);
+ expn_id
+ }
+
fn resolve_imports(&mut self) {
ImportResolver { r: self }.resolve_imports()
}
@@ -202,6 +225,26 @@
self.definitions.add_parent_module_of_macro_def(invoc_id, normal_module_def_id);
}
+ match invoc.fragment_kind {
+ AstFragmentKind::Arms
+ | AstFragmentKind::Fields
+ | AstFragmentKind::FieldPats
+ | AstFragmentKind::GenericParams
+ | AstFragmentKind::Params
+ | AstFragmentKind::StructFields
+ | AstFragmentKind::Variants =>
+ {
+ if let Res::Def(..) = res {
+ self.session.span_err(
+ span,
+ "expected an inert attribute, found an attribute macro"
+ );
+ return Ok(InvocationRes::Single(self.dummy_ext(kind)));
+ }
+ },
+ _ => {}
+ }
+
Ok(InvocationRes::Single(ext))
}
@@ -751,10 +794,10 @@
fn check_stability_and_deprecation(&self, ext: &SyntaxExtension, path: &ast::Path) {
let span = path.span;
if let Some(stability) = &ext.stability {
- if let StabilityLevel::Unstable { reason, issue } = stability.level {
+ if let StabilityLevel::Unstable { reason, issue, is_soft } = stability.level {
let feature = stability.feature;
if !self.active_features.contains(&feature) && !span.allows_unstable(feature) {
- stability::report_unstable(self.session, feature, reason, issue, span);
+ stability::report_unstable(self.session, feature, reason, issue, is_soft, span);
}
}
if let Some(depr) = &stability.rustc_depr {
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index fd222a1..eb509f1 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -71,7 +71,7 @@
}
/// One import directive.
-#[derive(Debug,Clone)]
+#[derive(Debug, Clone)]
crate struct ImportDirective<'a> {
/// The ID of the `extern crate`, `UseTree` etc that imported this `ImportDirective`.
///
@@ -447,12 +447,13 @@
}
// Define the name or return the existing binding if there is a collision.
- pub fn try_define(&mut self,
- module: Module<'a>,
- ident: Ident,
- ns: Namespace,
- binding: &'a NameBinding<'a>)
- -> Result<(), &'a NameBinding<'a>> {
+ pub fn try_define(
+ &mut self,
+ module: Module<'a>,
+ ident: Ident,
+ ns: Namespace,
+ binding: &'a NameBinding<'a>,
+ ) -> Result<(), &'a NameBinding<'a>> {
let res = binding.res();
self.check_reserved_macro_name(ident, res);
self.set_binding_parent_module(binding, module);
@@ -480,8 +481,11 @@
};
if glob_binding.res() != nonglob_binding.res() &&
ns == MacroNS && nonglob_binding.expansion != ExpnId::root() {
- resolution.binding = Some(this.ambiguity(AmbiguityKind::GlobVsExpanded,
- nonglob_binding, glob_binding));
+ resolution.binding = Some(this.ambiguity(
+ AmbiguityKind::GlobVsExpanded,
+ nonglob_binding,
+ glob_binding,
+ ));
} else {
resolution.binding = Some(nonglob_binding);
}
@@ -513,9 +517,11 @@
})
}
- fn ambiguity(&self, kind: AmbiguityKind,
- primary_binding: &'a NameBinding<'a>, secondary_binding: &'a NameBinding<'a>)
- -> &'a NameBinding<'a> {
+ fn ambiguity(
+ &self, kind: AmbiguityKind,
+ primary_binding: &'a NameBinding<'a>,
+ secondary_binding: &'a NameBinding<'a>,
+ ) -> &'a NameBinding<'a> {
self.arenas.alloc_name_binding(NameBinding {
ambiguity: Some((secondary_binding, kind)),
..primary_binding.clone()
@@ -524,8 +530,12 @@
// Use `f` to mutate the resolution of the name in the module.
// If the resolution becomes a success, define it in the module's glob importers.
- fn update_resolution<T, F>(&mut self, module: Module<'a>, ident: Ident, ns: Namespace, f: F)
- -> T
+ fn update_resolution<T, F>(
+ &mut self, module: Module<'a>,
+ ident: Ident,
+ ns: Namespace,
+ f: F,
+ ) -> T
where F: FnOnce(&mut Resolver<'a>, &mut NameResolution<'a>) -> T
{
// Ensure that `resolution` isn't borrowed when defining in the module's glob importers,
@@ -627,14 +637,18 @@
self.finalize_resolutions_in(module);
}
- let mut has_errors = false;
let mut seen_spans = FxHashSet::default();
let mut errors = vec![];
let mut prev_root_id: NodeId = NodeId::from_u32(0);
- for i in 0 .. self.r.determined_imports.len() {
- let import = self.r.determined_imports[i];
+ let determined_imports = mem::take(&mut self.r.determined_imports);
+ let indeterminate_imports = mem::take(&mut self.r.indeterminate_imports);
+
+ for (is_indeterminate, import) in determined_imports
+ .into_iter()
+ .map(|i| (false, i))
+ .chain(indeterminate_imports.into_iter().map(|i| (true, i)))
+ {
if let Some(err) = self.finalize_import(import) {
- has_errors = true;
if let SingleImport { source, ref source_bindings, .. } = import.subclass {
if source.name == kw::SelfLower {
@@ -666,21 +680,27 @@
errors.push((path, err));
prev_root_id = import.root_id;
}
+ } else if is_indeterminate {
+ // Consider erroneous imports used to avoid duplicate diagnostics.
+ self.r.used_imports.insert((import.id, TypeNS));
+ let path = import_path_to_string(
+ &import.module_path.iter().map(|seg| seg.ident).collect::<Vec<_>>(),
+ &import.subclass,
+ import.span,
+ );
+ let err = UnresolvedImportError {
+ span: import.span,
+ label: None,
+ note: Vec::new(),
+ suggestion: None,
+ };
+ errors.push((path, err));
}
}
if !errors.is_empty() {
self.throw_unresolved_import_error(errors.clone(), None);
}
-
- // Report unresolved imports only if no hard error was already reported
- // to avoid generating multiple errors on the same import.
- if !has_errors {
- for import in &self.r.indeterminate_imports {
- self.throw_unresolved_import_error(errors, Some(MultiSpan::from(import.span)));
- break;
- }
- }
}
fn throw_unresolved_import_error(
@@ -835,10 +855,20 @@
) -> Option<UnresolvedImportError> {
let orig_vis = directive.vis.replace(ty::Visibility::Invisible);
let prev_ambiguity_errors_len = self.r.ambiguity_errors.len();
- let path_res = self.r.resolve_path(&directive.module_path, None, &directive.parent_scope,
- true, directive.span, directive.crate_lint());
+ let path_res = self.r.resolve_path(
+ &directive.module_path,
+ None,
+ &directive.parent_scope,
+ true,
+ directive.span,
+ directive.crate_lint(),
+ );
let no_ambiguity = self.r.ambiguity_errors.len() == prev_ambiguity_errors_len;
directive.vis.set(orig_vis);
+ if let PathResult::Failed { .. } | PathResult::NonModule(..) = path_res {
+ // Consider erroneous imports used to avoid duplicate diagnostics.
+ self.r.used_imports.insert((directive.id, TypeNS));
+ }
let module = match path_res {
PathResult::Module(module) => {
// Consistency checks, analogous to `finalize_macro_resolutions`.
@@ -895,7 +925,6 @@
}
}
};
-
return Some(err);
}
return None;
@@ -1307,12 +1336,11 @@
None => continue,
};
- // Filter away ambiguous and gensymed imports. Gensymed imports
- // (e.g. implicitly injected `std`) cannot be properly encoded in metadata,
- // so they can cause name conflict errors downstream.
- let is_good_import = binding.is_import() && !binding.is_ambiguity() &&
- // Note that as_str() de-gensyms the Symbol
- !(ident.is_gensymed() && ident.name.as_str() != "_");
+ // Filter away ambiguous imports and anything that has def-site
+ // hygiene.
+ // FIXME: Implement actual cross-crate hygiene.
+ let is_good_import = binding.is_import() && !binding.is_ambiguity()
+ && !ident.span.modern().from_expansion();
if is_good_import || binding.is_macro_def() {
let res = binding.res();
if res != Res::Err {
diff --git a/src/librustc_target/spec/i686_unknown_uefi.rs b/src/librustc_target/spec/i686_unknown_uefi.rs
new file mode 100644
index 0000000..c60f7b4
--- /dev/null
+++ b/src/librustc_target/spec/i686_unknown_uefi.rs
@@ -0,0 +1,98 @@
+// This defines the ia32 target for UEFI systems as described in the UEFI specification. See the
+// uefi-base module for generic UEFI options. On ia32 systems
+// UEFI systems always run in protected-mode, have the interrupt-controller pre-configured and
+// force a single-CPU execution.
+// The cdecl ABI is used. It differs from the stdcall or fastcall ABI.
+// "i686-unknown-windows" is used to get the minimal subset of windows-specific features.
+
+use crate::spec::{LinkerFlavor, LldFlavor, Target, TargetResult};
+
+pub fn target() -> TargetResult {
+ let mut base = super::uefi_base::opts();
+ base.cpu = "pentium4".to_string();
+ base.max_atomic_width = Some(64);
+
+ // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
+ // enable these CPU features explicitly before their first use, otherwise their instructions
+ // will trigger an exception. Rust does not inject any code that enables AVX/MMX/SSE
+ // instruction sets, so this must be done by the firmware. However, existing firmware is known
+ // to leave these uninitialized, thus triggering exceptions if we make use of them. Which is
+ // why we avoid them and instead use soft-floats. This is also what GRUB and friends did so
+ // far.
+ // If you initialize FP units yourself, you can override these flags with custom linker
+ // arguments, thus giving you access to full MMX/SSE acceleration.
+ base.features = "-mmx,-sse,+soft-float".to_string();
+
+ // UEFI mirrors the calling-conventions used on windows. In case of i686 this means small
+ // structs will be returned as int. This shouldn't matter much, since the restrictions placed
+ // by the UEFI specifications forbid any ABI to return structures.
+ base.abi_return_struct_as_int = true;
+
+ // Use -GNU here, because of the reason below:
+ // Backgound and Problem:
+ // If we use i686-unknown-windows, the LLVM IA32 MSVC generates compiler intrinsic
+ // _alldiv, _aulldiv, _allrem, _aullrem, _allmul, which will cause undefined symbol.
+ // A real issue is __aulldiv() is refered by __udivdi3() - udivmod_inner!(), from
+ // https://github.com/rust-lang-nursery/compiler-builtins.
+ // As result, rust-lld generates link error finally.
+ // Root-cause:
+ // In rust\src\llvm-project\llvm\lib\Target\X86\X86ISelLowering.cpp,
+ // we have below code to use MSVC intrinsics. It assumes MSVC target
+ // will link MSVC library. But that is NOT true in UEFI environment.
+ // UEFI does not link any MSVC or GCC standard library.
+ // if (Subtarget.isTargetKnownWindowsMSVC() ||
+ // Subtarget.isTargetWindowsItanium()) {
+ // // Setup Windows compiler runtime calls.
+ // setLibcallName(RTLIB::SDIV_I64, "_alldiv");
+ // setLibcallName(RTLIB::UDIV_I64, "_aulldiv");
+ // setLibcallName(RTLIB::SREM_I64, "_allrem");
+ // setLibcallName(RTLIB::UREM_I64, "_aullrem");
+ // setLibcallName(RTLIB::MUL_I64, "_allmul");
+ // setLibcallCallingConv(RTLIB::SDIV_I64, CallingConv::X86_StdCall);
+ // setLibcallCallingConv(RTLIB::UDIV_I64, CallingConv::X86_StdCall);
+ // setLibcallCallingConv(RTLIB::SREM_I64, CallingConv::X86_StdCall);
+ // setLibcallCallingConv(RTLIB::UREM_I64, CallingConv::X86_StdCall);
+ // setLibcallCallingConv(RTLIB::MUL_I64, CallingConv::X86_StdCall);
+ // }
+ // The compiler intrisics should be implemented by compiler-builtins.
+ // Unfortunately, compiler-builtins has not provided those intrinsics yet. Such as:
+ // i386/divdi3.S
+ // i386/lshrdi3.S
+ // i386/moddi3.S
+ // i386/muldi3.S
+ // i386/udivdi3.S
+ // i386/umoddi3.S
+ // Possible solution:
+ // 1. Eliminate Intrinsics generation.
+ // 1.1 Choose differnt target to bypass isTargetKnownWindowsMSVC().
+ // 1.2 Remove the "Setup Windows compiler runtime calls" in LLVM
+ // 2. Implement Intrinsics.
+ // We evaluated all options.
+ // #2 is hard because we need implement the intrinsics (_aulldiv) generated
+ // from the other intrinscis (__udivdi3) implementation with the same
+ // functionality (udivmod_inner). If we let _aulldiv() call udivmod_inner!(),
+ // then we are in loop. We may have to find another way to implement udivmod_inner!().
+ // #1.2 may break the existing usage.
+ // #1.1 seems the simplest solution today.
+ // The IA32 -gnu calling convention is same as the one defined in UEFI specification.
+ // It uses cdecl, EAX/ECX/EDX as volatile register, and EAX/EDX as return value.
+ // We also checked the LLVM X86TargetLowering, the differences between -gnu and -msvc
+ // is fmodf(f32), longjmp() and TLS. None of them impacts the UEFI code.
+ // As a result, we choose -gnu for i686 version before those intrisics are implemented in
+ // compiler-builtins. After compiler-builtins implements all required intrinsics, we may
+ // remove -gnu and use the default one.
+ Ok(Target {
+ llvm_target: "i686-unknown-windows-gnu".to_string(),
+ target_endian: "little".to_string(),
+ target_pointer_width: "32".to_string(),
+ target_c_int_width: "32".to_string(),
+ data_layout: "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32".to_string(),
+ target_os: "uefi".to_string(),
+ target_env: "".to_string(),
+ target_vendor: "unknown".to_string(),
+ arch: "x86".to_string(),
+ linker_flavor: LinkerFlavor::Lld(LldFlavor::Link),
+
+ options: base,
+ })
+}
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
index 82e74f3..626fa37 100644
--- a/src/librustc_target/spec/mod.rs
+++ b/src/librustc_target/spec/mod.rs
@@ -493,6 +493,7 @@
("x86_64-fortanix-unknown-sgx", x86_64_fortanix_unknown_sgx),
("x86_64-unknown-uefi", x86_64_unknown_uefi),
+ ("i686-unknown-uefi", i686_unknown_uefi),
("nvptx64-nvidia-cuda", nvptx64_nvidia_cuda),
diff --git a/src/librustc_target/spec/wasm32_wasi.rs b/src/librustc_target/spec/wasm32_wasi.rs
index bb33493..86978c0 100644
--- a/src/librustc_target/spec/wasm32_wasi.rs
+++ b/src/librustc_target/spec/wasm32_wasi.rs
@@ -97,6 +97,10 @@
options.crt_static_default = true;
options.crt_static_respected = true;
+ // Allow `+crt-static` to create a "cdylib" output which is just a wasm file
+ // without a main function.
+ options.crt_static_allows_dylibs = true;
+
Ok(Target {
llvm_target: "wasm32-wasi".to_string(),
target_endian: "little".to_string(),
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index 9e52eae..09e6b76 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -23,6 +23,7 @@
use crate::require_c_abi_if_c_variadic;
use smallvec::SmallVec;
use syntax::ast;
+use syntax::errors::pluralise;
use syntax::feature_gate::{GateIssue, emit_feature_err};
use syntax::util::lev_distance::find_best_match_for_name;
use syntax::symbol::sym;
@@ -377,7 +378,7 @@
quantifier,
bound,
kind,
- if bound != 1 { "s" } else { "" },
+ pluralise!(bound),
))
};
@@ -1461,7 +1462,7 @@
span: Span,
type_str: &str,
trait_str: &str,
- name: &str,
+ name: ast::Name,
) {
let mut err = struct_span_err!(self.tcx().sess, span, E0223, "ambiguous associated type");
if let (Some(_), Ok(snippet)) = (
@@ -1688,7 +1689,7 @@
span,
&qself_ty.to_string(),
"Trait",
- &assoc_ident.as_str(),
+ assoc_ident.name,
);
}
return Err(ErrorReported);
@@ -1761,7 +1762,7 @@
span,
"Type",
&path_str,
- &item_segment.ident.as_str(),
+ item_segment.ident.name,
);
return tcx.types.err;
};
diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs
index 8e187b7..f22499f 100644
--- a/src/librustc_typeck/check/compare_method.rs
+++ b/src/librustc_typeck/check/compare_method.rs
@@ -10,6 +10,7 @@
use errors::{Applicability, DiagnosticId};
use syntax_pos::Span;
+use syntax::errors::pluralise;
use super::{Inherited, FnCtxt, potentially_plural_count};
@@ -648,9 +649,9 @@
declaration has {} {kind} parameter{}",
trait_.ident,
impl_count,
- if impl_count != 1 { "s" } else { "" },
+ pluralise!(impl_count),
trait_count,
- if trait_count != 1 { "s" } else { "" },
+ pluralise!(trait_count),
kind = kind,
),
DiagnosticId::Error("E0049".into()),
@@ -665,7 +666,7 @@
"expected {} {} parameter{}",
trait_count,
kind,
- if trait_count != 1 { "s" } else { "" },
+ pluralise!(trait_count),
));
}
for span in spans {
@@ -680,7 +681,7 @@
"found {} {} parameter{}{}",
impl_count,
kind,
- if impl_count != 1 { "s" } else { "" },
+ pluralise!(impl_count),
suffix.unwrap_or_else(|| String::new()),
));
}
diff --git a/src/librustc_typeck/check/expr.rs b/src/librustc_typeck/check/expr.rs
index 9644815..da72dfd 100644
--- a/src/librustc_typeck/check/expr.rs
+++ b/src/librustc_typeck/check/expr.rs
@@ -161,6 +161,10 @@
// Warn for non-block expressions with diverging children.
match expr.node {
ExprKind::Block(..) | ExprKind::Loop(..) | ExprKind::Match(..) => {},
+ ExprKind::Call(ref callee, _) =>
+ self.warn_if_unreachable(expr.hir_id, callee.span, "call"),
+ ExprKind::MethodCall(_, ref span, _) =>
+ self.warn_if_unreachable(expr.hir_id, *span, "call"),
_ => self.warn_if_unreachable(expr.hir_id, expr.span, "expression"),
}
diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs
index 1c01c84..c883831 100644
--- a/src/librustc_typeck/check/method/probe.rs
+++ b/src/librustc_typeck/check/method/probe.rs
@@ -578,6 +578,10 @@
ty::Param(p) => {
self.assemble_inherent_candidates_from_param(p);
}
+ ty::Bool => {
+ let lang_def_id = lang_items.bool_impl();
+ self.assemble_inherent_impl_for_primitive(lang_def_id);
+ }
ty::Char => {
let lang_def_id = lang_items.char_impl();
self.assemble_inherent_impl_for_primitive(lang_def_id);
diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs
index 72e6f59..3e45b1e 100644
--- a/src/librustc_typeck/check/method/suggest.rs
+++ b/src/librustc_typeck/check/method/suggest.rs
@@ -425,6 +425,9 @@
"private field"
};
err.span_label(item_name.span, format!("{}, not a method", field_kind));
+ } else if lev_candidate.is_none() && static_sources.is_empty() {
+ err.span_label(span, format!("{} not found in `{}`", item_kind, ty_str));
+ self.tcx.sess.trait_methods_not_found.borrow_mut().insert(orig_span);
}
} else {
err.span_label(span, format!("{} not found in `{}`", item_kind, ty_str));
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index d8d0162..02e7d97 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -1511,21 +1511,34 @@
} else {
for item in &m.items {
let generics = tcx.generics_of(tcx.hir().local_def_id(item.hir_id));
- if generics.params.len() - generics.own_counts().lifetimes != 0 {
- let mut err = struct_span_err!(
+ let own_counts = generics.own_counts();
+ if generics.params.len() - own_counts.lifetimes != 0 {
+ let (kinds, kinds_pl, egs) = match (own_counts.types, own_counts.consts) {
+ (_, 0) => ("type", "types", Some("u32")),
+ // We don't specify an example value, because we can't generate
+ // a valid value for any type.
+ (0, _) => ("const", "consts", None),
+ _ => ("type or const", "types or consts", None),
+ };
+ struct_span_err!(
tcx.sess,
item.span,
E0044,
- "foreign items may not have type parameters"
- );
- err.span_label(item.span, "can't have type parameters");
- // FIXME: once we start storing spans for type arguments, turn this into a
- // suggestion.
- err.help(
- "use specialization instead of type parameters by replacing them \
- with concrete types like `u32`",
- );
- err.emit();
+ "foreign items may not have {} parameters",
+ kinds,
+ ).span_label(
+ item.span,
+ &format!("can't have {} parameters", kinds),
+ ).help(
+ // FIXME: once we start storing spans for type arguments, turn this
+ // into a suggestion.
+ &format!(
+ "replace the {} parameters with concrete {}{}",
+ kinds,
+ kinds_pl,
+ egs.map(|egs| format!(" like `{}`", egs)).unwrap_or_default(),
+ ),
+ ).emit();
}
if let hir::ForeignItemKind::Fn(ref fn_decl, _, _) = item.node {
diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs
index 93855a3..18b555d 100644
--- a/src/librustc_typeck/check/op.rs
+++ b/src/librustc_typeck/check/op.rs
@@ -268,7 +268,7 @@
op.node.as_str(), lhs_ty),
);
let mut suggested_deref = false;
- if let Ref(_, mut rty, _) = lhs_ty.sty {
+ if let Ref(_, rty, _) = lhs_ty.sty {
if {
self.infcx.type_is_copy_modulo_regions(self.param_env,
rty,
@@ -279,13 +279,10 @@
.is_ok()
} {
if let Ok(lstring) = source_map.span_to_snippet(lhs_expr.span) {
- while let Ref(_, rty_inner, _) = rty.sty {
- rty = rty_inner;
- }
let msg = &format!(
"`{}=` can be used on '{}', you can dereference `{}`",
op.node.as_str(),
- rty,
+ rty.peel_refs(),
lstring,
);
err.span_suggestion(
@@ -361,7 +358,7 @@
}
let mut suggested_deref = false;
- if let Ref(_, mut rty, _) = lhs_ty.sty {
+ if let Ref(_, rty, _) = lhs_ty.sty {
if {
self.infcx.type_is_copy_modulo_regions(self.param_env,
rty,
@@ -372,17 +369,13 @@
.is_ok()
} {
if let Ok(lstring) = source_map.span_to_snippet(lhs_expr.span) {
- while let Ref(_, rty_inner, _) = rty.sty {
- rty = rty_inner;
- }
- let msg = &format!(
- "`{}` can be used on '{}', you can \
- dereference `{2}`: `*{2}`",
- op.node.as_str(),
- rty,
- lstring
- );
- err.help(msg);
+ err.help(&format!(
+ "`{}` can be used on '{}', you can \
+ dereference `{2}`: `*{2}`",
+ op.node.as_str(),
+ rty.peel_refs(),
+ lstring
+ ));
suggested_deref = true;
}
}
diff --git a/src/librustc_typeck/check/pat.rs b/src/librustc_typeck/check/pat.rs
index 24d0659..8502b89 100644
--- a/src/librustc_typeck/check/pat.rs
+++ b/src/librustc_typeck/check/pat.rs
@@ -1098,22 +1098,35 @@
fn error_scrutinee_inconsistent_length(&self, span: Span, min_len: u64, size: u64) {
struct_span_err!(
- self.tcx.sess, span, E0527,
- "pattern requires {} elements but array has {}",
- min_len, size
+ self.tcx.sess,
+ span,
+ E0527,
+ "pattern requires {} element{} but array has {}",
+ min_len,
+ if min_len != 1 { "s" } else { "" },
+ size,
)
- .span_label(span, format!("expected {} elements", size))
+ .span_label(span, format!("expected {} element{}", size, if size != 1 { "s" } else { "" }))
.emit();
}
fn error_scrutinee_with_rest_inconsistent_length(&self, span: Span, min_len: u64, size: u64) {
struct_span_err!(
- self.tcx.sess, span, E0528,
- "pattern requires at least {} elements but array has {}",
- min_len, size
- )
- .span_label(span, format!("pattern cannot match array of {} elements", size))
- .emit();
+ self.tcx.sess,
+ span,
+ E0528,
+ "pattern requires at least {} element{} but array has {}",
+ min_len,
+ if min_len != 1 { "s" } else { "" },
+ size,
+ ).span_label(
+ span,
+ format!(
+ "pattern cannot match array of {} element{}",
+ size,
+ if size != 1 { "s" } else { "" },
+ ),
+ ).emit();
}
fn error_scrutinee_unfixed_length(&self, span: Span) {
diff --git a/src/librustc_typeck/coherence/inherent_impls.rs b/src/librustc_typeck/coherence/inherent_impls.rs
index fb79a85..e7c2126 100644
--- a/src/librustc_typeck/coherence/inherent_impls.rs
+++ b/src/librustc_typeck/coherence/inherent_impls.rs
@@ -67,6 +67,14 @@
ty::Dynamic(ref data, ..) if data.principal_def_id().is_some() => {
self.check_def_id(item, data.principal_def_id().unwrap());
}
+ ty::Bool => {
+ self.check_primitive_impl(def_id,
+ lang_items.bool_impl(),
+ None,
+ "bool",
+ "bool",
+ item.span);
+ }
ty::Char => {
self.check_primitive_impl(def_id,
lang_items.char_impl(),
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 312a598..d2e9203 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -519,15 +519,15 @@
tcx.predicates_of(def_id);
}
-fn convert_enum_variant_types<'tcx>(
- tcx: TyCtxt<'tcx>,
+fn convert_enum_variant_types(
+ tcx: TyCtxt<'_>,
def_id: DefId,
variants: &[hir::Variant]
) {
let def = tcx.adt_def(def_id);
let repr_type = def.repr.discr_type();
let initial = repr_type.initial_discriminant(tcx);
- let mut prev_discr = None::<Discr<'tcx>>;
+ let mut prev_discr = None::<Discr<'_>>;
// fill the discriminant values and field types
for variant in variants {
diff --git a/src/librustc_typeck/constrained_generic_params.rs b/src/librustc_typeck/constrained_generic_params.rs
index 79a04b9..dd44f86 100644
--- a/src/librustc_typeck/constrained_generic_params.rs
+++ b/src/librustc_typeck/constrained_generic_params.rs
@@ -20,10 +20,10 @@
}
/// Returns the set of parameters constrained by the impl header.
-pub fn parameters_for_impl<'tcx>(impl_self_ty: Ty<'tcx>,
- impl_trait_ref: Option<ty::TraitRef<'tcx>>)
- -> FxHashSet<Parameter>
-{
+pub fn parameters_for_impl<'tcx>(
+ impl_self_ty: Ty<'tcx>,
+ impl_trait_ref: Option<ty::TraitRef<'tcx>>,
+) -> FxHashSet<Parameter> {
let vec = match impl_trait_ref {
Some(tr) => parameters_for(&tr, false),
None => parameters_for(&impl_self_ty, false),
@@ -36,12 +36,10 @@
/// uniquely determined by `t` (see RFC 447). If it is true, return the list
/// of parameters whose values are needed in order to constrain `ty` - these
/// differ, with the latter being a superset, in the presence of projections.
-pub fn parameters_for<'tcx, T>(t: &T,
- include_nonconstraining: bool)
- -> Vec<Parameter>
- where T: TypeFoldable<'tcx>
-{
-
+pub fn parameters_for<'tcx>(
+ t: &impl TypeFoldable<'tcx>,
+ include_nonconstraining: bool,
+) -> Vec<Parameter> {
let mut collector = ParameterCollector {
parameters: vec![],
include_nonconstraining,
diff --git a/src/librustc_typeck/error_codes.rs b/src/librustc_typeck/error_codes.rs
index 093446d..e11dcfa 100644
--- a/src/librustc_typeck/error_codes.rs
+++ b/src/librustc_typeck/error_codes.rs
@@ -1,6 +1,6 @@
// ignore-tidy-filelength
-register_long_diagnostics! {
+syntax::register_diagnostics! {
E0023: r##"
A pattern used to match against an enum variant must provide a sub-pattern for
@@ -4870,10 +4870,7 @@
The `Box<...>` ensures that the result is of known size,
and the pin is required to keep it in the same place in memory.
"##,
-
-} // (end of detailed error messages)
-
-register_diagnostics! {
+;
// E0035, merged into E0087/E0089
// E0036, merged into E0087/E0089
// E0068,
@@ -4930,7 +4927,8 @@
// E0245, // not a trait
// E0246, // invalid recursive type
// E0247,
-// E0248, // value used as a type, now reported earlier during resolution as E0412
+// E0248, // value used as a type, now reported earlier during resolution
+ // as E0412
// E0249,
// E0319, // trait impls for defaulted traits allowed just for structs/enums
// E0372, // coherence not object safe
@@ -4938,7 +4936,7 @@
// between structures with the same definition
// E0558, // replaced with a generic attribute input check
E0533, // `{}` does not name a unit variant, unit struct or a constant
-// E0563, // cannot determine a type for this `impl Trait`: {} // removed in 6383de15
+// E0563, // cannot determine a type for this `impl Trait` removed in 6383de15
E0564, // only named lifetimes are allowed in `impl Trait`,
// but `{}` was found in the type `{}`
E0587, // type has conflicting packed and align representation hints
@@ -4947,8 +4945,8 @@
// E0612, // merged into E0609
// E0613, // Removed (merged with E0609)
E0627, // yield statement outside of generator literal
- E0632, // cannot provide explicit type parameters when `impl Trait` is used in
- // argument position.
+ E0632, // cannot provide explicit type parameters when `impl Trait` is used
+ // in argument position.
E0634, // type has conflicting packed representaton hints
E0640, // infer outlives requirements
E0641, // cannot cast to/from a pointer with an unknown kind
diff --git a/src/librustc_typeck/impl_wf_check.rs b/src/librustc_typeck/impl_wf_check.rs
index fcfd9ad..bc0f17c 100644
--- a/src/librustc_typeck/impl_wf_check.rs
+++ b/src/librustc_typeck/impl_wf_check.rs
@@ -12,7 +12,7 @@
use rustc::hir;
use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::hir::def_id::DefId;
-use rustc::ty::{self, TyCtxt};
+use rustc::ty::{self, TyCtxt, TypeFoldable};
use rustc::ty::query::Providers;
use rustc::util::nodemap::{FxHashMap, FxHashSet};
use std::collections::hash_map::Entry::{Occupied, Vacant};
@@ -99,6 +99,15 @@
) {
// Every lifetime used in an associated type must be constrained.
let impl_self_ty = tcx.type_of(impl_def_id);
+ if impl_self_ty.references_error() {
+ // Don't complain about unconstrained type params when self ty isn't known due to errors.
+ // (#36836)
+ tcx.sess.delay_span_bug(
+ tcx.def_span(impl_def_id),
+ "potentially unconstrained type parameters weren't evaluated",
+ );
+ return;
+ }
let impl_generics = tcx.generics_of(impl_def_id);
let impl_predicates = tcx.predicates_of(impl_def_id);
let impl_trait_ref = tcx.impl_trait_ref(impl_def_id);
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index 9d9a9d9..959483e 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -65,7 +65,6 @@
#![feature(exhaustive_patterns)]
#![feature(in_band_lifetimes)]
#![feature(nll)]
-#![feature(rustc_diagnostic_macros)]
#![feature(slice_patterns)]
#![feature(never_type)]
#![feature(inner_deref)]
@@ -78,9 +77,7 @@
#[macro_use] extern crate rustc;
-// N.B., this module needs to be declared first so diagnostics are
-// registered before they are used.
-mod error_codes;
+pub mod error_codes;
mod astconv;
mod check;
@@ -389,5 +386,3 @@
bounds
}
-
-__build_diagnostic_array! { librustc_typeck, DIAGNOSTICS }
diff --git a/src/librustc_typeck/structured_errors.rs b/src/librustc_typeck/structured_errors.rs
index 3e3eab8..273a36e 100644
--- a/src/librustc_typeck/structured_errors.rs
+++ b/src/librustc_typeck/structured_errors.rs
@@ -48,7 +48,7 @@
fn session(&self) -> &Session { self.sess }
fn code(&self) -> DiagnosticId {
- __diagnostic_used!(E0617);
+ syntax::diagnostic_used!(E0617);
DiagnosticId::Error("E0617".to_owned())
}
@@ -104,7 +104,7 @@
fn session(&self) -> &Session { self.sess }
fn code(&self) -> DiagnosticId {
- __diagnostic_used!(E0607);
+ syntax::diagnostic_used!(E0607);
DiagnosticId::Error("E0607".to_owned())
}
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs
index b9b3e62..c3092ce 100644
--- a/src/librustdoc/clean/cfg.rs
+++ b/src/librustdoc/clean/cfg.rs
@@ -81,10 +81,10 @@
},
MetaItemKind::List(ref items) => {
let mut sub_cfgs = items.iter().map(Cfg::parse_nested);
- match &*name.as_str() {
- "all" => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)),
- "any" => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)),
- "not" => if sub_cfgs.len() == 1 {
+ match name {
+ sym::all => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)),
+ sym::any => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)),
+ sym::not => if sub_cfgs.len() == 1 {
Ok(!sub_cfgs.next().unwrap()?)
} else {
Err(InvalidCfgError {
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 4971155..ae70fdc 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -1039,7 +1039,7 @@
fn maybe_sized(cx: &DocContext<'_>) -> GenericBound {
let did = cx.tcx.require_lang_item(lang_items::SizedTraitLangItem, None);
let empty = cx.tcx.intern_substs(&[]);
- let path = external_path(cx, &cx.tcx.item_name(did).as_str(),
+ let path = external_path(cx, cx.tcx.item_name(did),
Some(did), false, vec![], empty);
inline::record_extern_fqn(cx, did, TypeKind::Trait);
GenericBound::TraitBound(PolyTrait {
@@ -1138,13 +1138,13 @@
// trait_did should be set to a trait's DefId if called on a TraitRef, in order to sugar
// from Fn<(A, B,), C> to Fn(A, B) -> C
-fn external_path(cx: &DocContext<'_>, name: &str, trait_did: Option<DefId>, has_self: bool,
+fn external_path(cx: &DocContext<'_>, name: Symbol, trait_did: Option<DefId>, has_self: bool,
bindings: Vec<TypeBinding>, substs: SubstsRef<'_>) -> Path {
Path {
global: false,
res: Res::Err,
segments: vec![PathSegment {
- name: name.to_string(),
+ name: name.as_str().to_string(),
args: external_generic_args(cx, trait_did, has_self, bindings, substs)
}],
}
@@ -1154,7 +1154,7 @@
fn clean(&self, cx: &DocContext<'_>) -> GenericBound {
let (trait_ref, ref bounds) = *self;
inline::record_extern_fqn(cx, trait_ref.def_id, TypeKind::Trait);
- let path = external_path(cx, &cx.tcx.item_name(trait_ref.def_id).as_str(),
+ let path = external_path(cx, cx.tcx.item_name(trait_ref.def_id),
Some(trait_ref.def_id), true, bounds.clone(), trait_ref.substs);
debug!("ty::TraitRef\n subst: {:?}\n", trait_ref.substs);
@@ -3089,8 +3089,7 @@
AdtKind::Enum => TypeKind::Enum,
};
inline::record_extern_fqn(cx, did, kind);
- let path = external_path(cx, &cx.tcx.item_name(did).as_str(),
- None, false, vec![], substs);
+ let path = external_path(cx, cx.tcx.item_name(did), None, false, vec![], substs);
ResolvedPath {
path,
param_names: None,
@@ -3100,7 +3099,7 @@
}
ty::Foreign(did) => {
inline::record_extern_fqn(cx, did, TypeKind::Foreign);
- let path = external_path(cx, &cx.tcx.item_name(did).as_str(),
+ let path = external_path(cx, cx.tcx.item_name(did),
None, false, vec![], InternalSubsts::empty());
ResolvedPath {
path: path,
@@ -3129,7 +3128,7 @@
reg.clean(cx).map(|b| param_names.push(GenericBound::Outlives(b)));
for did in dids {
let empty = cx.tcx.intern_substs(&[]);
- let path = external_path(cx, &cx.tcx.item_name(did).as_str(),
+ let path = external_path(cx, cx.tcx.item_name(did),
Some(did), false, vec![], empty);
inline::record_extern_fqn(cx, did, TypeKind::Trait);
let bound = GenericBound::TraitBound(PolyTrait {
@@ -3154,7 +3153,7 @@
});
}
- let path = external_path(cx, &cx.tcx.item_name(did).as_str(), Some(did),
+ let path = external_path(cx, cx.tcx.item_name(did), Some(did),
false, bindings, substs);
ResolvedPath {
path,
@@ -3977,7 +3976,7 @@
F32 => tcx.lang_items().f32_impl(),
F64 => tcx.lang_items().f64_impl(),
Char => tcx.lang_items().char_impl(),
- Bool => None,
+ Bool => tcx.lang_items().bool_impl(),
Str => tcx.lang_items().str_impl(),
Slice => tcx.lang_items().slice_impl(),
Array => tcx.lang_items().slice_impl(),
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index d261408..19ea781 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -9,7 +9,7 @@
use rustc::session::config::{CrateType, parse_crate_types_from_list};
use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs};
use rustc::session::config::{nightly_options, build_codegen_options, build_debugging_options,
- get_cmd_lint_options, ExternEntry};
+ get_cmd_lint_options, host_triple, ExternEntry};
use rustc::session::search_paths::SearchPath;
use rustc_driver;
use rustc_target::spec::TargetTriple;
@@ -54,7 +54,7 @@
/// Debugging (`-Z`) options to pass to the compiler.
pub debugging_options: DebuggingOptions,
/// The target used to compile the crate against.
- pub target: Option<TargetTriple>,
+ pub target: TargetTriple,
/// Edition used when reading the crate. Defaults to "2015". Also used by default when
/// compiling doctests from the crate.
pub edition: Edition,
@@ -77,6 +77,18 @@
/// Optional path to persist the doctest executables to, defaults to a
/// temporary directory if not set.
pub persist_doctests: Option<PathBuf>,
+ /// Runtool to run doctests with
+ pub runtool: Option<String>,
+ /// Arguments to pass to the runtool
+ pub runtool_args: Vec<String>,
+ /// Whether to allow ignoring doctests on a per-target basis
+ /// For example, using ignore-foo to ignore running the doctest on any target that
+ /// contains "foo" as a substring
+ pub enable_per_target_ignores: bool,
+
+ /// The path to a rustc-like binary to build tests with. If not set, we
+ /// default to loading from $sysroot/bin/rustc.
+ pub test_builder: Option<PathBuf>,
// Options that affect the documentation process
@@ -140,6 +152,9 @@
.field("show_coverage", &self.show_coverage)
.field("crate_version", &self.crate_version)
.field("render_options", &self.render_options)
+ .field("runtool", &self.runtool)
+ .field("runtool_args", &self.runtool_args)
+ .field("enable-per-target-ignores", &self.enable_per_target_ignores)
.finish()
}
}
@@ -414,7 +429,9 @@
}
}
- let target = matches.opt_str("target").map(|target| {
+ let target = matches.opt_str("target").map_or(
+ TargetTriple::from_triple(host_triple()),
+ |target| {
if target.ends_with(".json") {
TargetTriple::TargetPath(PathBuf::from(target))
} else {
@@ -463,9 +480,13 @@
let generate_search_filter = !matches.opt_present("disable-per-crate-search");
let persist_doctests = matches.opt_str("persist-doctests").map(PathBuf::from);
let generate_redirect_pages = matches.opt_present("generate-redirect-pages");
+ let test_builder = matches.opt_str("test-builder").map(PathBuf::from);
let codegen_options_strs = matches.opt_strs("C");
let lib_strs = matches.opt_strs("L");
let extern_strs = matches.opt_strs("extern");
+ let runtool = matches.opt_str("runtool");
+ let runtool_args = matches.opt_strs("runtool-arg");
+ let enable_per_target_ignores = matches.opt_present("enable-per-target-ignores");
let (lint_opts, describe_lints, lint_cap) = get_cmd_lint_options(matches, error_format);
@@ -496,6 +517,10 @@
show_coverage,
crate_version,
persist_doctests,
+ runtool,
+ runtool_args,
+ enable_per_target_ignores,
+ test_builder,
render_options: RenderOptions {
output,
external_html,
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 9cfcad4..57b016a 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -13,7 +13,6 @@
use rustc_driver::abort_on_err;
use rustc_resolve as resolve;
use rustc_metadata::cstore::CStore;
-use rustc_target::spec::TargetTriple;
use syntax::source_map;
use syntax::attr;
@@ -294,7 +293,6 @@
}
}).collect();
- let host_triple = TargetTriple::from_triple(config::host_triple());
let crate_types = if proc_macro_crate {
vec![config::CrateType::ProcMacro]
} else {
@@ -313,7 +311,7 @@
lint_cap: Some(lint_cap.unwrap_or_else(|| lint::Forbid)),
cg: codegen_options,
externs,
- target_triple: target.unwrap_or(host_triple),
+ target_triple: target,
// Ensure that rustdoc works even if rustc is feature-staged
unstable_features: UnstableFeatures::Allow,
actually_rustdoc: true,
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index 313734e..dcd3219 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -18,6 +18,100 @@
use crate::html::item_type::ItemType;
use crate::html::render::{self, cache, CURRENT_DEPTH};
+pub trait Print {
+ fn print(self, buffer: &mut Buffer);
+}
+
+impl<F> Print for F
+ where F: FnOnce(&mut Buffer),
+{
+ fn print(self, buffer: &mut Buffer) {
+ (self)(buffer)
+ }
+}
+
+impl Print for String {
+ fn print(self, buffer: &mut Buffer) {
+ buffer.write_str(&self);
+ }
+}
+
+impl Print for &'_ str {
+ fn print(self, buffer: &mut Buffer) {
+ buffer.write_str(self);
+ }
+}
+
+#[derive(Debug, Clone)]
+pub struct Buffer {
+ for_html: bool,
+ buffer: String,
+}
+
+impl Buffer {
+ crate fn empty_from(v: &Buffer) -> Buffer {
+ Buffer {
+ for_html: v.for_html,
+ buffer: String::new(),
+ }
+ }
+
+ crate fn html() -> Buffer {
+ Buffer {
+ for_html: true,
+ buffer: String::new(),
+ }
+ }
+
+ crate fn is_empty(&self) -> bool {
+ self.buffer.is_empty()
+ }
+
+ crate fn into_inner(self) -> String {
+ self.buffer
+ }
+
+ crate fn insert_str(&mut self, idx: usize, s: &str) {
+ self.buffer.insert_str(idx, s);
+ }
+
+ crate fn push_str(&mut self, s: &str) {
+ self.buffer.push_str(s);
+ }
+
+ // Intended for consumption by write! and writeln! (std::fmt) but without
+ // the fmt::Result return type imposed by fmt::Write (and avoiding the trait
+ // import).
+ crate fn write_str(&mut self, s: &str) {
+ self.buffer.push_str(s);
+ }
+
+ // Intended for consumption by write! and writeln! (std::fmt) but without
+ // the fmt::Result return type imposed by fmt::Write (and avoiding the trait
+ // import).
+ crate fn write_fmt(&mut self, v: fmt::Arguments<'_>) {
+ use fmt::Write;
+ self.buffer.write_fmt(v).unwrap();
+ }
+
+ crate fn to_display<T: Print>(mut self, t: T) -> String {
+ t.print(&mut self);
+ self.into_inner()
+ }
+
+ crate fn with_formatter<T: FnOnce(&mut fmt::Formatter<'_>) -> fmt::Result>(&mut self, t: T) {
+ self.from_display(display_fn(move |f| (t)(f)));
+ }
+
+ crate fn from_display<T: std::fmt::Display>(&mut self, t: T) {
+ if self.for_html {
+ write!(self, "{}", t);
+ } else {
+ write!(self, "{:#}", t);
+ }
+ }
+}
+
/// Helper to render an optional visibility with a space after it (if the
/// visibility is preset)
#[derive(Copy, Clone)]
@@ -200,11 +294,11 @@
}
&clean::WherePredicate::RegionPredicate { ref lifetime, ref bounds } => {
clause.push_str(&format!("{}: {}",
- lifetime,
- bounds.iter()
- .map(|b| b.to_string())
- .collect::<Vec<_>>()
- .join(" + ")));
+ lifetime,
+ bounds.iter()
+ .map(|b| b.to_string())
+ .collect::<Vec<_>>()
+ .join(" + ")));
}
&clean::WherePredicate::EqPredicate { ref lhs, ref rhs } => {
if f.alternate() {
@@ -778,9 +872,9 @@
// The difference from above is that trait is not hyperlinked.
pub fn fmt_impl_for_trait_page(i: &clean::Impl,
- f: &mut fmt::Formatter<'_>,
- use_absolute: bool) -> fmt::Result {
- fmt_impl(i, f, false, use_absolute)
+ f: &mut Buffer,
+ use_absolute: bool) {
+ f.with_formatter(|f| fmt_impl(i, f, false, use_absolute))
}
impl fmt::Display for clean::Arguments {
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index ae0bd1a..56074f4 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -1,9 +1,8 @@
-use std::fmt;
-use std::io;
use std::path::PathBuf;
use crate::externalfiles::ExternalHtml;
use crate::html::render::SlashChecker;
+use crate::html::format::{Buffer, Print};
#[derive(Clone)]
pub struct Layout {
@@ -11,6 +10,12 @@
pub favicon: String,
pub external_html: ExternalHtml,
pub krate: String,
+ /// The given user css file which allow to customize the generated
+ /// documentation theme.
+ pub css_file_extension: Option<PathBuf>,
+ /// If false, the `select` element to have search filtering by crates on rendered docs
+ /// won't be generated.
+ pub generate_search_filter: bool,
}
pub struct Page<'a> {
@@ -25,19 +30,15 @@
pub static_extra_scripts: &'a [&'a str],
}
-pub fn render<T: fmt::Display, S: fmt::Display>(
- dst: &mut dyn io::Write,
+pub fn render<T: Print, S: Print>(
layout: &Layout,
page: &Page<'_>,
- sidebar: &S,
- t: &T,
- css_file_extension: bool,
+ sidebar: S,
+ t: T,
themes: &[PathBuf],
- generate_search_filter: bool,
-) -> io::Result<()> {
+) -> String {
let static_root_path = page.static_root_path.unwrap_or(page.root_path);
- write!(dst,
-"<!DOCTYPE html>\
+ format!("<!DOCTYPE html>\
<html lang=\"en\">\
<head>\
<meta charset=\"utf-8\">\
@@ -164,7 +165,7 @@
<script defer src=\"{root_path}search-index{suffix}.js\"></script>\
</body>\
</html>",
- css_extension = if css_file_extension {
+ css_extension = if layout.css_file_extension.is_some() {
format!("<link rel=\"stylesheet\" \
type=\"text/css\" \
href=\"{static_root_path}theme{suffix}.css\">",
@@ -173,7 +174,7 @@
} else {
String::new()
},
- content = *t,
+ content = Buffer::html().to_display(t),
static_root_path = static_root_path,
root_path = page.root_path,
css_class = page.css_class,
@@ -207,7 +208,7 @@
in_header = layout.external_html.in_header,
before_content = layout.external_html.before_content,
after_content = layout.external_html.after_content,
- sidebar = *sidebar,
+ sidebar = Buffer::html().to_display(sidebar),
krate = layout.krate,
themes = themes.iter()
.filter_map(|t| t.file_stem())
@@ -228,7 +229,7 @@
root_path=page.root_path,
extra_script=e)
}).collect::<String>(),
- filter_crates=if generate_search_filter {
+ filter_crates=if layout.generate_search_filter {
"<select id=\"crate-search\">\
<option value=\"All crates\">All crates</option>\
</select>"
@@ -238,9 +239,9 @@
)
}
-pub fn redirect(dst: &mut dyn io::Write, url: &str) -> io::Result<()> {
+pub fn redirect(url: &str) -> String {
// <script> triggers a redirect before refresh, so this is fine.
- write!(dst,
+ format!(
r##"<!DOCTYPE html>
<html lang="en">
<head>
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index 74413a7..1a4fa38 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -199,7 +199,7 @@
let ignore;
let edition;
if let Some(Event::Start(Tag::CodeBlock(lang))) = event {
- let parse_result = LangString::parse(&lang, self.check_error_codes);
+ let parse_result = LangString::parse(&lang, self.check_error_codes, false);
if !parse_result.rust {
return Some(Event::Start(Tag::CodeBlock(lang)));
}
@@ -272,7 +272,7 @@
))
});
- let tooltip = if ignore {
+ let tooltip = if ignore != Ignore::None {
Some(("This example is not tested".to_owned(), "ignore"))
} else if compile_fail {
Some(("This example deliberately fails to compile".to_owned(), "compile_fail"))
@@ -286,7 +286,7 @@
s.push_str(&highlight::render_with_highlighting(
&text,
Some(&format!("rust-example-rendered{}",
- if ignore { " ignore" }
+ if ignore != Ignore::None { " ignore" }
else if compile_fail { " compile_fail" }
else if explicit_edition { " edition " }
else { "" })),
@@ -297,7 +297,7 @@
s.push_str(&highlight::render_with_highlighting(
&text,
Some(&format!("rust-example-rendered{}",
- if ignore { " ignore" }
+ if ignore != Ignore::None { " ignore" }
else if compile_fail { " compile_fail" }
else if explicit_edition { " edition " }
else { "" })),
@@ -551,7 +551,8 @@
}
}
-pub fn find_testable_code<T: test::Tester>(doc: &str, tests: &mut T, error_codes: ErrorCodes) {
+pub fn find_testable_code<T: test::Tester>(doc: &str, tests: &mut T, error_codes: ErrorCodes,
+ enable_per_target_ignores: bool) {
let mut parser = Parser::new(doc);
let mut prev_offset = 0;
let mut nb_lines = 0;
@@ -564,7 +565,7 @@
let block_info = if s.is_empty() {
LangString::all_false()
} else {
- LangString::parse(&*s, error_codes)
+ LangString::parse(&*s, error_codes, enable_per_target_ignores)
};
if !block_info.rust {
continue;
@@ -607,7 +608,7 @@
original: String,
pub should_panic: bool,
pub no_run: bool,
- pub ignore: bool,
+ pub ignore: Ignore,
pub rust: bool,
pub test_harness: bool,
pub compile_fail: bool,
@@ -616,13 +617,20 @@
pub edition: Option<Edition>
}
+#[derive(Eq, PartialEq, Clone, Debug)]
+pub enum Ignore {
+ All,
+ None,
+ Some(Vec<String>),
+}
+
impl LangString {
fn all_false() -> LangString {
LangString {
original: String::new(),
should_panic: false,
no_run: false,
- ignore: false,
+ ignore: Ignore::None,
rust: true, // NB This used to be `notrust = false`
test_harness: false,
compile_fail: false,
@@ -632,11 +640,16 @@
}
}
- fn parse(string: &str, allow_error_code_check: ErrorCodes) -> LangString {
+ fn parse(
+ string: &str,
+ allow_error_code_check: ErrorCodes,
+ enable_per_target_ignores: bool
+ ) -> LangString {
let allow_error_code_check = allow_error_code_check.as_bool();
let mut seen_rust_tags = false;
let mut seen_other_tags = false;
let mut data = LangString::all_false();
+ let mut ignores = vec![];
data.original = string.to_owned();
let tokens = string.split(|c: char|
@@ -651,7 +664,11 @@
seen_rust_tags = seen_other_tags == false;
}
"no_run" => { data.no_run = true; seen_rust_tags = !seen_other_tags; }
- "ignore" => { data.ignore = true; seen_rust_tags = !seen_other_tags; }
+ "ignore" => { data.ignore = Ignore::All; seen_rust_tags = !seen_other_tags; }
+ x if x.starts_with("ignore-") => if enable_per_target_ignores {
+ ignores.push(x.trim_start_matches("ignore-").to_owned());
+ seen_rust_tags = !seen_other_tags;
+ }
"allow_fail" => { data.allow_fail = true; seen_rust_tags = !seen_other_tags; }
"rust" => { data.rust = true; seen_rust_tags = true; }
"test_harness" => {
@@ -679,6 +696,10 @@
_ => { seen_other_tags = true }
}
}
+ // ignore-foo overrides ignore
+ if !ignores.is_empty() {
+ data.ignore = Ignore::Some(ignores);
+ }
data.rust &= !seen_other_tags || seen_rust_tags;
@@ -919,7 +940,7 @@
let lang_string = if syntax.is_empty() {
LangString::all_false()
} else {
- LangString::parse(&*syntax, ErrorCodes::Yes)
+ LangString::parse(&*syntax, ErrorCodes::Yes, false)
};
if lang_string.rust {
@@ -931,7 +952,10 @@
is_fenced = true;
previous_offset + fence_idx
}
- None => offset,
+ None => {
+ is_fenced = false;
+ offset
+ }
};
}
}
diff --git a/src/librustdoc/html/markdown/tests.rs b/src/librustdoc/html/markdown/tests.rs
index a95c290..5d6811a 100644
--- a/src/librustdoc/html/markdown/tests.rs
+++ b/src/librustdoc/html/markdown/tests.rs
@@ -1,4 +1,4 @@
-use super::{ErrorCodes, LangString, Markdown, MarkdownHtml, IdMap};
+use super::{ErrorCodes, LangString, Markdown, MarkdownHtml, IdMap, Ignore};
use super::plain_summary_line;
use std::cell::RefCell;
use syntax::edition::{Edition, DEFAULT_EDITION};
@@ -26,10 +26,10 @@
#[test]
fn test_lang_string_parse() {
fn t(s: &str,
- should_panic: bool, no_run: bool, ignore: bool, rust: bool, test_harness: bool,
+ should_panic: bool, no_run: bool, ignore: Ignore, rust: bool, test_harness: bool,
compile_fail: bool, allow_fail: bool, error_codes: Vec<String>,
- edition: Option<Edition>) {
- assert_eq!(LangString::parse(s, ErrorCodes::Yes), LangString {
+ edition: Option<Edition>) {
+ assert_eq!(LangString::parse(s, ErrorCodes::Yes, true), LangString {
should_panic,
no_run,
ignore,
@@ -42,6 +42,7 @@
edition,
})
}
+ let ignore_foo = Ignore::Some(vec!("foo".to_string()));
fn v() -> Vec<String> {
Vec::new()
@@ -50,23 +51,24 @@
// ignore-tidy-linelength
// marker | should_panic | no_run | ignore | rust | test_harness
// | compile_fail | allow_fail | error_codes | edition
- t("", false, false, false, true, false, false, false, v(), None);
- t("rust", false, false, false, true, false, false, false, v(), None);
- t("sh", false, false, false, false, false, false, false, v(), None);
- t("ignore", false, false, true, true, false, false, false, v(), None);
- t("should_panic", true, false, false, true, false, false, false, v(), None);
- t("no_run", false, true, false, true, false, false, false, v(), None);
- t("test_harness", false, false, false, true, true, false, false, v(), None);
- t("compile_fail", false, true, false, true, false, true, false, v(), None);
- t("allow_fail", false, false, false, true, false, false, true, v(), None);
- t("{.no_run .example}", false, true, false, true, false, false, false, v(), None);
- t("{.sh .should_panic}", true, false, false, false, false, false, false, v(), None);
- t("{.example .rust}", false, false, false, true, false, false, false, v(), None);
- t("{.test_harness .rust}", false, false, false, true, true, false, false, v(), None);
- t("text, no_run", false, true, false, false, false, false, false, v(), None);
- t("text,no_run", false, true, false, false, false, false, false, v(), None);
- t("edition2015", false, false, false, true, false, false, false, v(), Some(Edition::Edition2015));
- t("edition2018", false, false, false, true, false, false, false, v(), Some(Edition::Edition2018));
+ t("", false, false, Ignore::None, true, false, false, false, v(), None);
+ t("rust", false, false, Ignore::None, true, false, false, false, v(), None);
+ t("sh", false, false, Ignore::None, false, false, false, false, v(), None);
+ t("ignore", false, false, Ignore::All, true, false, false, false, v(), None);
+ t("ignore-foo", false, false, ignore_foo, true, false, false, false, v(), None);
+ t("should_panic", true, false, Ignore::None, true, false, false, false, v(), None);
+ t("no_run", false, true, Ignore::None, true, false, false, false, v(), None);
+ t("test_harness", false, false, Ignore::None, true, true, false, false, v(), None);
+ t("compile_fail", false, true, Ignore::None, true, false, true, false, v(), None);
+ t("allow_fail", false, false, Ignore::None, true, false, false, true, v(), None);
+ t("{.no_run .example}", false, true, Ignore::None, true, false, false, false, v(), None);
+ t("{.sh .should_panic}", true, false, Ignore::None, false, false, false, false, v(), None);
+ t("{.example .rust}", false, false, Ignore::None, true, false, false, false, v(), None);
+ t("{.test_harness .rust}", false, false, Ignore::None, true, true, false, false, v(), None);
+ t("text, no_run", false, true, Ignore::None, false, false, false, false, v(), None);
+ t("text,no_run", false, true, Ignore::None, false, false, false, false, v(), None);
+ t("edition2015", false, false, Ignore::None, true, false, false, false, v(), Some(Edition::Edition2015));
+ t("edition2018", false, false, Ignore::None, true, false, false, false, v(), Some(Edition::Edition2018));
}
#[test]
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 0e046b8..9846073 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -65,7 +65,7 @@
use crate::doctree;
use crate::fold::DocFolder;
use crate::html::escape::Escape;
-use crate::html::format::{AsyncSpace, ConstnessSpace};
+use crate::html::format::{Buffer, AsyncSpace, ConstnessSpace};
use crate::html::format::{GenericBounds, WhereClause, href, AbiSpace, DefaultSpace};
use crate::html::format::{VisSpace, Function, UnsafetySpace, MutableSpace};
use crate::html::format::fmt_impl_for_trait_page;
@@ -192,9 +192,6 @@
/// The base-URL of the issue tracker for when an item has been tagged with
/// an issue number.
pub issue_tracker_base_url: Option<String>,
- /// The given user css file which allow to customize the generated
- /// documentation theme.
- pub css_file_extension: Option<PathBuf>,
/// The directories that have already been created in this doc run. Used to reduce the number
/// of spurious `create_dir_all` calls.
pub created_dirs: RefCell<FxHashSet<PathBuf>>,
@@ -209,9 +206,6 @@
/// Optional path string to be used to load static files on output pages. If not set, uses
/// combinations of `../` to reach the documentation root.
pub static_root_path: Option<String>,
- /// If false, the `select` element to have search filtering by crates on rendered docs
- /// won't be generated.
- pub generate_search_filter: bool,
/// Option disabled by default to generate files used by RLS and some other tools.
pub generate_redirect_pages: bool,
/// The fs handle we are working with.
@@ -387,14 +381,6 @@
// Helper structs for rendering items/sidebars and carrying along contextual
// information
-#[derive(Copy, Clone)]
-struct Item<'a> {
- cx: &'a Context,
- item: &'a clean::Item,
-}
-
-struct Sidebar<'a> { cx: &'a Context, item: &'a clean::Item, }
-
/// Struct representing one entry in the JS search index. These are all emitted
/// by hand to a large JS file at the end of cache-creation.
#[derive(Debug)]
@@ -545,14 +531,14 @@
favicon: String::new(),
external_html,
krate: krate.name.clone(),
+ css_file_extension: extension_css,
+ generate_search_filter,
},
- css_file_extension: extension_css,
created_dirs: Default::default(),
sort_modules_alphabetically,
themes,
resource_suffix,
static_root_path,
- generate_search_filter,
generate_redirect_pages,
fs: DocFS::new(&errors),
};
@@ -932,7 +918,7 @@
options.enable_minification)?;
}
- if let Some(ref css) = cx.shared.css_file_extension {
+ if let Some(ref css) = cx.shared.layout.css_file_extension {
let out = cx.dst.join(&format!("theme{}.css", cx.shared.resource_suffix));
let buffer = try_err!(fs::read_to_string(css), css);
if !options.enable_minification {
@@ -1031,12 +1017,12 @@
}
all_aliases.push(format!("ALIASES[\"{}\"] = {{{}}};", krate.name, output));
all_aliases.sort();
- let mut v = Vec::new();
- try_err!(writeln!(&mut v, "var ALIASES = {{}};"), &dst);
+ let mut v = Buffer::html();
+ writeln!(&mut v, "var ALIASES = {{}};");
for aliases in &all_aliases {
- try_err!(writeln!(&mut v, "{}", aliases), &dst);
+ writeln!(&mut v, "{}", aliases);
}
- cx.shared.fs.write(&dst, &v)?;
+ cx.shared.fs.write(&dst, v.into_inner().into_bytes())?;
}
use std::ffi::OsString;
@@ -1120,12 +1106,9 @@
&krate.name,
hierarchy.to_json_string()));
all_sources.sort();
- let mut v = Vec::new();
- try_err!(writeln!(&mut v,
- "var N = null;var sourcesIndex = {{}};\n{}\ncreateSourceSidebar();",
- all_sources.join("\n")),
- &dst);
- cx.shared.fs.write(&dst, &v)?;
+ let v = format!("var N = null;var sourcesIndex = {{}};\n{}\ncreateSourceSidebar();\n",
+ all_sources.join("\n"));
+ cx.shared.fs.write(&dst, v.as_bytes())?;
}
// Update the search index
@@ -1140,14 +1123,11 @@
// with rustdoc running in parallel.
all_indexes.sort();
{
- let mut v = Vec::new();
- try_err!(writeln!(&mut v, "var N=null,E=\"\",T=\"t\",U=\"u\",searchIndex={{}};"), &dst);
- try_err!(write_minify_replacer(
- &mut v,
+ let mut v = String::from("var N=null,E=\"\",T=\"t\",U=\"u\",searchIndex={};\n");
+ v.push_str(&minify_replacer(
&format!("{}\n{}", variables.join(""), all_indexes.join("\n")),
- options.enable_minification),
- &dst);
- try_err!(write!(&mut v, "initSearch(searchIndex);addSearchOptions(searchIndex);"), &dst);
+ options.enable_minification));
+ v.push_str("initSearch(searchIndex);addSearchOptions(searchIndex);");
cx.shared.fs.write(&dst, &v)?;
}
if options.enable_index_page {
@@ -1185,13 +1165,10 @@
SlashChecker(s), s)
})
.collect::<String>());
- let mut v = Vec::new();
- try_err!(layout::render(&mut v, &cx.shared.layout,
- &page, &(""), &content,
- cx.shared.css_file_extension.is_some(),
- &cx.shared.themes,
- cx.shared.generate_search_filter), &dst);
- cx.shared.fs.write(&dst, &v)?;
+ let v = layout::render(&cx.shared.layout,
+ &page, "", content,
+ &cx.shared.themes);
+ cx.shared.fs.write(&dst, v.as_bytes())?;
}
}
@@ -1256,19 +1233,18 @@
// identically even with rustdoc running in parallel.
all_implementors.sort();
- let mut v = Vec::new();
- try_err!(writeln!(&mut v, "(function() {{var implementors = {{}};"), &mydst);
+ let mut v = String::from("(function() {var implementors = {};\n");
for implementor in &all_implementors {
- try_err!(writeln!(&mut v, "{}", *implementor), &mydst);
+ writeln!(v, "{}", *implementor).unwrap();
}
- try_err!(writeln!(&mut v, "{}", r"
+ v.push_str(r"
if (window.register_implementors) {
window.register_implementors(implementors);
} else {
window.pending_implementors = implementors;
}
- "), &mydst);
- try_err!(writeln!(&mut v, r"}})()"), &mydst);
+ ");
+ v.push_str("})()");
cx.shared.fs.write(&mydst, &v)?;
}
Ok(())
@@ -1288,68 +1264,65 @@
}
}
-fn write_minify_replacer<W: Write>(
- dst: &mut W,
+fn minify_replacer(
contents: &str,
enable_minification: bool,
-) -> io::Result<()> {
+) -> String {
use minifier::js::{simple_minify, Keyword, ReservedChar, Token, Tokens};
if enable_minification {
- writeln!(dst, "{}",
- {
- let tokens: Tokens<'_> = simple_minify(contents)
- .into_iter()
- .filter(|(f, next)| {
- // We keep backlines.
- minifier::js::clean_token_except(f, next, &|c: &Token<'_>| {
- c.get_char() != Some(ReservedChar::Backline)
- })
- })
- .map(|(f, _)| {
- minifier::js::replace_token_with(f, &|t: &Token<'_>| {
- match *t {
- Token::Keyword(Keyword::Null) => Some(Token::Other("N")),
- Token::String(s) => {
- let s = &s[1..s.len() -1]; // The quotes are included
- if s.is_empty() {
- Some(Token::Other("E"))
- } else if s == "t" {
- Some(Token::Other("T"))
- } else if s == "u" {
- Some(Token::Other("U"))
- } else {
- None
- }
- }
- _ => None,
- }
- })
- })
- .collect::<Vec<_>>()
- .into();
- tokens.apply(|f| {
- // We add a backline after the newly created variables.
- minifier::js::aggregate_strings_into_array_with_separation_filter(
- f,
- "R",
- Token::Char(ReservedChar::Backline),
- // This closure prevents crates' names from being aggregated.
- //
- // The point here is to check if the string is preceded by '[' and
- // "searchIndex". If so, it means this is a crate name and that it
- // shouldn't be aggregated.
- |tokens, pos| {
- pos < 2 ||
- !tokens[pos - 1].eq_char(ReservedChar::OpenBracket) ||
- tokens[pos - 2].get_other() != Some("searchIndex")
- }
- )
- })
- .to_string()
+ let tokens: Tokens<'_> = simple_minify(contents)
+ .into_iter()
+ .filter(|(f, next)| {
+ // We keep backlines.
+ minifier::js::clean_token_except(f, next, &|c: &Token<'_>| {
+ c.get_char() != Some(ReservedChar::Backline)
})
+ })
+ .map(|(f, _)| {
+ minifier::js::replace_token_with(f, &|t: &Token<'_>| {
+ match *t {
+ Token::Keyword(Keyword::Null) => Some(Token::Other("N")),
+ Token::String(s) => {
+ let s = &s[1..s.len() -1]; // The quotes are included
+ if s.is_empty() {
+ Some(Token::Other("E"))
+ } else if s == "t" {
+ Some(Token::Other("T"))
+ } else if s == "u" {
+ Some(Token::Other("U"))
+ } else {
+ None
+ }
+ }
+ _ => None,
+ }
+ })
+ })
+ .collect::<Vec<_>>()
+ .into();
+ let o = tokens.apply(|f| {
+ // We add a backline after the newly created variables.
+ minifier::js::aggregate_strings_into_array_with_separation_filter(
+ f,
+ "R",
+ Token::Char(ReservedChar::Backline),
+ // This closure prevents crates' names from being aggregated.
+ //
+ // The point here is to check if the string is preceded by '[' and
+ // "searchIndex". If so, it means this is a crate name and that it
+ // shouldn't be aggregated.
+ |tokens, pos| {
+ pos < 2 ||
+ !tokens[pos - 1].eq_char(ReservedChar::OpenBracket) ||
+ tokens[pos - 2].get_other() != Some("searchIndex")
+ }
+ )
+ })
+ .to_string();
+ format!("{}\n", o)
} else {
- writeln!(dst, "{}", contents)
+ format!("{}\n", contents)
}
}
@@ -1778,8 +1751,7 @@
}
}
-fn print_entries(f: &mut fmt::Formatter<'_>, e: &FxHashSet<ItemEntry>, title: &str,
- class: &str) -> fmt::Result {
+fn print_entries(f: &mut Buffer, e: &FxHashSet<ItemEntry>, title: &str, class: &str) {
if !e.is_empty() {
let mut e: Vec<&ItemEntry> = e.iter().collect();
e.sort();
@@ -1787,90 +1759,71 @@
title,
Escape(title),
class,
- e.iter().map(|s| format!("<li>{}</li>", s)).collect::<String>())?;
+ e.iter().map(|s| format!("<li>{}</li>", s)).collect::<String>());
}
- Ok(())
}
-impl fmt::Display for AllTypes {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl AllTypes {
+ fn print(self, f: &mut Buffer) {
write!(f,
-"<h1 class='fqn'>\
- <span class='out-of-band'>\
- <span id='render-detail'>\
- <a id=\"toggle-all-docs\" href=\"javascript:void(0)\" title=\"collapse all docs\">\
- [<span class='inner'>−</span>]\
- </a>\
- </span>
- </span>
- <span class='in-band'>List of all items</span>\
-</h1>")?;
- print_entries(f, &self.structs, "Structs", "structs")?;
- print_entries(f, &self.enums, "Enums", "enums")?;
- print_entries(f, &self.unions, "Unions", "unions")?;
- print_entries(f, &self.primitives, "Primitives", "primitives")?;
- print_entries(f, &self.traits, "Traits", "traits")?;
- print_entries(f, &self.macros, "Macros", "macros")?;
- print_entries(f, &self.attributes, "Attribute Macros", "attributes")?;
- print_entries(f, &self.derives, "Derive Macros", "derives")?;
- print_entries(f, &self.functions, "Functions", "functions")?;
- print_entries(f, &self.typedefs, "Typedefs", "typedefs")?;
- print_entries(f, &self.trait_aliases, "Trait Aliases", "trait-aliases")?;
- print_entries(f, &self.opaque_tys, "Opaque Types", "opaque-types")?;
- print_entries(f, &self.statics, "Statics", "statics")?;
+ "<h1 class='fqn'>\
+ <span class='out-of-band'>\
+ <span id='render-detail'>\
+ <a id=\"toggle-all-docs\" href=\"javascript:void(0)\" title=\"collapse all docs\">\
+ [<span class='inner'>−</span>]\
+ </a>\
+ </span>
+ </span>
+ <span class='in-band'>List of all items</span>\
+ </h1>");
+ print_entries(f, &self.structs, "Structs", "structs");
+ print_entries(f, &self.enums, "Enums", "enums");
+ print_entries(f, &self.unions, "Unions", "unions");
+ print_entries(f, &self.primitives, "Primitives", "primitives");
+ print_entries(f, &self.traits, "Traits", "traits");
+ print_entries(f, &self.macros, "Macros", "macros");
+ print_entries(f, &self.attributes, "Attribute Macros", "attributes");
+ print_entries(f, &self.derives, "Derive Macros", "derives");
+ print_entries(f, &self.functions, "Functions", "functions");
+ print_entries(f, &self.typedefs, "Typedefs", "typedefs");
+ print_entries(f, &self.trait_aliases, "Trait Aliases", "trait-aliases");
+ print_entries(f, &self.opaque_tys, "Opaque Types", "opaque-types");
+ print_entries(f, &self.statics, "Statics", "statics");
print_entries(f, &self.constants, "Constants", "constants")
}
}
-#[derive(Debug)]
-struct Settings<'a> {
+fn settings(root_path: &str, suffix: &str) -> String {
// (id, explanation, default value)
- settings: Vec<(&'static str, &'static str, bool)>,
- root_path: &'a str,
- suffix: &'a str,
-}
-
-impl<'a> Settings<'a> {
- pub fn new(root_path: &'a str, suffix: &'a str) -> Settings<'a> {
- Settings {
- settings: vec![
- ("item-declarations", "Auto-hide item declarations.", true),
- ("item-attributes", "Auto-hide item attributes.", true),
- ("trait-implementations", "Auto-hide trait implementations documentation",
- true),
- ("method-docs", "Auto-hide item methods' documentation", false),
- ("go-to-only-result", "Directly go to item in search if there is only one result",
- false),
- ("line-numbers", "Show line numbers on code examples", false),
- ],
- root_path,
- suffix,
- }
- }
-}
-
-impl<'a> fmt::Display for Settings<'a> {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(f,
+ let settings = [
+ ("item-declarations", "Auto-hide item declarations.", true),
+ ("item-attributes", "Auto-hide item attributes.", true),
+ ("trait-implementations", "Auto-hide trait implementations documentation",
+ true),
+ ("method-docs", "Auto-hide item methods' documentation", false),
+ ("go-to-only-result", "Directly go to item in search if there is only one result",
+ false),
+ ("line-numbers", "Show line numbers on code examples", false),
+ ];
+ format!(
"<h1 class='fqn'>\
- <span class='in-band'>Rustdoc settings</span>\
+ <span class='in-band'>Rustdoc settings</span>\
</h1>\
<div class='settings'>{}</div>\
<script src='{}settings{}.js'></script>",
- self.settings.iter()
- .map(|(id, text, enabled)| {
- format!("<div class='setting-line'>\
- <label class='toggle'>\
- <input type='checkbox' id='{}' {}>\
- <span class='slider'></span>\
- </label>\
- <div>{}</div>\
- </div>", id, if *enabled { " checked" } else { "" }, text)
- })
- .collect::<String>(),
- self.root_path,
- self.suffix)
- }
+ settings.iter()
+ .map(|(id, text, enabled)| {
+ format!("<div class='setting-line'>\
+ <label class='toggle'>\
+ <input type='checkbox' id='{}' {}>\
+ <span class='slider'></span>\
+ </label>\
+ <div>{}</div>\
+ </div>", id, if *enabled { " checked" } else { "" }, text)
+ })
+ .collect::<String>(),
+ root_path,
+ suffix)
}
impl Context {
@@ -1939,18 +1892,12 @@
} else {
String::new()
};
- let mut v = Vec::new();
- try_err!(layout::render(&mut v, &self.shared.layout,
- &page, &sidebar, &all,
- self.shared.css_file_extension.is_some(),
- &self.shared.themes,
- self.shared.generate_search_filter),
- &final_file);
- self.shared.fs.write(&final_file, &v)?;
+ let v = layout::render(&self.shared.layout,
+ &page, sidebar, |buf: &mut Buffer| all.print(buf),
+ &self.shared.themes);
+ self.shared.fs.write(&final_file, v.as_bytes())?;
// Generating settings page.
- let settings = Settings::new(self.shared.static_root_path.as_deref().unwrap_or("./"),
- &self.shared.resource_suffix);
page.title = "Rustdoc settings";
page.description = "Settings of Rustdoc";
page.root_path = "./";
@@ -1958,24 +1905,21 @@
let mut themes = self.shared.themes.clone();
let sidebar = "<p class='location'>Settings</p><div class='sidebar-elems'></div>";
themes.push(PathBuf::from("settings.css"));
- let layout = self.shared.layout.clone();
- let mut v = Vec::new();
- try_err!(layout::render(&mut v, &layout,
- &page, &sidebar, &settings,
- self.shared.css_file_extension.is_some(),
- &themes,
- self.shared.generate_search_filter),
- &settings_file);
- self.shared.fs.write(&settings_file, &v)?;
+ let v = layout::render(
+ &self.shared.layout,
+ &page, sidebar, settings(
+ self.shared.static_root_path.as_deref().unwrap_or("./"),
+ &self.shared.resource_suffix
+ ),
+ &themes);
+ self.shared.fs.write(&settings_file, v.as_bytes())?;
Ok(())
}
fn render_item(&self,
- writer: &mut dyn io::Write,
it: &clean::Item,
- pushname: bool)
- -> io::Result<()> {
+ pushname: bool) -> String {
// A little unfortunate that this is done like this, but it sure
// does make formatting *a lot* nicer.
CURRENT_DEPTH.with(|slot| {
@@ -2022,12 +1966,10 @@
}
if !self.render_redirect_pages {
- layout::render(writer, &self.shared.layout, &page,
- &Sidebar{ cx: self, item: it },
- &Item{ cx: self, item: it },
- self.shared.css_file_extension.is_some(),
- &self.shared.themes,
- self.shared.generate_search_filter)?;
+ layout::render(&self.shared.layout, &page,
+ |buf: &mut _| print_sidebar(self, it, buf),
+ |buf: &mut _| print_item(self, it, buf),
+ &self.shared.themes)
} else {
let mut url = self.root_path();
if let Some(&(ref names, ty)) = cache().paths.get(&it.def_id) {
@@ -2036,10 +1978,11 @@
url.push_str("/");
}
url.push_str(&item_path(ty, names.last().unwrap()));
- layout::redirect(writer, &url)?;
+ layout::redirect(&url)
+ } else {
+ String::new()
}
}
- Ok(())
}
/// Non-parallelized version of rendering an item. This will take the input
@@ -2075,13 +2018,12 @@
info!("Recursing into {}", self.dst.display());
- let mut buf = Vec::new();
- self.render_item(&mut buf, &item, false).unwrap();
+ let buf = self.render_item(&item, false);
// buf will be empty if the module is stripped and there is no redirect for it
if !buf.is_empty() {
self.shared.ensure_dir(&self.dst)?;
let joint_dst = self.dst.join("index.html");
- scx.fs.write(&joint_dst, buf)?;
+ scx.fs.write(&joint_dst, buf.as_bytes())?;
}
let m = match item.inner {
@@ -2094,9 +2036,7 @@
if !self.render_redirect_pages {
let items = self.build_sidebar_items(&m);
let js_dst = self.dst.join("sidebar-items.js");
- let mut v = Vec::new();
- try_err!(write!(&mut v, "initSidebarItems({});",
- as_json(&items)), &js_dst);
+ let v = format!("initSidebarItems({});", as_json(&items));
scx.fs.write(&js_dst, &v)?;
}
@@ -2110,8 +2050,7 @@
self.dst = prev;
self.current.pop().unwrap();
} else if item.name.is_some() {
- let mut buf = Vec::new();
- self.render_item(&mut buf, &item, true).unwrap();
+ let buf = self.render_item(&item, true);
// buf will be empty if the item is stripped and there is no redirect for it
if !buf.is_empty() {
let name = item.name.as_ref().unwrap();
@@ -2119,7 +2058,7 @@
let file_name = &item_path(item_type, name);
self.shared.ensure_dir(&self.dst)?;
let joint_dst = self.dst.join(file_name);
- self.shared.fs.write(&joint_dst, buf)?;
+ self.shared.fs.write(&joint_dst, buf.as_bytes())?;
if !self.render_redirect_pages {
all.append(full_path(self, &item), &item_type);
@@ -2129,18 +2068,16 @@
// URL for the page.
let redir_name = format!("{}.{}.html", name, item_type.name_space());
let redir_dst = self.dst.join(redir_name);
- let mut v = Vec::new();
- try_err!(layout::redirect(&mut v, file_name), &redir_dst);
- self.shared.fs.write(&redir_dst, &v)?;
+ let v = layout::redirect(file_name);
+ self.shared.fs.write(&redir_dst, v.as_bytes())?;
}
// If the item is a macro, redirect from the old macro URL (with !)
// to the new one (without).
if item_type == ItemType::Macro {
let redir_name = format!("{}.{}!.html", item_type, name);
let redir_dst = self.dst.join(redir_name);
- let mut v = Vec::new();
- try_err!(layout::redirect(&mut v, file_name), &redir_dst);
- self.shared.fs.write(&redir_dst, &v)?;
+ let v = layout::redirect(file_name);
+ self.shared.fs.write(&redir_dst, v.as_bytes())?;
}
}
}
@@ -2172,7 +2109,7 @@
}
}
-impl<'a> Item<'a> {
+impl Context {
/// Generates a url appropriate for an `href` attribute back to the source of
/// this item.
///
@@ -2182,26 +2119,26 @@
/// If `None` is returned, then a source link couldn't be generated. This
/// may happen, for example, with externally inlined items where the source
/// of their crate documentation isn't known.
- fn src_href(&self) -> Option<String> {
- let mut root = self.cx.root_path();
+ fn src_href(&self, item: &clean::Item) -> Option<String> {
+ let mut root = self.root_path();
let cache = cache();
let mut path = String::new();
// We can safely ignore macros from other libraries
- let file = match self.item.source.filename {
+ let file = match item.source.filename {
FileName::Real(ref path) => path,
_ => return None,
};
- let (krate, path) = if self.item.def_id.is_local() {
- if let Some(path) = self.cx.shared.local_sources.get(file) {
- (&self.cx.shared.layout.krate, path)
+ let (krate, path) = if item.def_id.is_local() {
+ if let Some(path) = self.shared.local_sources.get(file) {
+ (&self.shared.layout.krate, path)
} else {
return None;
}
} else {
- let (krate, src_root) = match *cache.extern_locations.get(&self.item.def_id.krate)? {
+ let (krate, src_root) = match *cache.extern_locations.get(&item.def_id.krate)? {
(ref name, ref src, Local) => (name, src),
(ref name, ref src, Remote(ref s)) => {
root = s.to_string();
@@ -2221,10 +2158,10 @@
(krate, &path)
};
- let lines = if self.item.source.loline == self.item.source.hiline {
- self.item.source.loline.to_string()
+ let lines = if item.source.loline == item.source.hiline {
+ item.source.loline.to_string()
} else {
- format!("{}-{}", self.item.source.loline, self.item.source.hiline)
+ format!("{}-{}", item.source.loline, item.source.hiline)
};
Some(format!("{root}src/{krate}/{path}#{lines}",
root = Escape(&root),
@@ -2234,114 +2171,113 @@
}
}
-fn wrap_into_docblock<F>(w: &mut fmt::Formatter<'_>,
- f: F) -> fmt::Result
-where F: Fn(&mut fmt::Formatter<'_>) -> fmt::Result {
- write!(w, "<div class=\"docblock type-decl hidden-by-usual-hider\">")?;
- f(w)?;
+fn wrap_into_docblock<F>(w: &mut Buffer, f: F)
+ where F: FnOnce(&mut Buffer)
+{
+ write!(w, "<div class=\"docblock type-decl hidden-by-usual-hider\">");
+ f(w);
write!(w, "</div>")
}
-impl<'a> fmt::Display for Item<'a> {
- fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
- debug_assert!(!self.item.is_stripped());
- // Write the breadcrumb trail header for the top
- write!(fmt, "<h1 class='fqn'><span class='out-of-band'>")?;
- if let Some(version) = self.item.stable_since() {
- write!(fmt, "<span class='since' title='Stable since Rust version {0}'>{0}</span>",
- version)?;
- }
- write!(fmt,
- "<span id='render-detail'>\
- <a id=\"toggle-all-docs\" href=\"javascript:void(0)\" \
- title=\"collapse all docs\">\
- [<span class='inner'>−</span>]\
- </a>\
- </span>")?;
+fn print_item(cx: &Context, item: &clean::Item, buf: &mut Buffer) {
+ debug_assert!(!item.is_stripped());
+ // Write the breadcrumb trail header for the top
+ write!(buf, "<h1 class='fqn'><span class='out-of-band'>");
+ if let Some(version) = item.stable_since() {
+ write!(buf, "<span class='since' title='Stable since Rust version {0}'>{0}</span>",
+ version);
+ }
+ write!(buf,
+ "<span id='render-detail'>\
+ <a id=\"toggle-all-docs\" href=\"javascript:void(0)\" \
+ title=\"collapse all docs\">\
+ [<span class='inner'>−</span>]\
+ </a>\
+ </span>");
- // Write `src` tag
- //
- // When this item is part of a `pub use` in a downstream crate, the
- // [src] link in the downstream documentation will actually come back to
- // this page, and this link will be auto-clicked. The `id` attribute is
- // used to find the link to auto-click.
- if self.cx.shared.include_sources && !self.item.is_primitive() {
- if let Some(l) = self.src_href() {
- write!(fmt, "<a class='srclink' href='{}' title='{}'>[src]</a>",
- l, "goto source code")?;
- }
+ // Write `src` tag
+ //
+ // When this item is part of a `pub use` in a downstream crate, the
+ // [src] link in the downstream documentation will actually come back to
+ // this page, and this link will be auto-clicked. The `id` attribute is
+ // used to find the link to auto-click.
+ if cx.shared.include_sources && !item.is_primitive() {
+ if let Some(l) = cx.src_href(item) {
+ write!(buf, "<a class='srclink' href='{}' title='{}'>[src]</a>",
+ l, "goto source code");
}
+ }
- write!(fmt, "</span>")?; // out-of-band
- write!(fmt, "<span class='in-band'>")?;
- match self.item.inner {
- clean::ModuleItem(ref m) => if m.is_crate {
- write!(fmt, "Crate ")?;
- } else {
- write!(fmt, "Module ")?;
- },
- clean::FunctionItem(..) | clean::ForeignFunctionItem(..) => write!(fmt, "Function ")?,
- clean::TraitItem(..) => write!(fmt, "Trait ")?,
- clean::StructItem(..) => write!(fmt, "Struct ")?,
- clean::UnionItem(..) => write!(fmt, "Union ")?,
- clean::EnumItem(..) => write!(fmt, "Enum ")?,
- clean::TypedefItem(..) => write!(fmt, "Type Definition ")?,
- clean::MacroItem(..) => write!(fmt, "Macro ")?,
- clean::ProcMacroItem(ref mac) => match mac.kind {
- MacroKind::Bang => write!(fmt, "Macro ")?,
- MacroKind::Attr => write!(fmt, "Attribute Macro ")?,
- MacroKind::Derive => write!(fmt, "Derive Macro ")?,
- }
- clean::PrimitiveItem(..) => write!(fmt, "Primitive Type ")?,
- clean::StaticItem(..) | clean::ForeignStaticItem(..) => write!(fmt, "Static ")?,
- clean::ConstantItem(..) => write!(fmt, "Constant ")?,
- clean::ForeignTypeItem => write!(fmt, "Foreign Type ")?,
- clean::KeywordItem(..) => write!(fmt, "Keyword ")?,
- clean::OpaqueTyItem(..) => write!(fmt, "Opaque Type ")?,
- clean::TraitAliasItem(..) => write!(fmt, "Trait Alias ")?,
- _ => {
- // We don't generate pages for any other type.
- unreachable!();
- }
+ write!(buf, "</span>"); // out-of-band
+ write!(buf, "<span class='in-band'>");
+ let name = match item.inner {
+ clean::ModuleItem(ref m) => if m.is_crate {
+ "Crate "
+ } else {
+ "Module "
+ },
+ clean::FunctionItem(..) | clean::ForeignFunctionItem(..) => "Function ",
+ clean::TraitItem(..) => "Trait ",
+ clean::StructItem(..) => "Struct ",
+ clean::UnionItem(..) => "Union ",
+ clean::EnumItem(..) => "Enum ",
+ clean::TypedefItem(..) => "Type Definition ",
+ clean::MacroItem(..) => "Macro ",
+ clean::ProcMacroItem(ref mac) => match mac.kind {
+ MacroKind::Bang => "Macro ",
+ MacroKind::Attr => "Attribute Macro ",
+ MacroKind::Derive => "Derive Macro ",
}
- if !self.item.is_primitive() && !self.item.is_keyword() {
- let cur = &self.cx.current;
- let amt = if self.item.is_mod() { cur.len() - 1 } else { cur.len() };
- for (i, component) in cur.iter().enumerate().take(amt) {
- write!(fmt, "<a href='{}index.html'>{}</a>::<wbr>",
- "../".repeat(cur.len() - i - 1),
- component)?;
- }
+ clean::PrimitiveItem(..) => "Primitive Type ",
+ clean::StaticItem(..) | clean::ForeignStaticItem(..) => "Static ",
+ clean::ConstantItem(..) => "Constant ",
+ clean::ForeignTypeItem => "Foreign Type ",
+ clean::KeywordItem(..) => "Keyword ",
+ clean::OpaqueTyItem(..) => "Opaque Type ",
+ clean::TraitAliasItem(..) => "Trait Alias ",
+ _ => {
+ // We don't generate pages for any other type.
+ unreachable!();
}
- write!(fmt, "<a class=\"{}\" href=''>{}</a>",
- self.item.type_(), self.item.name.as_ref().unwrap())?;
+ };
+ buf.write_str(name);
+ if !item.is_primitive() && !item.is_keyword() {
+ let cur = &cx.current;
+ let amt = if item.is_mod() { cur.len() - 1 } else { cur.len() };
+ for (i, component) in cur.iter().enumerate().take(amt) {
+ write!(buf, "<a href='{}index.html'>{}</a>::<wbr>",
+ "../".repeat(cur.len() - i - 1),
+ component);
+ }
+ }
+ write!(buf, "<a class=\"{}\" href=''>{}</a>",
+ item.type_(), item.name.as_ref().unwrap());
- write!(fmt, "</span></h1>")?; // in-band
+ write!(buf, "</span></h1>"); // in-band
- match self.item.inner {
- clean::ModuleItem(ref m) =>
- item_module(fmt, self.cx, self.item, &m.items),
- clean::FunctionItem(ref f) | clean::ForeignFunctionItem(ref f) =>
- item_function(fmt, self.cx, self.item, f),
- clean::TraitItem(ref t) => item_trait(fmt, self.cx, self.item, t),
- clean::StructItem(ref s) => item_struct(fmt, self.cx, self.item, s),
- clean::UnionItem(ref s) => item_union(fmt, self.cx, self.item, s),
- clean::EnumItem(ref e) => item_enum(fmt, self.cx, self.item, e),
- clean::TypedefItem(ref t, _) => item_typedef(fmt, self.cx, self.item, t),
- clean::MacroItem(ref m) => item_macro(fmt, self.cx, self.item, m),
- clean::ProcMacroItem(ref m) => item_proc_macro(fmt, self.cx, self.item, m),
- clean::PrimitiveItem(ref p) => item_primitive(fmt, self.cx, self.item, p),
- clean::StaticItem(ref i) | clean::ForeignStaticItem(ref i) =>
- item_static(fmt, self.cx, self.item, i),
- clean::ConstantItem(ref c) => item_constant(fmt, self.cx, self.item, c),
- clean::ForeignTypeItem => item_foreign_type(fmt, self.cx, self.item),
- clean::KeywordItem(ref k) => item_keyword(fmt, self.cx, self.item, k),
- clean::OpaqueTyItem(ref e, _) => item_opaque_ty(fmt, self.cx, self.item, e),
- clean::TraitAliasItem(ref ta) => item_trait_alias(fmt, self.cx, self.item, ta),
- _ => {
- // We don't generate pages for any other type.
- unreachable!();
- }
+ match item.inner {
+ clean::ModuleItem(ref m) =>
+ item_module(buf, cx, item, &m.items),
+ clean::FunctionItem(ref f) | clean::ForeignFunctionItem(ref f) =>
+ item_function(buf, cx, item, f),
+ clean::TraitItem(ref t) => item_trait(buf, cx, item, t),
+ clean::StructItem(ref s) => item_struct(buf, cx, item, s),
+ clean::UnionItem(ref s) => item_union(buf, cx, item, s),
+ clean::EnumItem(ref e) => item_enum(buf, cx, item, e),
+ clean::TypedefItem(ref t, _) => item_typedef(buf, cx, item, t),
+ clean::MacroItem(ref m) => item_macro(buf, cx, item, m),
+ clean::ProcMacroItem(ref m) => item_proc_macro(buf, cx, item, m),
+ clean::PrimitiveItem(ref p) => item_primitive(buf, cx, item, p),
+ clean::StaticItem(ref i) | clean::ForeignStaticItem(ref i) =>
+ item_static(buf, cx, item, i),
+ clean::ConstantItem(ref c) => item_constant(buf, cx, item, c),
+ clean::ForeignTypeItem => item_foreign_type(buf, cx, item),
+ clean::KeywordItem(ref k) => item_keyword(buf, cx, item, k),
+ clean::OpaqueTyItem(ref e, _) => item_opaque_ty(buf, cx, item, e),
+ clean::TraitAliasItem(ref ta) => item_trait_alias(buf, cx, item, ta),
+ _ => {
+ // We don't generate pages for any other type.
+ unreachable!();
}
}
}
@@ -2395,24 +2331,23 @@
}
}
-fn document(w: &mut fmt::Formatter<'_>, cx: &Context, item: &clean::Item) -> fmt::Result {
+fn document(w: &mut Buffer, cx: &Context, item: &clean::Item) {
if let Some(ref name) = item.name {
info!("Documenting {}", name);
}
- document_stability(w, cx, item, false)?;
- document_full(w, item, cx, "", false)?;
- Ok(())
+ document_stability(w, cx, item, false);
+ document_full(w, item, cx, "", false);
}
/// Render md_text as markdown.
fn render_markdown(
- w: &mut fmt::Formatter<'_>,
+ w: &mut Buffer,
cx: &Context,
md_text: &str,
links: Vec<(String, String)>,
prefix: &str,
is_hidden: bool,
-) -> fmt::Result {
+) {
let mut ids = cx.id_map.borrow_mut();
write!(w, "<div class='docblock{}'>{}{}</div>",
if is_hidden { " hidden" } else { "" },
@@ -2422,13 +2357,13 @@
}
fn document_short(
- w: &mut fmt::Formatter<'_>,
+ w: &mut Buffer,
cx: &Context,
item: &clean::Item,
link: AssocItemLink<'_>,
prefix: &str,
is_hidden: bool,
-) -> fmt::Result {
+) {
if let Some(s) = item.doc_value() {
let markdown = if s.contains('\n') {
format!("{} [Read more]({})",
@@ -2436,46 +2371,41 @@
} else {
plain_summary_line(Some(s))
};
- render_markdown(w, cx, &markdown, item.links(), prefix, is_hidden)?;
+ render_markdown(w, cx, &markdown, item.links(), prefix, is_hidden);
} else if !prefix.is_empty() {
write!(w, "<div class='docblock{}'>{}</div>",
if is_hidden { " hidden" } else { "" },
- prefix)?;
+ prefix);
}
- Ok(())
}
-fn document_full(w: &mut fmt::Formatter<'_>, item: &clean::Item,
- cx: &Context, prefix: &str, is_hidden: bool) -> fmt::Result {
+fn document_full(w: &mut Buffer, item: &clean::Item, cx: &Context, prefix: &str, is_hidden: bool) {
if let Some(s) = cx.shared.maybe_collapsed_doc_value(item) {
debug!("Doc block: =====\n{}\n=====", s);
- render_markdown(w, cx, &*s, item.links(), prefix, is_hidden)?;
+ render_markdown(w, cx, &*s, item.links(), prefix, is_hidden);
} else if !prefix.is_empty() {
write!(w, "<div class='docblock{}'>{}</div>",
if is_hidden { " hidden" } else { "" },
- prefix)?;
+ prefix);
}
- Ok(())
}
-fn document_stability(w: &mut fmt::Formatter<'_>, cx: &Context, item: &clean::Item,
- is_hidden: bool) -> fmt::Result {
+fn document_stability(w: &mut Buffer, cx: &Context, item: &clean::Item, is_hidden: bool) {
let stabilities = short_stability(item, cx);
if !stabilities.is_empty() {
- write!(w, "<div class='stability{}'>", if is_hidden { " hidden" } else { "" })?;
+ write!(w, "<div class='stability{}'>", if is_hidden { " hidden" } else { "" });
for stability in stabilities {
- write!(w, "{}", stability)?;
+ write!(w, "{}", stability);
}
- write!(w, "</div>")?;
+ write!(w, "</div>");
}
- Ok(())
}
fn document_non_exhaustive_header(item: &clean::Item) -> &str {
if item.is_non_exhaustive() { " (Non-exhaustive)" } else { "" }
}
-fn document_non_exhaustive(w: &mut fmt::Formatter<'_>, item: &clean::Item) -> fmt::Result {
+fn document_non_exhaustive(w: &mut Buffer, item: &clean::Item) {
if item.is_non_exhaustive() {
write!(w, "<div class='docblock non-exhaustive non-exhaustive-{}'>", {
if item.is_struct() {
@@ -2487,31 +2417,29 @@
} else {
"type"
}
- })?;
+ });
if item.is_struct() {
write!(w, "Non-exhaustive structs could have additional fields added in future. \
Therefore, non-exhaustive structs cannot be constructed in external crates \
using the traditional <code>Struct {{ .. }}</code> syntax; cannot be \
matched against without a wildcard <code>..</code>; and \
- struct update syntax will not work.")?;
+ struct update syntax will not work.");
} else if item.is_enum() {
write!(w, "Non-exhaustive enums could have additional variants added in future. \
Therefore, when matching against variants of non-exhaustive enums, an \
- extra wildcard arm must be added to account for any future variants.")?;
+ extra wildcard arm must be added to account for any future variants.");
} else if item.is_variant() {
write!(w, "Non-exhaustive enum variants could have additional fields added in future. \
Therefore, non-exhaustive enum variants cannot be constructed in external \
- crates and cannot be matched against.")?;
+ crates and cannot be matched against.");
} else {
write!(w, "This type will require a wildcard arm in any match statements or \
- constructors.")?;
+ constructors.");
}
- write!(w, "</div>")?;
+ write!(w, "</div>");
}
-
- Ok(())
}
fn name_key(name: &str) -> (&str, u64, usize) {
@@ -2535,9 +2463,8 @@
}
}
-fn item_module(w: &mut fmt::Formatter<'_>, cx: &Context,
- item: &clean::Item, items: &[clean::Item]) -> fmt::Result {
- document(w, cx, item)?;
+fn item_module(w: &mut Buffer, cx: &Context, item: &clean::Item, items: &[clean::Item]) {
+ document(w, cx, item);
let mut indices = (0..items.len()).filter(|i| !items[*i].is_stripped()).collect::<Vec<usize>>();
@@ -2628,13 +2555,13 @@
curty = myty;
} else if myty != curty {
if curty.is_some() {
- write!(w, "</table>")?;
+ write!(w, "</table>");
}
curty = myty;
let (short, name) = item_ty_to_strs(&myty.unwrap());
write!(w, "<h2 id='{id}' class='section-header'>\
<a href=\"#{id}\">{name}</a></h2>\n<table>",
- id = cx.derive_id(short.to_owned()), name = name)?;
+ id = cx.derive_id(short.to_owned()), name = name);
}
match myitem.inner {
@@ -2646,20 +2573,20 @@
write!(w, "<tr><td><code>{}extern crate {} as {};",
VisSpace(&myitem.visibility),
anchor(myitem.def_id, src),
- name)?
+ name)
}
None => {
write!(w, "<tr><td><code>{}extern crate {};",
VisSpace(&myitem.visibility),
- anchor(myitem.def_id, name))?
+ anchor(myitem.def_id, name))
}
}
- write!(w, "</code></td></tr>")?;
+ write!(w, "</code></td></tr>");
}
clean::ImportItem(ref import) => {
write!(w, "<tr><td><code>{}{}</code></td></tr>",
- VisSpace(&myitem.visibility), *import)?;
+ VisSpace(&myitem.visibility), *import);
}
_ => {
@@ -2704,15 +2631,14 @@
})
.collect::<Vec<_>>()
.join(" "),
- )?;
+ );
}
}
}
if curty.is_some() {
- write!(w, "</table>")?;
+ write!(w, "</table>");
}
- Ok(())
}
/// Render the stability and deprecation tags that are displayed in the item's summary at the
@@ -2861,33 +2787,30 @@
stability
}
-fn item_constant(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- c: &clean::Constant) -> fmt::Result {
- write!(w, "<pre class='rust const'>")?;
- render_attributes(w, it, false)?;
+fn item_constant(w: &mut Buffer, cx: &Context, it: &clean::Item, c: &clean::Constant) {
+ write!(w, "<pre class='rust const'>");
+ render_attributes(w, it, false);
write!(w, "{vis}const \
{name}: {typ}</pre>",
vis = VisSpace(&it.visibility),
name = it.name.as_ref().unwrap(),
- typ = c.type_)?;
+ typ = c.type_);
document(w, cx, it)
}
-fn item_static(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- s: &clean::Static) -> fmt::Result {
- write!(w, "<pre class='rust static'>")?;
- render_attributes(w, it, false)?;
+fn item_static(w: &mut Buffer, cx: &Context, it: &clean::Item, s: &clean::Static) {
+ write!(w, "<pre class='rust static'>");
+ render_attributes(w, it, false);
write!(w, "{vis}static {mutability}\
{name}: {typ}</pre>",
vis = VisSpace(&it.visibility),
mutability = MutableSpace(s.mutability),
name = it.name.as_ref().unwrap(),
- typ = s.type_)?;
+ typ = s.type_);
document(w, cx, it)
}
-fn item_function(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- f: &clean::Function) -> fmt::Result {
+fn item_function(w: &mut Buffer, cx: &Context, it: &clean::Item, f: &clean::Function) {
let header_len = format!(
"{}{}{}{}{:#}fn {}{:#}",
VisSpace(&it.visibility),
@@ -2898,8 +2821,8 @@
it.name.as_ref().unwrap(),
f.generics
).len();
- write!(w, "{}<pre class='rust fn'>", render_spotlight_traits(it)?)?;
- render_attributes(w, it, false)?;
+ write!(w, "{}<pre class='rust fn'>", render_spotlight_traits(it));
+ render_attributes(w, it, false);
write!(w,
"{vis}{constness}{unsafety}{asyncness}{abi}fn \
{name}{generics}{decl}{where_clause}</pre>",
@@ -2916,12 +2839,12 @@
header_len,
indent: 0,
asyncness: f.header.asyncness,
- })?;
+ });
document(w, cx, it)
}
-fn render_implementor(cx: &Context, implementor: &Impl, w: &mut fmt::Formatter<'_>,
- implementor_dups: &FxHashMap<&str, (DefId, bool)>) -> fmt::Result {
+fn render_implementor(cx: &Context, implementor: &Impl, w: &mut Buffer,
+ implementor_dups: &FxHashMap<&str, (DefId, bool)>) {
// If there's already another implementor that has the same abbridged name, use the
// full path, for example in `std::iter::ExactSizeIterator`
let use_absolute = match implementor.inner_impl().for_ {
@@ -2933,20 +2856,18 @@
_ => false,
};
render_impl(w, cx, implementor, AssocItemLink::Anchor(None), RenderMode::Normal,
- implementor.impl_item.stable_since(), false, Some(use_absolute), false, false)?;
- Ok(())
+ implementor.impl_item.stable_since(), false, Some(use_absolute), false, false);
}
-fn render_impls(cx: &Context, w: &mut fmt::Formatter<'_>,
+fn render_impls(cx: &Context, w: &mut Buffer,
traits: &[&&Impl],
- containing_item: &clean::Item) -> fmt::Result {
+ containing_item: &clean::Item) {
for i in traits {
let did = i.trait_did().unwrap();
let assoc_link = AssocItemLink::GotoSource(did, &i.inner_impl().provided_trait_methods);
render_impl(w, cx, i, assoc_link,
- RenderMode::Normal, containing_item.stable_since(), true, None, false, true)?;
+ RenderMode::Normal, containing_item.stable_since(), true, None, false, true);
}
- Ok(())
}
fn bounds(t_bounds: &[clean::GenericBound], trait_alias: bool) -> String {
@@ -2974,11 +2895,11 @@
}
fn item_trait(
- w: &mut fmt::Formatter<'_>,
+ w: &mut Buffer,
cx: &Context,
it: &clean::Item,
t: &clean::Trait,
-) -> fmt::Result {
+) {
let bounds = bounds(&t.bounds, false);
let types = t.items.iter().filter(|m| m.is_associated_type()).collect::<Vec<_>>();
let consts = t.items.iter().filter(|m| m.is_associated_const()).collect::<Vec<_>>();
@@ -2987,146 +2908,144 @@
// Output the trait definition
wrap_into_docblock(w, |w| {
- write!(w, "<pre class='rust trait'>")?;
- render_attributes(w, it, true)?;
+ write!(w, "<pre class='rust trait'>");
+ render_attributes(w, it, true);
write!(w, "{}{}{}trait {}{}{}",
VisSpace(&it.visibility),
UnsafetySpace(t.unsafety),
if t.is_auto { "auto " } else { "" },
it.name.as_ref().unwrap(),
t.generics,
- bounds)?;
+ bounds);
if !t.generics.where_predicates.is_empty() {
- write!(w, "{}", WhereClause { gens: &t.generics, indent: 0, end_newline: true })?;
+ write!(w, "{}", WhereClause { gens: &t.generics, indent: 0, end_newline: true });
} else {
- write!(w, " ")?;
+ write!(w, " ");
}
if t.items.is_empty() {
- write!(w, "{{ }}")?;
+ write!(w, "{{ }}");
} else {
// FIXME: we should be using a derived_id for the Anchors here
- write!(w, "{{\n")?;
+ write!(w, "{{\n");
for t in &types {
- render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait)?;
- write!(w, ";\n")?;
+ render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait);
+ write!(w, ";\n");
}
if !types.is_empty() && !consts.is_empty() {
- w.write_str("\n")?;
+ w.write_str("\n");
}
for t in &consts {
- render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait)?;
- write!(w, ";\n")?;
+ render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait);
+ write!(w, ";\n");
}
if !consts.is_empty() && !required.is_empty() {
- w.write_str("\n")?;
+ w.write_str("\n");
}
for (pos, m) in required.iter().enumerate() {
- render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait)?;
- write!(w, ";\n")?;
+ render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait);
+ write!(w, ";\n");
if pos < required.len() - 1 {
- write!(w, "<div class='item-spacer'></div>")?;
+ write!(w, "<div class='item-spacer'></div>");
}
}
if !required.is_empty() && !provided.is_empty() {
- w.write_str("\n")?;
+ w.write_str("\n");
}
for (pos, m) in provided.iter().enumerate() {
- render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait)?;
+ render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait);
match m.inner {
clean::MethodItem(ref inner) if !inner.generics.where_predicates.is_empty() => {
- write!(w, ",\n {{ ... }}\n")?;
+ write!(w, ",\n {{ ... }}\n");
},
_ => {
- write!(w, " {{ ... }}\n")?;
+ write!(w, " {{ ... }}\n");
},
}
if pos < provided.len() - 1 {
- write!(w, "<div class='item-spacer'></div>")?;
+ write!(w, "<div class='item-spacer'></div>");
}
}
- write!(w, "}}")?;
+ write!(w, "}}");
}
write!(w, "</pre>")
- })?;
+ });
// Trait documentation
- document(w, cx, it)?;
+ document(w, cx, it);
fn write_small_section_header(
- w: &mut fmt::Formatter<'_>,
+ w: &mut Buffer,
id: &str,
title: &str,
extra_content: &str,
- ) -> fmt::Result {
+ ) {
write!(w, "
<h2 id='{0}' class='small-section-header'>\
{1}<a href='#{0}' class='anchor'></a>\
</h2>{2}", id, title, extra_content)
}
- fn write_loading_content(w: &mut fmt::Formatter<'_>, extra_content: &str) -> fmt::Result {
+ fn write_loading_content(w: &mut Buffer, extra_content: &str) {
write!(w, "{}<span class='loading-content'>Loading content...</span>", extra_content)
}
- fn trait_item(w: &mut fmt::Formatter<'_>, cx: &Context, m: &clean::Item, t: &clean::Item)
- -> fmt::Result {
+ fn trait_item(w: &mut Buffer, cx: &Context, m: &clean::Item, t: &clean::Item) {
let name = m.name.as_ref().unwrap();
let item_type = m.type_();
let id = cx.derive_id(format!("{}.{}", item_type, name));
let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
write!(w, "<h3 id='{id}' class='method'>{extra}<code id='{ns_id}'>",
- extra = render_spotlight_traits(m)?,
+ extra = render_spotlight_traits(m),
id = id,
- ns_id = ns_id)?;
- render_assoc_item(w, m, AssocItemLink::Anchor(Some(&id)), ItemType::Impl)?;
- write!(w, "</code>")?;
- render_stability_since(w, m, t)?;
- write!(w, "</h3>")?;
- document(w, cx, m)?;
- Ok(())
+ ns_id = ns_id);
+ render_assoc_item(w, m, AssocItemLink::Anchor(Some(&id)), ItemType::Impl);
+ write!(w, "</code>");
+ render_stability_since(w, m, t);
+ write!(w, "</h3>");
+ document(w, cx, m);
}
if !types.is_empty() {
write_small_section_header(w, "associated-types", "Associated Types",
- "<div class='methods'>")?;
+ "<div class='methods'>");
for t in &types {
- trait_item(w, cx, *t, it)?;
+ trait_item(w, cx, *t, it);
}
- write_loading_content(w, "</div>")?;
+ write_loading_content(w, "</div>");
}
if !consts.is_empty() {
write_small_section_header(w, "associated-const", "Associated Constants",
- "<div class='methods'>")?;
+ "<div class='methods'>");
for t in &consts {
- trait_item(w, cx, *t, it)?;
+ trait_item(w, cx, *t, it);
}
- write_loading_content(w, "</div>")?;
+ write_loading_content(w, "</div>");
}
// Output the documentation for each function individually
if !required.is_empty() {
write_small_section_header(w, "required-methods", "Required methods",
- "<div class='methods'>")?;
+ "<div class='methods'>");
for m in &required {
- trait_item(w, cx, *m, it)?;
+ trait_item(w, cx, *m, it);
}
- write_loading_content(w, "</div>")?;
+ write_loading_content(w, "</div>");
}
if !provided.is_empty() {
write_small_section_header(w, "provided-methods", "Provided methods",
- "<div class='methods'>")?;
+ "<div class='methods'>");
for m in &provided {
- trait_item(w, cx, *m, it)?;
+ trait_item(w, cx, *m, it);
}
- write_loading_content(w, "</div>")?;
+ write_loading_content(w, "</div>");
}
// If there are methods directly on this trait object, render them here.
- render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)?;
+ render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All);
let cache = cache();
@@ -3165,7 +3084,7 @@
concrete.sort_by(compare_impl);
if !foreign.is_empty() {
- write_small_section_header(w, "foreign-impls", "Implementations on Foreign Types", "")?;
+ write_small_section_header(w, "foreign-impls", "Implementations on Foreign Types", "");
for implementor in foreign {
let assoc_link = AssocItemLink::GotoSource(
@@ -3174,44 +3093,44 @@
);
render_impl(w, cx, &implementor, assoc_link,
RenderMode::Normal, implementor.impl_item.stable_since(), false,
- None, true, false)?;
+ None, true, false);
}
- write_loading_content(w, "")?;
+ write_loading_content(w, "");
}
write_small_section_header(w, "implementors", "Implementors",
- "<div class='item-list' id='implementors-list'>")?;
+ "<div class='item-list' id='implementors-list'>");
for implementor in concrete {
- render_implementor(cx, implementor, w, &implementor_dups)?;
+ render_implementor(cx, implementor, w, &implementor_dups);
}
- write_loading_content(w, "</div>")?;
+ write_loading_content(w, "</div>");
if t.auto {
write_small_section_header(w, "synthetic-implementors", "Auto implementors",
- "<div class='item-list' id='synthetic-implementors-list'>")?;
+ "<div class='item-list' id='synthetic-implementors-list'>");
for implementor in synthetic {
synthetic_types.extend(
collect_paths_for_type(implementor.inner_impl().for_.clone())
);
- render_implementor(cx, implementor, w, &implementor_dups)?;
+ render_implementor(cx, implementor, w, &implementor_dups);
}
- write_loading_content(w, "</div>")?;
+ write_loading_content(w, "</div>");
}
} else {
// even without any implementations to write in, we still want the heading and list, so the
// implementors javascript file pulled in below has somewhere to write the impls into
write_small_section_header(w, "implementors", "Implementors",
- "<div class='item-list' id='implementors-list'>")?;
- write_loading_content(w, "</div>")?;
+ "<div class='item-list' id='implementors-list'>");
+ write_loading_content(w, "</div>");
if t.auto {
write_small_section_header(w, "synthetic-implementors", "Auto implementors",
- "<div class='item-list' id='synthetic-implementors-list'>")?;
- write_loading_content(w, "</div>")?;
+ "<div class='item-list' id='synthetic-implementors-list'>");
+ write_loading_content(w, "</div>");
}
}
write!(w, r#"<script type="text/javascript">window.inlined_types=new Set({});</script>"#,
- as_json(&synthetic_types))?;
+ as_json(&synthetic_types));
write!(w, r#"<script type="text/javascript" async
src="{root_path}/implementors/{path}/{ty}.{name}.js">
@@ -3224,8 +3143,7 @@
path[..path.len() - 1].join("/")
},
ty = it.type_().css_class(),
- name = *it.name.as_ref().unwrap())?;
- Ok(())
+ name = *it.name.as_ref().unwrap());
}
fn naive_assoc_href(it: &clean::Item, link: AssocItemLink<'_>) -> String {
@@ -3247,70 +3165,60 @@
}
}
-fn assoc_const(w: &mut fmt::Formatter<'_>,
+fn assoc_const(w: &mut Buffer,
it: &clean::Item,
ty: &clean::Type,
_default: Option<&String>,
link: AssocItemLink<'_>,
- extra: &str) -> fmt::Result {
+ extra: &str) {
write!(w, "{}{}const <a href='{}' class=\"constant\"><b>{}</b></a>: {}",
extra,
VisSpace(&it.visibility),
naive_assoc_href(it, link),
it.name.as_ref().unwrap(),
- ty)?;
- Ok(())
+ ty);
}
-fn assoc_type<W: fmt::Write>(w: &mut W, it: &clean::Item,
- bounds: &[clean::GenericBound],
- default: Option<&clean::Type>,
- link: AssocItemLink<'_>,
- extra: &str) -> fmt::Result {
+fn assoc_type(w: &mut Buffer, it: &clean::Item,
+ bounds: &[clean::GenericBound],
+ default: Option<&clean::Type>,
+ link: AssocItemLink<'_>,
+ extra: &str) {
write!(w, "{}type <a href='{}' class=\"type\">{}</a>",
extra,
naive_assoc_href(it, link),
- it.name.as_ref().unwrap())?;
+ it.name.as_ref().unwrap());
if !bounds.is_empty() {
- write!(w, ": {}", GenericBounds(bounds))?
+ write!(w, ": {}", GenericBounds(bounds))
}
if let Some(default) = default {
- write!(w, " = {}", default)?;
+ write!(w, " = {}", default)
}
- Ok(())
}
-fn render_stability_since_raw<'a, T: fmt::Write>(
- w: &mut T,
- ver: Option<&'a str>,
- containing_ver: Option<&'a str>,
-) -> fmt::Result {
+fn render_stability_since_raw(w: &mut Buffer, ver: Option<&str>, containing_ver: Option<&str>) {
if let Some(v) = ver {
if containing_ver != ver && v.len() > 0 {
- write!(w, "<span class='since' title='Stable since Rust version {0}'>{0}</span>", v)?
+ write!(w, "<span class='since' title='Stable since Rust version {0}'>{0}</span>", v)
}
}
- Ok(())
}
-fn render_stability_since(w: &mut fmt::Formatter<'_>,
- item: &clean::Item,
- containing_item: &clean::Item) -> fmt::Result {
+fn render_stability_since(w: &mut Buffer, item: &clean::Item, containing_item: &clean::Item) {
render_stability_since_raw(w, item.stable_since(), containing_item.stable_since())
}
-fn render_assoc_item(w: &mut fmt::Formatter<'_>,
+fn render_assoc_item(w: &mut Buffer,
item: &clean::Item,
link: AssocItemLink<'_>,
- parent: ItemType) -> fmt::Result {
- fn method(w: &mut fmt::Formatter<'_>,
+ parent: ItemType) {
+ fn method(w: &mut Buffer,
meth: &clean::Item,
header: hir::FnHeader,
g: &clean::Generics,
d: &clean::FnDecl,
link: AssocItemLink<'_>,
- parent: ItemType)
- -> fmt::Result {
+ parent: ItemType) {
let name = meth.name.as_ref().unwrap();
let anchor = format!("#{}.{}", meth.type_(), name);
let href = match link {
@@ -3345,7 +3253,7 @@
} else {
(0, true)
};
- render_attributes(w, meth, false)?;
+ render_attributes(w, meth, false);
write!(w, "{}{}{}{}{}{}{}fn <a href='{href}' class='fnname'>{name}</a>\
{generics}{decl}{where_clause}",
if parent == ItemType::Trait { " " } else { "" },
@@ -3371,7 +3279,7 @@
})
}
match item.inner {
- clean::StrippedItem(..) => Ok(()),
+ clean::StrippedItem(..) => {},
clean::TyMethodItem(ref m) => {
method(w, item, m.header, &m.generics, &m.decl, link, parent)
}
@@ -3390,22 +3298,21 @@
}
}
-fn item_struct(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- s: &clean::Struct) -> fmt::Result {
+fn item_struct(w: &mut Buffer, cx: &Context, it: &clean::Item, s: &clean::Struct) {
wrap_into_docblock(w, |w| {
- write!(w, "<pre class='rust struct'>")?;
- render_attributes(w, it, true)?;
+ write!(w, "<pre class='rust struct'>");
+ render_attributes(w, it, true);
render_struct(w,
it,
Some(&s.generics),
s.struct_type,
&s.fields,
"",
- true)?;
+ true);
write!(w, "</pre>")
- })?;
+ });
- document(w, cx, it)?;
+ document(w, cx, it);
let mut fields = s.fields.iter().filter_map(|f| {
match f.inner {
clean::StructFieldItem(ref ty) => Some((f, ty)),
@@ -3416,8 +3323,8 @@
if fields.peek().is_some() {
write!(w, "<h2 id='fields' class='fields small-section-header'>
Fields{}<a href='#fields' class='anchor'></a></h2>",
- document_non_exhaustive_header(it))?;
- document_non_exhaustive(w, it)?;
+ document_non_exhaustive_header(it));
+ document_non_exhaustive(w, it);
for (field, ty) in fields {
let id = cx.derive_id(format!("{}.{}",
ItemType::StructField,
@@ -3433,29 +3340,28 @@
id = id,
ns_id = ns_id,
name = field.name.as_ref().unwrap(),
- ty = ty)?;
- document(w, cx, field)?;
+ ty = ty);
+ document(w, cx, field);
}
}
}
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-fn item_union(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- s: &clean::Union) -> fmt::Result {
+fn item_union(w: &mut Buffer, cx: &Context, it: &clean::Item, s: &clean::Union) {
wrap_into_docblock(w, |w| {
- write!(w, "<pre class='rust union'>")?;
- render_attributes(w, it, true)?;
+ write!(w, "<pre class='rust union'>");
+ render_attributes(w, it, true);
render_union(w,
it,
Some(&s.generics),
&s.fields,
"",
- true)?;
+ true);
write!(w, "</pre>")
- })?;
+ });
- document(w, cx, it)?;
+ document(w, cx, it);
let mut fields = s.fields.iter().filter_map(|f| {
match f.inner {
clean::StructFieldItem(ref ty) => Some((f, ty)),
@@ -3464,7 +3370,7 @@
}).peekable();
if fields.peek().is_some() {
write!(w, "<h2 id='fields' class='fields small-section-header'>
- Fields<a href='#fields' class='anchor'></a></h2>")?;
+ Fields<a href='#fields' class='anchor'></a></h2>");
for (field, ty) in fields {
let name = field.name.as_ref().expect("union field name");
let id = format!("{}.{}", ItemType::StructField, name);
@@ -3475,47 +3381,46 @@
id = id,
name = name,
shortty = ItemType::StructField,
- ty = ty)?;
+ ty = ty);
if let Some(stability_class) = field.stability_class() {
write!(w, "<span class='stab {stab}'></span>",
- stab = stability_class)?;
+ stab = stability_class);
}
- document(w, cx, field)?;
+ document(w, cx, field);
}
}
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-fn item_enum(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- e: &clean::Enum) -> fmt::Result {
+fn item_enum(w: &mut Buffer, cx: &Context, it: &clean::Item, e: &clean::Enum) {
wrap_into_docblock(w, |w| {
- write!(w, "<pre class='rust enum'>")?;
- render_attributes(w, it, true)?;
+ write!(w, "<pre class='rust enum'>");
+ render_attributes(w, it, true);
write!(w, "{}enum {}{}{}",
VisSpace(&it.visibility),
it.name.as_ref().unwrap(),
e.generics,
- WhereClause { gens: &e.generics, indent: 0, end_newline: true })?;
+ WhereClause { gens: &e.generics, indent: 0, end_newline: true });
if e.variants.is_empty() && !e.variants_stripped {
- write!(w, " {{}}")?;
+ write!(w, " {{}}");
} else {
- write!(w, " {{\n")?;
+ write!(w, " {{\n");
for v in &e.variants {
- write!(w, " ")?;
+ write!(w, " ");
let name = v.name.as_ref().unwrap();
match v.inner {
clean::VariantItem(ref var) => {
match var.kind {
- clean::VariantKind::CLike => write!(w, "{}", name)?,
+ clean::VariantKind::CLike => write!(w, "{}", name),
clean::VariantKind::Tuple(ref tys) => {
- write!(w, "{}(", name)?;
+ write!(w, "{}(", name);
for (i, ty) in tys.iter().enumerate() {
if i > 0 {
- write!(w, ", ")?
+ write!(w, ", ")
}
- write!(w, "{}", *ty)?;
+ write!(w, "{}", *ty);
}
- write!(w, ")")?;
+ write!(w, ")");
}
clean::VariantKind::Struct(ref s) => {
render_struct(w,
@@ -3524,29 +3429,29 @@
s.struct_type,
&s.fields,
" ",
- false)?;
+ false);
}
}
}
_ => unreachable!()
}
- write!(w, ",\n")?;
+ write!(w, ",\n");
}
if e.variants_stripped {
- write!(w, " // some variants omitted\n")?;
+ write!(w, " // some variants omitted\n");
}
- write!(w, "}}")?;
+ write!(w, "}}");
}
write!(w, "</pre>")
- })?;
+ });
- document(w, cx, it)?;
+ document(w, cx, it);
if !e.variants.is_empty() {
write!(w, "<h2 id='variants' class='variants small-section-header'>
Variants{}<a href='#variants' class='anchor'></a></h2>\n",
- document_non_exhaustive_header(it))?;
- document_non_exhaustive(w, it)?;
+ document_non_exhaustive_header(it));
+ document_non_exhaustive(w, it);
for variant in &e.variants {
let id = cx.derive_id(format!("{}.{}",
ItemType::Variant,
@@ -3559,22 +3464,22 @@
<code id='{ns_id}'>{name}",
id = id,
ns_id = ns_id,
- name = variant.name.as_ref().unwrap())?;
+ name = variant.name.as_ref().unwrap());
if let clean::VariantItem(ref var) = variant.inner {
if let clean::VariantKind::Tuple(ref tys) = var.kind {
- write!(w, "(")?;
+ write!(w, "(");
for (i, ty) in tys.iter().enumerate() {
if i > 0 {
- write!(w, ", ")?;
+ write!(w, ", ");
}
- write!(w, "{}", *ty)?;
+ write!(w, "{}", *ty);
}
- write!(w, ")")?;
+ write!(w, ")");
}
}
- write!(w, "</code></div>")?;
- document(w, cx, variant)?;
- document_non_exhaustive(w, variant)?;
+ write!(w, "</code></div>");
+ document(w, cx, variant);
+ document_non_exhaustive(w, variant);
use crate::clean::{Variant, VariantKind};
if let clean::VariantItem(Variant {
@@ -3584,9 +3489,9 @@
ItemType::Variant,
variant.name.as_ref().unwrap()));
write!(w, "<div class='autohide sub-variant' id='{id}'>",
- id = variant_id)?;
+ id = variant_id);
write!(w, "<h3>Fields of <b>{name}</b></h3><div>",
- name = variant.name.as_ref().unwrap())?;
+ name = variant.name.as_ref().unwrap());
for field in &s.fields {
use crate::clean::StructFieldItem;
if let StructFieldItem(ref ty) = field.inner {
@@ -3605,17 +3510,16 @@
id = id,
ns_id = ns_id,
f = field.name.as_ref().unwrap(),
- t = *ty)?;
- document(w, cx, field)?;
+ t = *ty);
+ document(w, cx, field);
}
}
- write!(w, "</div></div>")?;
+ write!(w, "</div></div>");
}
- render_stability_since(w, variant, it)?;
+ render_stability_since(w, variant, it);
}
}
- render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)?;
- Ok(())
+ render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
fn render_attribute(attr: &ast::MetaItem) -> Option<String> {
@@ -3658,7 +3562,7 @@
// #[bar] <---- not "top" attribute
// bar: usize,
// }
-fn render_attributes(w: &mut dyn fmt::Write, it: &clean::Item, top: bool) -> fmt::Result {
+fn render_attributes(w: &mut Buffer, it: &clean::Item, top: bool) {
let mut attrs = String::new();
for attr in &it.attrs.other_attrs {
@@ -3671,117 +3575,114 @@
}
if attrs.len() > 0 {
write!(w, "<span class=\"docblock attributes{}\">{}</span>",
- if top { " top-attr" } else { "" }, &attrs)?;
+ if top { " top-attr" } else { "" }, &attrs);
}
- Ok(())
}
-fn render_struct(w: &mut fmt::Formatter<'_>, it: &clean::Item,
+fn render_struct(w: &mut Buffer, it: &clean::Item,
g: Option<&clean::Generics>,
ty: doctree::StructType,
fields: &[clean::Item],
tab: &str,
- structhead: bool) -> fmt::Result {
+ structhead: bool) {
write!(w, "{}{}{}",
VisSpace(&it.visibility),
if structhead {"struct "} else {""},
- it.name.as_ref().unwrap())?;
+ it.name.as_ref().unwrap());
if let Some(g) = g {
- write!(w, "{}", g)?
+ write!(w, "{}", g)
}
match ty {
doctree::Plain => {
if let Some(g) = g {
- write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: true })?
+ write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: true })
}
let mut has_visible_fields = false;
- write!(w, " {{")?;
+ write!(w, " {{");
for field in fields {
if let clean::StructFieldItem(ref ty) = field.inner {
write!(w, "\n{} {}{}: {},",
tab,
VisSpace(&field.visibility),
field.name.as_ref().unwrap(),
- *ty)?;
+ *ty);
has_visible_fields = true;
}
}
if has_visible_fields {
if it.has_stripped_fields().unwrap() {
- write!(w, "\n{} // some fields omitted", tab)?;
+ write!(w, "\n{} // some fields omitted", tab);
}
- write!(w, "\n{}", tab)?;
+ write!(w, "\n{}", tab);
} else if it.has_stripped_fields().unwrap() {
// If there are no visible fields we can just display
// `{ /* fields omitted */ }` to save space.
- write!(w, " /* fields omitted */ ")?;
+ write!(w, " /* fields omitted */ ");
}
- write!(w, "}}")?;
+ write!(w, "}}");
}
doctree::Tuple => {
- write!(w, "(")?;
+ write!(w, "(");
for (i, field) in fields.iter().enumerate() {
if i > 0 {
- write!(w, ", ")?;
+ write!(w, ", ");
}
match field.inner {
clean::StrippedItem(box clean::StructFieldItem(..)) => {
- write!(w, "_")?
+ write!(w, "_")
}
clean::StructFieldItem(ref ty) => {
- write!(w, "{}{}", VisSpace(&field.visibility), *ty)?
+ write!(w, "{}{}", VisSpace(&field.visibility), *ty)
}
_ => unreachable!()
}
}
- write!(w, ")")?;
+ write!(w, ")");
if let Some(g) = g {
- write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: false })?
+ write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: false })
}
- write!(w, ";")?;
+ write!(w, ";");
}
doctree::Unit => {
// Needed for PhantomData.
if let Some(g) = g {
- write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: false })?
+ write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: false })
}
- write!(w, ";")?;
+ write!(w, ";");
}
}
- Ok(())
}
-fn render_union(w: &mut fmt::Formatter<'_>, it: &clean::Item,
+fn render_union(w: &mut Buffer, it: &clean::Item,
g: Option<&clean::Generics>,
fields: &[clean::Item],
tab: &str,
- structhead: bool) -> fmt::Result {
+ structhead: bool) {
write!(w, "{}{}{}",
VisSpace(&it.visibility),
if structhead {"union "} else {""},
- it.name.as_ref().unwrap())?;
+ it.name.as_ref().unwrap());
if let Some(g) = g {
- write!(w, "{}", g)?;
- write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: true })?;
+ write!(w, "{}", g);
+ write!(w, "{}", WhereClause { gens: g, indent: 0, end_newline: true });
}
- write!(w, " {{\n{}", tab)?;
+ write!(w, " {{\n{}", tab);
for field in fields {
if let clean::StructFieldItem(ref ty) = field.inner {
write!(w, " {}{}: {},\n{}",
VisSpace(&field.visibility),
field.name.as_ref().unwrap(),
*ty,
- tab)?;
+ tab);
}
}
if it.has_stripped_fields().unwrap() {
- write!(w, " // some fields omitted\n{}", tab)?;
+ write!(w, " // some fields omitted\n{}", tab);
}
- write!(w, "}}")?;
- Ok(())
+ write!(w, "}}");
}
#[derive(Copy, Clone)]
@@ -3810,15 +3711,15 @@
ForDeref { mut_: bool },
}
-fn render_assoc_items(w: &mut fmt::Formatter<'_>,
+fn render_assoc_items(w: &mut Buffer,
cx: &Context,
containing_item: &clean::Item,
it: DefId,
- what: AssocItemRender<'_>) -> fmt::Result {
+ what: AssocItemRender<'_>) {
let c = cache();
let v = match c.impls.get(&it) {
Some(v) => v,
- None => return Ok(()),
+ None => return,
};
let (non_trait, traits): (Vec<_>, _) = v.iter().partition(|i| {
i.inner_impl().trait_.is_none()
@@ -3830,7 +3731,7 @@
<h2 id='methods' class='small-section-header'>\
Methods<a href='#methods' class='anchor'></a>\
</h2>\
- ")?;
+ ");
RenderMode::Normal
}
AssocItemRender::DerefFor { trait_, type_, deref_mut_ } => {
@@ -3839,17 +3740,17 @@
Methods from {}<Target = {}>\
<a href='#deref-methods' class='anchor'></a>\
</h2>\
- ", trait_, type_)?;
+ ", trait_, type_);
RenderMode::ForDeref { mut_: deref_mut_ }
}
};
for i in &non_trait {
render_impl(w, cx, i, AssocItemLink::Anchor(None), render_mode,
- containing_item.stable_since(), true, None, false, true)?;
+ containing_item.stable_since(), true, None, false, true);
}
}
if let AssocItemRender::DerefFor { .. } = what {
- return Ok(());
+ return;
}
if !traits.is_empty() {
let deref_impl = traits.iter().find(|t| {
@@ -3859,31 +3760,25 @@
let has_deref_mut = traits.iter().find(|t| {
t.inner_impl().trait_.def_id() == c.deref_mut_trait_did
}).is_some();
- render_deref_methods(w, cx, impl_, containing_item, has_deref_mut)?;
+ render_deref_methods(w, cx, impl_, containing_item, has_deref_mut);
}
let (synthetic, concrete): (Vec<&&Impl>, Vec<&&Impl>) = traits
.iter()
.partition(|t| t.inner_impl().synthetic);
- let (blanket_impl, concrete) = concrete
+ let (blanket_impl, concrete): (Vec<&&Impl>, _) = concrete
.into_iter()
.partition(|t| t.inner_impl().blanket_impl.is_some());
- struct RendererStruct<'a, 'b, 'c>(&'a Context, Vec<&'b &'b Impl>, &'c clean::Item);
-
- impl<'a, 'b, 'c> fmt::Display for RendererStruct<'a, 'b, 'c> {
- fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
- render_impls(self.0, fmt, &self.1, self.2)
- }
- }
-
- let impls = RendererStruct(cx, concrete, containing_item).to_string();
+ let mut impls = Buffer::empty_from(&w);
+ render_impls(cx, &mut impls, &concrete, containing_item);
+ let impls = impls.into_inner();
if !impls.is_empty() {
write!(w, "\
<h2 id='implementations' class='small-section-header'>\
Trait Implementations<a href='#implementations' class='anchor'></a>\
</h2>\
- <div id='implementations-list'>{}</div>", impls)?;
+ <div id='implementations-list'>{}</div>", impls);
}
if !synthetic.is_empty() {
@@ -3893,9 +3788,9 @@
<a href='#synthetic-implementations' class='anchor'></a>\
</h2>\
<div id='synthetic-implementations-list'>\
- ")?;
- render_impls(cx, w, &synthetic, containing_item)?;
- write!(w, "</div>")?;
+ ");
+ render_impls(cx, w, &synthetic, containing_item);
+ write!(w, "</div>");
}
if !blanket_impl.is_empty() {
@@ -3905,16 +3800,15 @@
<a href='#blanket-implementations' class='anchor'></a>\
</h2>\
<div id='blanket-implementations-list'>\
- ")?;
- render_impls(cx, w, &blanket_impl, containing_item)?;
- write!(w, "</div>")?;
+ ");
+ render_impls(cx, w, &blanket_impl, containing_item);
+ write!(w, "</div>");
}
}
- Ok(())
}
-fn render_deref_methods(w: &mut fmt::Formatter<'_>, cx: &Context, impl_: &Impl,
- container_item: &clean::Item, deref_mut: bool) -> fmt::Result {
+fn render_deref_methods(w: &mut Buffer, cx: &Context, impl_: &Impl,
+ container_item: &clean::Item, deref_mut: bool) {
let deref_type = impl_.inner_impl().trait_.as_ref().unwrap();
let target = impl_.inner_impl().items.iter().filter_map(|item| {
match item.inner {
@@ -3929,10 +3823,9 @@
} else {
if let Some(prim) = target.primitive_type() {
if let Some(&did) = cache().primitive_locations.get(&prim) {
- render_assoc_items(w, cx, container_item, did, what)?;
+ render_assoc_items(w, cx, container_item, did, what);
}
}
- Ok(())
}
}
@@ -3962,7 +3855,7 @@
}
}
-fn render_spotlight_traits(item: &clean::Item) -> Result<String, fmt::Error> {
+fn render_spotlight_traits(item: &clean::Item) -> String {
let mut out = String::new();
match item.inner {
@@ -3970,16 +3863,16 @@
clean::TyMethodItem(clean::TyMethod { ref decl, .. }) |
clean::MethodItem(clean::Method { ref decl, .. }) |
clean::ForeignFunctionItem(clean::Function { ref decl, .. }) => {
- out = spotlight_decl(decl)?;
+ out = spotlight_decl(decl);
}
_ => {}
}
- Ok(out)
+ out
}
-fn spotlight_decl(decl: &clean::FnDecl) -> Result<String, fmt::Error> {
- let mut out = String::new();
+fn spotlight_decl(decl: &clean::FnDecl) -> String {
+ let mut out = Buffer::html();
let mut trait_ = String::new();
if let Some(did) = decl.output.def_id() {
@@ -4005,7 +3898,7 @@
assoc_type(&mut out, it, &[],
Some(&tydef.type_),
AssocItemLink::GotoSource(t_did, &FxHashSet::default()),
- "")?;
+ "");
out.push_str(";</span>");
}
}
@@ -4022,13 +3915,13 @@
out.push_str("</code></div></div>");
}
- Ok(out)
+ out.into_inner()
}
-fn render_impl(w: &mut fmt::Formatter<'_>, cx: &Context, i: &Impl, link: AssocItemLink<'_>,
+fn render_impl(w: &mut Buffer, cx: &Context, i: &Impl, link: AssocItemLink<'_>,
render_mode: RenderMode, outer_version: Option<&str>, show_def_docs: bool,
use_absolute: Option<bool>, is_on_foreign_type: bool,
- show_default_items: bool) -> fmt::Result {
+ show_default_items: bool) {
if render_mode == RenderMode::Normal {
let id = cx.derive_id(match i.inner_impl().trait_ {
Some(ref t) => if is_on_foreign_type {
@@ -4039,45 +3932,45 @@
None => "impl".to_string(),
});
if let Some(use_absolute) = use_absolute {
- write!(w, "<h3 id='{}' class='impl'><code class='in-band'>", id)?;
- fmt_impl_for_trait_page(&i.inner_impl(), w, use_absolute)?;
+ write!(w, "<h3 id='{}' class='impl'><code class='in-band'>", id);
+ fmt_impl_for_trait_page(&i.inner_impl(), w, use_absolute);
if show_def_docs {
for it in &i.inner_impl().items {
if let clean::TypedefItem(ref tydef, _) = it.inner {
- write!(w, "<span class=\"where fmt-newline\"> ")?;
+ write!(w, "<span class=\"where fmt-newline\"> ");
assoc_type(w, it, &vec![], Some(&tydef.type_),
AssocItemLink::Anchor(None),
- "")?;
- write!(w, ";</span>")?;
+ "");
+ write!(w, ";</span>");
}
}
}
- write!(w, "</code>")?;
+ write!(w, "</code>");
} else {
write!(w, "<h3 id='{}' class='impl'><code class='in-band'>{}</code>",
id, i.inner_impl()
- )?;
+ );
}
- write!(w, "<a href='#{}' class='anchor'></a>", id)?;
+ write!(w, "<a href='#{}' class='anchor'></a>", id);
let since = i.impl_item.stability.as_ref().map(|s| &s.since[..]);
- render_stability_since_raw(w, since, outer_version)?;
- if let Some(l) = (Item { item: &i.impl_item, cx: cx }).src_href() {
+ render_stability_since_raw(w, since, outer_version);
+ if let Some(l) = cx.src_href(&i.impl_item) {
write!(w, "<a class='srclink' href='{}' title='{}'>[src]</a>",
- l, "goto source code")?;
+ l, "goto source code");
}
- write!(w, "</h3>")?;
+ write!(w, "</h3>");
if let Some(ref dox) = cx.shared.maybe_collapsed_doc_value(&i.impl_item) {
let mut ids = cx.id_map.borrow_mut();
write!(w, "<div class='docblock'>{}</div>",
Markdown(&*dox, &i.impl_item.links(), &mut ids,
- cx.codes, cx.edition, &cx.playground).to_string())?;
+ cx.codes, cx.edition, &cx.playground).to_string());
}
}
- fn doc_impl_item(w: &mut fmt::Formatter<'_>, cx: &Context, item: &clean::Item,
+ fn doc_impl_item(w: &mut Buffer, cx: &Context, item: &clean::Item,
link: AssocItemLink<'_>, render_mode: RenderMode,
is_default_item: bool, outer_version: Option<&str>,
- trait_: Option<&clean::Trait>, show_def_docs: bool) -> fmt::Result {
+ trait_: Option<&clean::Trait>, show_def_docs: bool) {
let item_type = item.type_();
let name = item.name.as_ref().unwrap();
@@ -4101,50 +3994,50 @@
if render_method_item {
let id = cx.derive_id(format!("{}.{}", item_type, name));
let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
- write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class)?;
- write!(w, "{}", spotlight_decl(decl)?)?;
- write!(w, "<code id='{}'>", ns_id)?;
- render_assoc_item(w, item, link.anchor(&id), ItemType::Impl)?;
- write!(w, "</code>")?;
- render_stability_since_raw(w, item.stable_since(), outer_version)?;
- if let Some(l) = (Item { cx, item }).src_href() {
+ write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class);
+ write!(w, "{}", spotlight_decl(decl));
+ write!(w, "<code id='{}'>", ns_id);
+ render_assoc_item(w, item, link.anchor(&id), ItemType::Impl);
+ write!(w, "</code>");
+ render_stability_since_raw(w, item.stable_since(), outer_version);
+ if let Some(l) = cx.src_href(item) {
write!(w, "<a class='srclink' href='{}' title='{}'>[src]</a>",
- l, "goto source code")?;
+ l, "goto source code");
}
- write!(w, "</h4>")?;
+ write!(w, "</h4>");
}
}
clean::TypedefItem(ref tydef, _) => {
let id = cx.derive_id(format!("{}.{}", ItemType::AssocType, name));
let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
- write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class)?;
- write!(w, "<code id='{}'>", ns_id)?;
- assoc_type(w, item, &Vec::new(), Some(&tydef.type_), link.anchor(&id), "")?;
- write!(w, "</code></h4>")?;
+ write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class);
+ write!(w, "<code id='{}'>", ns_id);
+ assoc_type(w, item, &Vec::new(), Some(&tydef.type_), link.anchor(&id), "");
+ write!(w, "</code></h4>");
}
clean::AssocConstItem(ref ty, ref default) => {
let id = cx.derive_id(format!("{}.{}", item_type, name));
let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
- write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class)?;
- write!(w, "<code id='{}'>", ns_id)?;
- assoc_const(w, item, ty, default.as_ref(), link.anchor(&id), "")?;
- write!(w, "</code>")?;
- render_stability_since_raw(w, item.stable_since(), outer_version)?;
- if let Some(l) = (Item { cx, item }).src_href() {
+ write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class);
+ write!(w, "<code id='{}'>", ns_id);
+ assoc_const(w, item, ty, default.as_ref(), link.anchor(&id), "");
+ write!(w, "</code>");
+ render_stability_since_raw(w, item.stable_since(), outer_version);
+ if let Some(l) = cx.src_href(item) {
write!(w, "<a class='srclink' href='{}' title='{}'>[src]</a>",
- l, "goto source code")?;
+ l, "goto source code");
}
- write!(w, "</h4>")?;
+ write!(w, "</h4>");
}
clean::AssocTypeItem(ref bounds, ref default) => {
let id = cx.derive_id(format!("{}.{}", item_type, name));
let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
- write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class)?;
- write!(w, "<code id='{}'>", ns_id)?;
- assoc_type(w, item, bounds, default.as_ref(), link.anchor(&id), "")?;
- write!(w, "</code></h4>")?;
+ write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class);
+ write!(w, "<code id='{}'>", ns_id);
+ assoc_type(w, item, bounds, default.as_ref(), link.anchor(&id), "");
+ write!(w, "</code></h4>");
}
- clean::StrippedItem(..) => return Ok(()),
+ clean::StrippedItem(..) => return,
_ => panic!("can't make docs for trait item with name {:?}", item.name)
}
@@ -4156,47 +4049,46 @@
if let Some(it) = t.items.iter().find(|i| i.name == item.name) {
// We need the stability of the item from the trait
// because impls can't have a stability.
- document_stability(w, cx, it, is_hidden)?;
+ document_stability(w, cx, it, is_hidden);
if item.doc_value().is_some() {
- document_full(w, item, cx, "", is_hidden)?;
+ document_full(w, item, cx, "", is_hidden);
} else if show_def_docs {
// In case the item isn't documented,
// provide short documentation from the trait.
- document_short(w, cx, it, link, "", is_hidden)?;
+ document_short(w, cx, it, link, "", is_hidden);
}
}
} else {
- document_stability(w, cx, item, is_hidden)?;
+ document_stability(w, cx, item, is_hidden);
if show_def_docs {
- document_full(w, item, cx, "", is_hidden)?;
+ document_full(w, item, cx, "", is_hidden);
}
}
} else {
- document_stability(w, cx, item, is_hidden)?;
+ document_stability(w, cx, item, is_hidden);
if show_def_docs {
- document_short(w, cx, item, link, "", is_hidden)?;
+ document_short(w, cx, item, link, "", is_hidden);
}
}
}
- Ok(())
}
let traits = &cache().traits;
let trait_ = i.trait_did().map(|did| &traits[&did]);
- write!(w, "<div class='impl-items'>")?;
+ write!(w, "<div class='impl-items'>");
for trait_item in &i.inner_impl().items {
doc_impl_item(w, cx, trait_item, link, render_mode,
- false, outer_version, trait_, show_def_docs)?;
+ false, outer_version, trait_, show_def_docs);
}
- fn render_default_items(w: &mut fmt::Formatter<'_>,
+ fn render_default_items(w: &mut Buffer,
cx: &Context,
t: &clean::Trait,
i: &clean::Impl,
render_mode: RenderMode,
outer_version: Option<&str>,
- show_def_docs: bool) -> fmt::Result {
+ show_def_docs: bool) {
for trait_item in &t.items {
let n = trait_item.name.clone();
if i.items.iter().find(|m| m.name == n).is_some() {
@@ -4206,9 +4098,8 @@
let assoc_link = AssocItemLink::GotoSource(did, &i.provided_trait_methods);
doc_impl_item(w, cx, trait_item, assoc_link, render_mode, true,
- outer_version, None, show_def_docs)?;
+ outer_version, None, show_def_docs);
}
- Ok(())
}
// If we've implemented a trait, then also emit documentation for all
@@ -4218,29 +4109,27 @@
if show_default_items {
if let Some(t) = trait_ {
render_default_items(w, cx, t, &i.inner_impl(),
- render_mode, outer_version, show_def_docs)?;
+ render_mode, outer_version, show_def_docs);
}
}
- write!(w, "</div>")?;
-
- Ok(())
+ write!(w, "</div>");
}
fn item_opaque_ty(
- w: &mut fmt::Formatter<'_>,
+ w: &mut Buffer,
cx: &Context,
it: &clean::Item,
t: &clean::OpaqueTy,
-) -> fmt::Result {
- write!(w, "<pre class='rust opaque'>")?;
- render_attributes(w, it, false)?;
+) {
+ write!(w, "<pre class='rust opaque'>");
+ render_attributes(w, it, false);
write!(w, "type {}{}{where_clause} = impl {bounds};</pre>",
it.name.as_ref().unwrap(),
t.generics,
where_clause = WhereClause { gens: &t.generics, indent: 0, end_newline: true },
- bounds = bounds(&t.bounds, false))?;
+ bounds = bounds(&t.bounds, false));
- document(w, cx, it)?;
+ document(w, cx, it);
// Render any items associated directly to this alias, as otherwise they
// won't be visible anywhere in the docs. It would be nice to also show
@@ -4249,17 +4138,17 @@
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-fn item_trait_alias(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- t: &clean::TraitAlias) -> fmt::Result {
- write!(w, "<pre class='rust trait-alias'>")?;
- render_attributes(w, it, false)?;
+fn item_trait_alias(w: &mut Buffer, cx: &Context, it: &clean::Item,
+ t: &clean::TraitAlias) {
+ write!(w, "<pre class='rust trait-alias'>");
+ render_attributes(w, it, false);
write!(w, "trait {}{}{} = {};</pre>",
it.name.as_ref().unwrap(),
t.generics,
WhereClause { gens: &t.generics, indent: 0, end_newline: true },
- bounds(&t.bounds, true))?;
+ bounds(&t.bounds, true));
- document(w, cx, it)?;
+ document(w, cx, it);
// Render any items associated directly to this alias, as otherwise they
// won't be visible anywhere in the docs. It would be nice to also show
@@ -4268,17 +4157,16 @@
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-fn item_typedef(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- t: &clean::Typedef) -> fmt::Result {
- write!(w, "<pre class='rust typedef'>")?;
- render_attributes(w, it, false)?;
+fn item_typedef(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Typedef) {
+ write!(w, "<pre class='rust typedef'>");
+ render_attributes(w, it, false);
write!(w, "type {}{}{where_clause} = {type_};</pre>",
it.name.as_ref().unwrap(),
t.generics,
where_clause = WhereClause { gens: &t.generics, indent: 0, end_newline: true },
- type_ = t.type_)?;
+ type_ = t.type_);
- document(w, cx, it)?;
+ document(w, cx, it);
// Render any items associated directly to this alias, as otherwise they
// won't be visible anywhere in the docs. It would be nice to also show
@@ -4287,117 +4175,111 @@
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-fn item_foreign_type(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item) -> fmt::Result {
- writeln!(w, "<pre class='rust foreigntype'>extern {{")?;
- render_attributes(w, it, false)?;
+fn item_foreign_type(w: &mut Buffer, cx: &Context, it: &clean::Item) {
+ writeln!(w, "<pre class='rust foreigntype'>extern {{");
+ render_attributes(w, it, false);
write!(
w,
" {}type {};\n}}</pre>",
VisSpace(&it.visibility),
it.name.as_ref().unwrap(),
- )?;
+ );
- document(w, cx, it)?;
+ document(w, cx, it);
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-impl<'a> fmt::Display for Sidebar<'a> {
- fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
- let cx = self.cx;
- let it = self.item;
- let parentlen = cx.current.len() - if it.is_mod() {1} else {0};
+fn print_sidebar(cx: &Context, it: &clean::Item, buffer: &mut Buffer) {
+ let parentlen = cx.current.len() - if it.is_mod() {1} else {0};
- if it.is_struct() || it.is_trait() || it.is_primitive() || it.is_union()
- || it.is_enum() || it.is_mod() || it.is_typedef() {
- write!(fmt, "<p class='location'>{}{}</p>",
- match it.inner {
- clean::StructItem(..) => "Struct ",
- clean::TraitItem(..) => "Trait ",
- clean::PrimitiveItem(..) => "Primitive Type ",
- clean::UnionItem(..) => "Union ",
- clean::EnumItem(..) => "Enum ",
- clean::TypedefItem(..) => "Type Definition ",
- clean::ForeignTypeItem => "Foreign Type ",
- clean::ModuleItem(..) => if it.is_crate() {
- "Crate "
- } else {
- "Module "
- },
- _ => "",
+ if it.is_struct() || it.is_trait() || it.is_primitive() || it.is_union()
+ || it.is_enum() || it.is_mod() || it.is_typedef() {
+ write!(buffer, "<p class='location'>{}{}</p>",
+ match it.inner {
+ clean::StructItem(..) => "Struct ",
+ clean::TraitItem(..) => "Trait ",
+ clean::PrimitiveItem(..) => "Primitive Type ",
+ clean::UnionItem(..) => "Union ",
+ clean::EnumItem(..) => "Enum ",
+ clean::TypedefItem(..) => "Type Definition ",
+ clean::ForeignTypeItem => "Foreign Type ",
+ clean::ModuleItem(..) => if it.is_crate() {
+ "Crate "
+ } else {
+ "Module "
},
- it.name.as_ref().unwrap())?;
- }
-
- if it.is_crate() {
- if let Some(ref version) = cache().crate_version {
- write!(fmt,
- "<div class='block version'>\
- <p>Version {}</p>\
- </div>",
- version)?;
- }
- }
-
- write!(fmt, "<div class=\"sidebar-elems\">")?;
- if it.is_crate() {
- write!(fmt, "<a id='all-types' href='all.html'><p>See all {}'s items</p></a>",
- it.name.as_ref().expect("crates always have a name"))?;
- }
- match it.inner {
- clean::StructItem(ref s) => sidebar_struct(fmt, it, s)?,
- clean::TraitItem(ref t) => sidebar_trait(fmt, it, t)?,
- clean::PrimitiveItem(ref p) => sidebar_primitive(fmt, it, p)?,
- clean::UnionItem(ref u) => sidebar_union(fmt, it, u)?,
- clean::EnumItem(ref e) => sidebar_enum(fmt, it, e)?,
- clean::TypedefItem(ref t, _) => sidebar_typedef(fmt, it, t)?,
- clean::ModuleItem(ref m) => sidebar_module(fmt, it, &m.items)?,
- clean::ForeignTypeItem => sidebar_foreign_type(fmt, it)?,
- _ => (),
- }
-
- // The sidebar is designed to display sibling functions, modules and
- // other miscellaneous information. since there are lots of sibling
- // items (and that causes quadratic growth in large modules),
- // we refactor common parts into a shared JavaScript file per module.
- // still, we don't move everything into JS because we want to preserve
- // as much HTML as possible in order to allow non-JS-enabled browsers
- // to navigate the documentation (though slightly inefficiently).
-
- write!(fmt, "<p class='location'>")?;
- for (i, name) in cx.current.iter().take(parentlen).enumerate() {
- if i > 0 {
- write!(fmt, "::<wbr>")?;
- }
- write!(fmt, "<a href='{}index.html'>{}</a>",
- &cx.root_path()[..(cx.current.len() - i - 1) * 3],
- *name)?;
- }
- write!(fmt, "</p>")?;
-
- // Sidebar refers to the enclosing module, not this module.
- let relpath = if it.is_mod() { "../" } else { "" };
- write!(fmt,
- "<script>window.sidebarCurrent = {{\
- name: '{name}', \
- ty: '{ty}', \
- relpath: '{path}'\
- }};</script>",
- name = it.name.as_ref().map(|x| &x[..]).unwrap_or(""),
- ty = it.type_().css_class(),
- path = relpath)?;
- if parentlen == 0 {
- // There is no sidebar-items.js beyond the crate root path
- // FIXME maybe dynamic crate loading can be merged here
- } else {
- write!(fmt, "<script defer src=\"{path}sidebar-items.js\"></script>",
- path = relpath)?;
- }
- // Closes sidebar-elems div.
- write!(fmt, "</div>")?;
-
- Ok(())
+ _ => "",
+ },
+ it.name.as_ref().unwrap());
}
+
+ if it.is_crate() {
+ if let Some(ref version) = cache().crate_version {
+ write!(buffer,
+ "<div class='block version'>\
+ <p>Version {}</p>\
+ </div>",
+ version);
+ }
+ }
+
+ write!(buffer, "<div class=\"sidebar-elems\">");
+ if it.is_crate() {
+ write!(buffer, "<a id='all-types' href='all.html'><p>See all {}'s items</p></a>",
+ it.name.as_ref().expect("crates always have a name"));
+ }
+ match it.inner {
+ clean::StructItem(ref s) => sidebar_struct(buffer, it, s),
+ clean::TraitItem(ref t) => sidebar_trait(buffer, it, t),
+ clean::PrimitiveItem(ref p) => sidebar_primitive(buffer, it, p),
+ clean::UnionItem(ref u) => sidebar_union(buffer, it, u),
+ clean::EnumItem(ref e) => sidebar_enum(buffer, it, e),
+ clean::TypedefItem(ref t, _) => sidebar_typedef(buffer, it, t),
+ clean::ModuleItem(ref m) => sidebar_module(buffer, it, &m.items),
+ clean::ForeignTypeItem => sidebar_foreign_type(buffer, it),
+ _ => (),
+ }
+
+ // The sidebar is designed to display sibling functions, modules and
+ // other miscellaneous information. since there are lots of sibling
+ // items (and that causes quadratic growth in large modules),
+ // we refactor common parts into a shared JavaScript file per module.
+ // still, we don't move everything into JS because we want to preserve
+ // as much HTML as possible in order to allow non-JS-enabled browsers
+ // to navigate the documentation (though slightly inefficiently).
+
+ write!(buffer, "<p class='location'>");
+ for (i, name) in cx.current.iter().take(parentlen).enumerate() {
+ if i > 0 {
+ write!(buffer, "::<wbr>");
+ }
+ write!(buffer, "<a href='{}index.html'>{}</a>",
+ &cx.root_path()[..(cx.current.len() - i - 1) * 3],
+ *name);
+ }
+ write!(buffer, "</p>");
+
+ // Sidebar refers to the enclosing module, not this module.
+ let relpath = if it.is_mod() { "../" } else { "" };
+ write!(buffer,
+ "<script>window.sidebarCurrent = {{\
+ name: '{name}', \
+ ty: '{ty}', \
+ relpath: '{path}'\
+ }};</script>",
+ name = it.name.as_ref().map(|x| &x[..]).unwrap_or(""),
+ ty = it.type_().css_class(),
+ path = relpath);
+ if parentlen == 0 {
+ // There is no sidebar-items.js beyond the crate root path
+ // FIXME maybe dynamic crate loading can be merged here
+ } else {
+ write!(buffer, "<script defer src=\"{path}sidebar-items.js\"></script>",
+ path = relpath);
+ }
+ // Closes sidebar-elems div.
+ write!(buffer, "</div>");
}
fn get_next_url(used_links: &mut FxHashSet<String>, url: String) -> String {
@@ -4570,8 +4452,7 @@
out
}
-fn sidebar_struct(fmt: &mut fmt::Formatter<'_>, it: &clean::Item,
- s: &clean::Struct) -> fmt::Result {
+fn sidebar_struct(buf: &mut Buffer, it: &clean::Item, s: &clean::Struct) {
let mut sidebar = String::new();
let fields = get_struct_fields_name(&s.fields);
@@ -4585,9 +4466,8 @@
sidebar.push_str(&sidebar_assoc_items(it));
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)?;
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar);
}
- Ok(())
}
fn get_id_for_impl_on_foreign_type(for_: &clean::Type, trait_: &clean::Type) -> String {
@@ -4611,8 +4491,7 @@
i.polarity == Some(clean::ImplPolarity::Negative)
}
-fn sidebar_trait(fmt: &mut fmt::Formatter<'_>, it: &clean::Item,
- t: &clean::Trait) -> fmt::Result {
+fn sidebar_trait(buf: &mut Buffer, it: &clean::Item, t: &clean::Trait) {
let mut sidebar = String::new();
let types = t.items
@@ -4720,27 +4599,23 @@
sidebar.push_str(&sidebar_assoc_items(it));
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar)
}
-fn sidebar_primitive(fmt: &mut fmt::Formatter<'_>, it: &clean::Item,
- _p: &clean::PrimitiveType) -> fmt::Result {
+fn sidebar_primitive(buf: &mut Buffer, it: &clean::Item, _p: &clean::PrimitiveType) {
let sidebar = sidebar_assoc_items(it);
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)?;
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar);
}
- Ok(())
}
-fn sidebar_typedef(fmt: &mut fmt::Formatter<'_>, it: &clean::Item,
- _t: &clean::Typedef) -> fmt::Result {
+fn sidebar_typedef(buf: &mut Buffer, it: &clean::Item, _t: &clean::Typedef) {
let sidebar = sidebar_assoc_items(it);
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)?;
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar);
}
- Ok(())
}
fn get_struct_fields_name(fields: &[clean::Item]) -> String {
@@ -4758,8 +4633,7 @@
.collect()
}
-fn sidebar_union(fmt: &mut fmt::Formatter<'_>, it: &clean::Item,
- u: &clean::Union) -> fmt::Result {
+fn sidebar_union(buf: &mut Buffer, it: &clean::Item, u: &clean::Union) {
let mut sidebar = String::new();
let fields = get_struct_fields_name(&u.fields);
@@ -4771,13 +4645,11 @@
sidebar.push_str(&sidebar_assoc_items(it));
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)?;
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar);
}
- Ok(())
}
-fn sidebar_enum(fmt: &mut fmt::Formatter<'_>, it: &clean::Item,
- e: &clean::Enum) -> fmt::Result {
+fn sidebar_enum(buf: &mut Buffer, it: &clean::Item, e: &clean::Enum) {
let mut sidebar = String::new();
let variants = e.variants.iter()
@@ -4795,9 +4667,8 @@
sidebar.push_str(&sidebar_assoc_items(it));
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)?;
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar);
}
- Ok(())
}
fn item_ty_to_strs(ty: &ItemType) -> (&'static str, &'static str) {
@@ -4831,8 +4702,7 @@
}
}
-fn sidebar_module(fmt: &mut fmt::Formatter<'_>, _it: &clean::Item,
- items: &[clean::Item]) -> fmt::Result {
+fn sidebar_module(buf: &mut Buffer, _it: &clean::Item, items: &[clean::Item]) {
let mut sidebar = String::new();
if items.iter().any(|it| it.type_() == ItemType::ExternCrate ||
@@ -4859,72 +4729,67 @@
}
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\"><ul>{}</ul></div>", sidebar)?;
+ write!(buf, "<div class=\"block items\"><ul>{}</ul></div>", sidebar);
}
- Ok(())
}
-fn sidebar_foreign_type(fmt: &mut fmt::Formatter<'_>, it: &clean::Item) -> fmt::Result {
+fn sidebar_foreign_type(buf: &mut Buffer, it: &clean::Item) {
let sidebar = sidebar_assoc_items(it);
if !sidebar.is_empty() {
- write!(fmt, "<div class=\"block items\">{}</div>", sidebar)?;
+ write!(buf, "<div class=\"block items\">{}</div>", sidebar);
}
- Ok(())
}
-fn item_macro(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
- t: &clean::Macro) -> fmt::Result {
+fn item_macro(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Macro) {
wrap_into_docblock(w, |w| {
w.write_str(&highlight::render_with_highlighting(&t.source,
Some("macro"),
None,
None))
- })?;
+ });
document(w, cx, it)
}
-fn item_proc_macro(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item, m: &clean::ProcMacro)
- -> fmt::Result
-{
+fn item_proc_macro(w: &mut Buffer, cx: &Context, it: &clean::Item, m: &clean::ProcMacro) {
let name = it.name.as_ref().expect("proc-macros always have names");
match m.kind {
MacroKind::Bang => {
- write!(w, "<pre class='rust macro'>")?;
- write!(w, "{}!() {{ /* proc-macro */ }}", name)?;
- write!(w, "</pre>")?;
+ write!(w, "<pre class='rust macro'>");
+ write!(w, "{}!() {{ /* proc-macro */ }}", name);
+ write!(w, "</pre>");
}
MacroKind::Attr => {
- write!(w, "<pre class='rust attr'>")?;
- write!(w, "#[{}]", name)?;
- write!(w, "</pre>")?;
+ write!(w, "<pre class='rust attr'>");
+ write!(w, "#[{}]", name);
+ write!(w, "</pre>");
}
MacroKind::Derive => {
- write!(w, "<pre class='rust derive'>")?;
- write!(w, "#[derive({})]", name)?;
+ write!(w, "<pre class='rust derive'>");
+ write!(w, "#[derive({})]", name);
if !m.helpers.is_empty() {
- writeln!(w, "\n{{")?;
- writeln!(w, " // Attributes available to this derive:")?;
+ writeln!(w, "\n{{");
+ writeln!(w, " // Attributes available to this derive:");
for attr in &m.helpers {
- writeln!(w, " #[{}]", attr)?;
+ writeln!(w, " #[{}]", attr);
}
- write!(w, "}}")?;
+ write!(w, "}}");
}
- write!(w, "</pre>")?;
+ write!(w, "</pre>");
}
}
document(w, cx, it)
}
-fn item_primitive(w: &mut fmt::Formatter<'_>, cx: &Context,
+fn item_primitive(w: &mut Buffer, cx: &Context,
it: &clean::Item,
- _p: &clean::PrimitiveType) -> fmt::Result {
- document(w, cx, it)?;
+ _p: &clean::PrimitiveType) {
+ document(w, cx, it);
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}
-fn item_keyword(w: &mut fmt::Formatter<'_>, cx: &Context,
+fn item_keyword(w: &mut Buffer, cx: &Context,
it: &clean::Item,
- _p: &str) -> fmt::Result {
+ _p: &str) {
document(w, cx, it)
}
diff --git a/src/librustdoc/html/sources.rs b/src/librustdoc/html/sources.rs
index c1f1f59..d840683 100644
--- a/src/librustdoc/html/sources.rs
+++ b/src/librustdoc/html/sources.rs
@@ -4,10 +4,10 @@
use crate::html::layout;
use crate::html::render::{Error, SharedContext, BASIC_KEYWORDS};
use crate::html::highlight;
+use crate::html::format::Buffer;
use std::ffi::OsStr;
use std::fs;
use std::path::{Component, Path, PathBuf};
-use std::fmt;
use syntax::source_map::FileName;
crate fn render(dst: &Path, scx: &mut SharedContext,
@@ -105,7 +105,6 @@
cur.push(&fname);
href.push_str(&fname.to_string_lossy());
- let mut v = Vec::new();
let title = format!("{} -- source", cur.file_name().expect("failed to get file name")
.to_string_lossy());
let desc = format!("Source to the Rust file `{}`.", filename);
@@ -120,15 +119,10 @@
extra_scripts: &[&format!("source-files{}", self.scx.resource_suffix)],
static_extra_scripts: &[&format!("source-script{}", self.scx.resource_suffix)],
};
- let result = layout::render(&mut v, &self.scx.layout,
- &page, &(""), &Source(contents),
- self.scx.css_file_extension.is_some(),
- &self.scx.themes,
- self.scx.generate_search_filter);
- if let Err(e) = result {
- return Err(Error::new(e, &cur));
- }
- self.scx.fs.write(&cur, &v)?;
+ let v = layout::render(&self.scx.layout,
+ &page, "", |buf: &mut _| print_src(buf, &contents),
+ &self.scx.themes);
+ self.scx.fs.write(&cur, v.as_bytes())?;
self.scx.local_sources.insert(p.clone(), href);
Ok(())
}
@@ -163,25 +157,19 @@
/// Wrapper struct to render the source code of a file. This will do things like
/// adding line numbers to the left-hand side.
-struct Source<'a>(&'a str);
-
-impl<'a> fmt::Display for Source<'a> {
- fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
- let Source(s) = *self;
- let lines = s.lines().count();
- let mut cols = 0;
- let mut tmp = lines;
- while tmp > 0 {
- cols += 1;
- tmp /= 10;
- }
- write!(fmt, "<pre class=\"line-numbers\">")?;
- for i in 1..=lines {
- write!(fmt, "<span id=\"{0}\">{0:1$}</span>\n", i, cols)?;
- }
- write!(fmt, "</pre>")?;
- write!(fmt, "{}",
- highlight::render_with_highlighting(s, None, None, None))?;
- Ok(())
+fn print_src(buf: &mut Buffer, s: &str) {
+ let lines = s.lines().count();
+ let mut cols = 0;
+ let mut tmp = lines;
+ while tmp > 0 {
+ cols += 1;
+ tmp /= 10;
}
+ write!(buf, "<pre class=\"line-numbers\">");
+ for i in 1..=lines {
+ write!(buf, "<span id=\"{0}\">{0:1$}</span>\n", i, cols);
+ }
+ write!(buf, "</pre>");
+ write!(buf, "{}",
+ highlight::render_with_highlighting(s, None, None, None));
}
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 83b0b78..17a940c 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -39,6 +39,14 @@
};
}
+function getSearchInput() {
+ return document.getElementsByClassName("search-input")[0];
+}
+
+function getSearchElement() {
+ return document.getElementById("search");
+}
+
(function() {
"use strict";
@@ -71,7 +79,7 @@
"derive",
"traitalias"];
- var search_input = document.getElementsByClassName("search-input")[0];
+ var search_input = getSearchInput();
// On the search screen, so you remain on the last tab you opened.
//
@@ -158,7 +166,7 @@
// If we're in mobile mode, we should add the sidebar in any case.
hideSidebar();
var elem;
- var search = document.getElementById("search");
+ var search = getSearchElement();
var i, from, to, match = window.location.hash.match(/^#?(\d+)(?:-(\d+))?$/);
if (match) {
from = parseInt(match[1], 10);
@@ -250,7 +258,12 @@
return String.fromCharCode(c);
}
+ function getHelpElement() {
+ return document.getElementById("help");
+ }
+
function displayHelp(display, ev, help) {
+ var help = help ? help : getHelpElement();
if (display === true) {
if (hasClass(help, "hidden")) {
ev.preventDefault();
@@ -264,9 +277,10 @@
}
}
- function handleEscape(ev, help) {
+ function handleEscape(ev) {
+ var help = getHelpElement();
+ var search = getSearchElement();
hideModal();
- var search = document.getElementById("search");
if (hasClass(help, "hidden") === false) {
displayHelp(false, ev, help);
} else if (hasClass(search, "hidden") === false) {
@@ -284,22 +298,21 @@
return;
}
- var help = document.getElementById("help");
if (document.activeElement.tagName === "INPUT") {
switch (getVirtualKey(ev)) {
case "Escape":
- handleEscape(ev, help);
+ handleEscape(ev);
break;
}
} else {
switch (getVirtualKey(ev)) {
case "Escape":
- handleEscape(ev, help);
+ handleEscape(ev);
break;
case "s":
case "S":
- displayHelp(false, ev, help);
+ displayHelp(false, ev);
hideModal();
ev.preventDefault();
focusSearchBar();
@@ -314,7 +327,7 @@
case "?":
if (ev.shiftKey) {
hideModal();
- displayHelp(true, ev, help);
+ displayHelp(true, ev);
}
break;
}
@@ -1281,9 +1294,7 @@
} else if (e.which === 16) { // shift
// Does nothing, it's just to avoid losing "focus" on the highlighted element.
} else if (e.which === 27) { // escape
- removeClass(actives[currentTab][0], "highlighted");
- search_input.value = "";
- defocusSearchBar();
+ handleEscape(e);
} else if (actives[currentTab].length > 0) {
removeClass(actives[currentTab][0], "highlighted");
}
@@ -1434,7 +1445,7 @@
ret_others[0] + ret_in_args[0] + ret_returned[0] + "</div>";
addClass(main, "hidden");
- var search = document.getElementById("search");
+ var search = getSearchElement();
removeClass(search, "hidden");
search.innerHTML = output;
var tds = search.getElementsByTagName("td");
@@ -1644,7 +1655,7 @@
if (hasClass(main, "content")) {
removeClass(main, "hidden");
}
- var search_c = document.getElementById("search");
+ var search_c = getSearchElement();
if (hasClass(search_c, "content")) {
addClass(search_c, "hidden");
}
@@ -1691,7 +1702,7 @@
if (hasClass(main, "content")) {
removeClass(main, "hidden");
}
- var search_c = document.getElementById("search");
+ var search_c = getSearchElement();
if (hasClass(search_c, "content")) {
addClass(search_c, "hidden");
}
@@ -2460,7 +2471,7 @@
var params = getQueryStringParams();
if (params && params.search) {
addClass(main, "hidden");
- var search = document.getElementById("search");
+ var search = getSearchElement();
removeClass(search, "hidden");
search.innerHTML = "<h3 style=\"text-align: center;\">Loading search results...</h3>";
}
@@ -2545,10 +2556,10 @@
// Sets the focus on the search bar at the top of the page
function focusSearchBar() {
- document.getElementsByClassName("search-input")[0].focus();
+ getSearchInput().focus();
}
// Removes the focus from the search bar
function defocusSearchBar() {
- document.getElementsByClassName("search-input")[0].blur();
+ getSearchInput().blur();
}
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
index 40a6a15..eae998c 100644
--- a/src/librustdoc/html/static/storage.js
+++ b/src/librustdoc/html/static/storage.js
@@ -119,7 +119,7 @@
function getSystemValue() {
var property = getComputedStyle(document.documentElement).getPropertyValue('content');
- return property.replace(/\"\'/g, "");
+ return property.replace(/[\"\']/g, "");
}
switchTheme(currentTheme, mainTheme,
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 3019467..d77e790 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -1,7 +1,7 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
html_playground_url = "https://play.rust-lang.org/")]
-#![feature(bind_by_move_pattern_guards)]
+#![cfg_attr(bootstrap, feature(bind_by_move_pattern_guards))]
#![feature(rustc_private)]
#![feature(arbitrary_self_types)]
#![feature(box_patterns)]
@@ -90,7 +90,7 @@
32_000_000 // 32MB on other platforms
};
rustc_driver::set_sigpipe_handler();
- env_logger::init();
+ env_logger::init_from_env("RUSTDOC_LOG");
let res = std::thread::Builder::new().stack_size(thread_stack_size).spawn(move || {
get_args().map(|args| main_args(&args)).unwrap_or(1)
}).unwrap().join().unwrap_or(rustc_driver::EXIT_FAILURE);
@@ -356,6 +356,28 @@
"show-coverage",
"calculate percentage of public items with documentation")
}),
+ unstable("enable-per-target-ignores", |o| {
+ o.optflag("",
+ "enable-per-target-ignores",
+ "parse ignore-foo for ignoring doctests on a per-target basis")
+ }),
+ unstable("runtool", |o| {
+ o.optopt("",
+ "runtool",
+ "",
+ "The tool to run tests with when building for a different target than host")
+ }),
+ unstable("runtool-arg", |o| {
+ o.optmulti("",
+ "runtool-arg",
+ "",
+ "One (of possibly many) arguments to pass to the runtool")
+ }),
+ unstable("test-builder", |o| {
+ o.optflag("",
+ "test-builder",
+ "specified the rustc-like binary to use as the test builder")
+ }),
]
}
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs
index a30fc05..8431271 100644
--- a/src/librustdoc/markdown.rs
+++ b/src/librustdoc/markdown.rs
@@ -43,7 +43,7 @@
edition: Edition
) -> i32 {
let mut output = options.output;
- output.push(input.file_stem().unwrap());
+ output.push(input.file_name().unwrap());
output.set_extension("html");
let mut css = String::new();
@@ -143,11 +143,12 @@
opts.no_crate_inject = true;
opts.display_warnings = options.display_warnings;
let mut collector = Collector::new(options.input.display().to_string(), options.clone(),
- true, opts, None, Some(options.input));
+ true, opts, None, Some(options.input),
+ options.enable_per_target_ignores);
collector.set_position(DUMMY_SP);
let codes = ErrorCodes::from(UnstableFeatures::from_environment().is_nightly_build());
- find_testable_code(&input_str, &mut collector, codes);
+ find_testable_code(&input_str, &mut collector, codes, options.enable_per_target_ignores);
options.test_args.insert(0, "rustdoctest".to_string());
testing::test_main(&options.test_args, collector.tests,
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 2951b2c..d6073cd 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -679,6 +679,7 @@
"f32" => tcx.lang_items().f32_impl(),
"f64" => tcx.lang_items().f64_impl(),
"str" => tcx.lang_items().str_impl(),
+ "bool" => tcx.lang_items().bool_impl(),
"char" => tcx.lang_items().char_impl(),
_ => None,
}
diff --git a/src/librustdoc/passes/collect_trait_impls.rs b/src/librustdoc/passes/collect_trait_impls.rs
index 86e4e9f..28c64d0 100644
--- a/src/librustdoc/passes/collect_trait_impls.rs
+++ b/src/librustdoc/passes/collect_trait_impls.rs
@@ -53,6 +53,7 @@
lang_items.f64_impl(),
lang_items.f32_runtime_impl(),
lang_items.f64_runtime_impl(),
+ lang_items.bool_impl(),
lang_items.char_impl(),
lang_items.str_impl(),
lang_items.slice_impl(),
diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs
index 49a34c7..14f8b16 100644
--- a/src/librustdoc/passes/mod.rs
+++ b/src/librustdoc/passes/mod.rs
@@ -336,7 +336,7 @@
found_tests: 0,
};
- find_testable_code(&dox, &mut tests, ErrorCodes::No);
+ find_testable_code(&dox, &mut tests, ErrorCodes::No, false);
if check_missing_code == true && tests.found_tests == 0 {
let sp = span_of_attrs(&item.attrs).unwrap_or(item.source.span());
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 000d2843a..482c69c 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -1,5 +1,6 @@
use rustc_data_structures::sync::Lrc;
use rustc_interface::interface;
+use rustc_target::spec::TargetTriple;
use rustc::hir;
use rustc::hir::intravisit;
use rustc::session::{self, config, DiagnosticOutput};
@@ -22,7 +23,7 @@
use crate::clean::Attributes;
use crate::config::Options;
-use crate::html::markdown::{self, ErrorCodes, LangString};
+use crate::html::markdown::{self, ErrorCodes, LangString, Ignore};
#[derive(Clone, Default)]
pub struct TestOptions {
@@ -57,6 +58,7 @@
..config::basic_debugging_options()
},
edition: options.edition,
+ target_triple: options.target.clone(),
..config::Options::default()
};
@@ -82,6 +84,7 @@
let mut opts = scrape_test_config(lower_to_hir.peek().0.borrow().krate());
opts.display_warnings |= options.display_warnings;
+ let enable_per_target_ignores = options.enable_per_target_ignores;
let mut collector = Collector::new(
compiler.crate_name()?.peek().to_string(),
options,
@@ -89,6 +92,7 @@
opts,
Some(compiler.source_map().clone()),
None,
+ enable_per_target_ignores,
);
let mut global_ctxt = compiler.global_ctxt()?.take();
@@ -181,6 +185,9 @@
should_panic: bool,
no_run: bool,
as_test_harness: bool,
+ runtool: Option<String>,
+ runtool_args: Vec<String>,
+ target: TargetTriple,
compile_fail: bool,
mut error_codes: Vec<String>,
opts: &TestOptions,
@@ -241,7 +248,10 @@
};
let output_file = outdir.path().join("rust_out");
- let mut compiler = Command::new(std::env::current_exe().unwrap().with_file_name("rustc"));
+ let rustc_binary = options.test_builder.as_ref().map(|v| &**v).unwrap_or_else(|| {
+ rustc_interface::util::rustc_path().expect("found rustc")
+ });
+ let mut compiler = Command::new(&rustc_binary);
compiler.arg("--crate-type").arg("bin");
for cfg in &options.cfgs {
compiler.arg("--cfg").arg(&cfg);
@@ -270,6 +280,7 @@
if no_run {
compiler.arg("--emit=metadata");
}
+ compiler.arg("--target").arg(target.to_string());
compiler.arg("-");
compiler.stdin(Stdio::piped());
@@ -315,7 +326,15 @@
}
// Run the code!
- let mut cmd = Command::new(output_file);
+ let mut cmd;
+
+ if let Some(tool) = runtool {
+ cmd = Command::new(tool);
+ cmd.arg(output_file);
+ cmd.args(runtool_args);
+ } else {
+ cmd = Command::new(output_file);
+ }
match cmd.output() {
Err(e) => return Err(TestFailure::ExecutionError(e)),
@@ -407,7 +426,7 @@
Ok(Some(item)) => {
if !found_main {
if let ast::ItemKind::Fn(..) = item.node {
- if item.ident.as_str() == "main" {
+ if item.ident.name == sym::main {
found_main = true;
}
}
@@ -603,6 +622,7 @@
options: Options,
use_headers: bool,
+ enable_per_target_ignores: bool,
cratename: String,
opts: TestOptions,
position: Span,
@@ -612,12 +632,14 @@
impl Collector {
pub fn new(cratename: String, options: Options, use_headers: bool, opts: TestOptions,
- source_map: Option<Lrc<SourceMap>>, filename: Option<PathBuf>,) -> Collector {
+ source_map: Option<Lrc<SourceMap>>, filename: Option<PathBuf>,
+ enable_per_target_ignores: bool) -> Collector {
Collector {
tests: Vec::new(),
names: Vec::new(),
options,
use_headers,
+ enable_per_target_ignores,
cratename,
opts,
position: DUMMY_SP,
@@ -661,12 +683,22 @@
let opts = self.opts.clone();
let edition = config.edition.unwrap_or(self.options.edition.clone());
let options = self.options.clone();
+ let runtool = self.options.runtool.clone();
+ let runtool_args = self.options.runtool_args.clone();
+ let target = self.options.target.clone();
+ let target_str = target.to_string();
debug!("creating test {}: {}", name, test);
self.tests.push(testing::TestDescAndFn {
desc: testing::TestDesc {
- name: testing::DynTestName(name),
- ignore: config.ignore,
+ name: testing::DynTestName(name.clone()),
+ ignore: match config.ignore {
+ Ignore::All => true,
+ Ignore::None => false,
+ Ignore::Some(ref ignores) => {
+ ignores.iter().any(|s| target_str.contains(s))
+ },
+ },
// compiler failures are test failures
should_panic: testing::ShouldPanic::No,
allow_fail: config.allow_fail,
@@ -681,6 +713,9 @@
config.should_panic,
config.no_run,
config.test_harness,
+ runtool,
+ runtool_args,
+ target,
config.compile_fail,
config.error_codes,
&opts,
@@ -827,7 +862,10 @@
// anything else, this will combine them for us.
if let Some(doc) = attrs.collapsed_doc_value() {
self.collector.set_position(attrs.span.unwrap_or(DUMMY_SP));
- markdown::find_testable_code(&doc, self.collector, self.codes);
+ markdown::find_testable_code(&doc,
+ self.collector,
+ self.codes,
+ self.collector.enable_per_target_ignores);
}
nested(self);
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 18a46cf..20442ab 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -26,7 +26,7 @@
hashbrown = { version = "0.5.0", features = ['rustc-dep-of-std'] }
[dependencies.backtrace]
-version = "0.3.35"
+version = "0.3.37"
default-features = false # don't use coresymbolication on OSX
features = [
"rustc-dep-of-std", # enable build support for integrating into libstd
@@ -38,7 +38,7 @@
optional = true
[dev-dependencies]
-rand = "0.6.1"
+rand = "0.7"
[target.x86_64-apple-darwin.dependencies]
rustc_asan = { path = "../librustc_asan" }
diff --git a/src/libstd/backtrace.rs b/src/libstd/backtrace.rs
new file mode 100644
index 0000000..5d46ef7
--- /dev/null
+++ b/src/libstd/backtrace.rs
@@ -0,0 +1,352 @@
+//! Support for capturing a stack backtrace of an OS thread
+//!
+//! This module contains the support necessary to capture a stack backtrace of a
+//! running OS thread from the OS thread itself. The `Backtrace` type supports
+//! capturing a stack trace via the `Backtrace::capture` and
+//! `Backtrace::force_capture` functions.
+//!
+//! A backtrace is typically quite handy to attach to errors (e.g. types
+//! implementing `std::error::Error`) to get a causal chain of where an error
+//! was generated.
+//!
+//! > **Note**: this module is unstable and is designed in [RFC 2504], and you
+//! > can learn more about its status in the [tracking issue].
+//!
+//! [RFC 2504]: https://github.com/rust-lang/rfcs/blob/master/text/2504-fix-error.md
+//! [tracking issue]: https://github.com/rust-lang/rust/issues/53487
+//!
+//! ## Accuracy
+//!
+//! Backtraces are attempted to be as accurate as possible, but no guarantees
+//! are provided about the exact accuracy of a backtrace. Instruction pointers,
+//! symbol names, filenames, line numbers, etc, may all be incorrect when
+//! reported. Accuracy is attempted on a best-effort basis, however, and bugs
+//! are always welcome to indicate areas of improvement!
+//!
+//! For most platforms a backtrace with a filename/line number requires that
+//! programs be compiled with debug information. Without debug information
+//! filenames/line numbers will not be reported.
+//!
+//! ## Platform support
+//!
+//! Not all platforms that libstd compiles for support capturing backtraces.
+//! Some platforms simply do nothing when capturing a backtrace. To check
+//! whether the platform supports capturing backtraces you can consult the
+//! `BacktraceStatus` enum as a result of `Backtrace::status`.
+//!
+//! Like above with accuracy platform support is done on a best effort basis.
+//! Sometimes libraries may not be available at runtime or something may go
+//! wrong which would cause a backtrace to not be captured. Please feel free to
+//! report issues with platforms where a backtrace cannot be captured though!
+//!
+//! ## Environment Variables
+//!
+//! The `Backtrace::capture` function may not actually capture a backtrace by
+//! default. Its behavior is governed by two environment variables:
+//!
+//! * `RUST_LIB_BACKTRACE` - if this is set to `0` then `Backtrace::capture`
+//! will never capture a backtrace. Any other value this is set to will enable
+//! `Backtrace::capture`.
+//!
+//! * `RUST_BACKTRACE` - if `RUST_LIB_BACKTRACE` is not set, then this variable
+//! is consulted with the same rules of `RUST_LIB_BACKTRACE`.
+//!
+//! * If neither of the above env vars are set, then `Backtrace::capture` will
+//! be disabled.
+//!
+//! Capturing a backtrace can be a quite expensive runtime operation, so the
+//! environment variables allow either forcibly disabling this runtime
+//! performance hit or allow selectively enabling it in some programs.
+//!
+//! Note that the `Backtrace::force_capture` function can be used to ignore
+//! these environment variables. Also note that the state of environment
+//! variables is cached once the first backtrace is created, so altering
+//! `RUST_LIB_BACKTRACE` or `RUST_BACKTRACE` at runtime may not actually change
+//! how backtraces are captured.
+
+#![unstable(feature = "backtrace", issue = "53487")]
+
+// NB: A note on resolution of a backtrace:
+//
+// Backtraces primarily happen in two steps, one is where we actually capture
+// the stack backtrace, giving us a list of instruction pointers corresponding
+// to stack frames. Next we take these instruction pointers and, one-by-one,
+// turn them into a human readable name (like `main`).
+//
+// The first phase can be somewhat expensive (walking the stack), especially
+// on MSVC where debug information is consulted to return inline frames each as
+// their own frame. The second phase, however, is almost always extremely
+// expensive (on the order of milliseconds sometimes) when it's consulting debug
+// information.
+//
+// We attempt to amortize this cost as much as possible by delaying resolution
+// of an address to a human readable name for as long as possible. When
+// `Backtrace::create` is called to capture a backtrace it doesn't actually
+// perform any symbol resolution, but rather we lazily resolve symbols only just
+// before they're needed for printing. This way we can make capturing a
+// backtrace and throwing it away much cheaper, but actually printing a
+// backtrace is still basically the same cost.
+//
+// This strategy comes at the cost of some synchronization required inside of a
+// `Backtrace`, but that's a relatively small price to pay relative to capturing
+// a backtrace or actually symbolizing it.
+
+use crate::env;
+use crate::fmt;
+use crate::sync::atomic::{AtomicUsize, Ordering::SeqCst};
+use crate::sync::Mutex;
+use crate::sys_common::backtrace::{output_filename, lock};
+use crate::vec::Vec;
+use backtrace::BytesOrWideString;
+
+/// A captured OS thread stack backtrace.
+///
+/// This type represents a stack backtrace for an OS thread captured at a
+/// previous point in time. In some instances the `Backtrace` type may
+/// internally be empty due to configuration. For more information see
+/// `Backtrace::capture`.
+pub struct Backtrace {
+ inner: Inner,
+}
+
+/// The current status of a backtrace, indicating whether it was captured or
+/// whether it is empty for some other reason.
+#[non_exhaustive]
+#[derive(Debug)]
+pub enum BacktraceStatus {
+ /// Capturing a backtrace is not supported, likely because it's not
+ /// implemented for the current platform.
+ Unsupported,
+ /// Capturing a backtrace has been disabled through either the
+ /// `RUST_LIB_BACKTRACE` or `RUST_BACKTRACE` environment variables.
+ Disabled,
+ /// A backtrace has been captured and the `Backtrace` should print
+ /// reasonable information when rendered.
+ Captured,
+}
+
+enum Inner {
+ Unsupported,
+ Disabled,
+ Captured(Mutex<Capture>),
+}
+
+struct Capture {
+ actual_start: usize,
+ resolved: bool,
+ frames: Vec<BacktraceFrame>,
+}
+
+fn _assert_send_sync() {
+ fn _assert<T: Send + Sync>() {}
+ _assert::<Backtrace>();
+}
+
+struct BacktraceFrame {
+ frame: backtrace::Frame,
+ symbols: Vec<BacktraceSymbol>,
+}
+
+struct BacktraceSymbol {
+ name: Option<Vec<u8>>,
+ filename: Option<BytesOrWide>,
+ lineno: Option<u32>,
+}
+
+enum BytesOrWide {
+ Bytes(Vec<u8>),
+ Wide(Vec<u16>),
+}
+
+impl Backtrace {
+ /// Returns whether backtrace captures are enabled through environment
+ /// variables.
+ fn enabled() -> bool {
+ // Cache the result of reading the environment variables to make
+ // backtrace captures speedy, because otherwise reading environment
+ // variables every time can be somewhat slow.
+ static ENABLED: AtomicUsize = AtomicUsize::new(0);
+ match ENABLED.load(SeqCst) {
+ 0 => {}
+ 1 => return false,
+ _ => return true,
+ }
+ let enabled = match env::var("RUST_LIB_BACKTRACE") {
+ Ok(s) => s != "0",
+ Err(_) => match env::var("RUST_BACKTRACE") {
+ Ok(s) => s != "0",
+ Err(_) => false,
+ },
+ };
+ ENABLED.store(enabled as usize + 1, SeqCst);
+ return enabled;
+ }
+
+ /// Capture a stack backtrace of the current thread.
+ ///
+ /// This function will capture a stack backtrace of the current OS thread of
+ /// execution, returning a `Backtrace` type which can be later used to print
+ /// the entire stack trace or render it to a string.
+ ///
+ /// This function will be a noop if the `RUST_BACKTRACE` or
+ /// `RUST_LIB_BACKTRACE` backtrace variables are both not set. If either
+ /// environment variable is set and enabled then this function will actually
+ /// capture a backtrace. Capturing a backtrace can be both memory intensive
+ /// and slow, so these environment variables allow liberally using
+ /// `Backtrace::capture` and only incurring a slowdown when the environment
+ /// variables are set.
+ ///
+ /// To forcibly capture a backtrace regardless of environment variables, use
+ /// the `Backtrace::force_capture` function.
+ #[inline(never)] // want to make sure there's a frame here to remove
+ pub fn capture() -> Backtrace {
+ if !Backtrace::enabled() {
+ return Backtrace { inner: Inner::Disabled };
+ }
+ Backtrace::create(Backtrace::capture as usize)
+ }
+
+ /// Forcibly captures a full backtrace, regardless of environment variable
+ /// configuration.
+ ///
+ /// This function behaves the same as `capture` except that it ignores the
+ /// values of the `RUST_BACKTRACE` and `RUST_LIB_BACKTRACE` environment
+ /// variables, always capturing a backtrace.
+ ///
+ /// Note that capturing a backtrace can be an expensive operation on some
+ /// platforms, so this should be used with caution in performance-sensitive
+ /// parts of code.
+ #[inline(never)] // want to make sure there's a frame here to remove
+ pub fn force_capture() -> Backtrace {
+ Backtrace::create(Backtrace::force_capture as usize)
+ }
+
+ // Capture a backtrace which start just before the function addressed by
+ // `ip`
+ fn create(ip: usize) -> Backtrace {
+ let _lock = lock();
+ let mut frames = Vec::new();
+ let mut actual_start = None;
+ unsafe {
+ backtrace::trace_unsynchronized(|frame| {
+ frames.push(BacktraceFrame { frame: frame.clone(), symbols: Vec::new() });
+ if frame.symbol_address() as usize == ip && actual_start.is_none() {
+ actual_start = Some(frames.len());
+ }
+ true
+ });
+ }
+
+ // If no frames came out assume that this is an unsupported platform
+ // since `backtrace` doesn't provide a way of learning this right now,
+ // and this should be a good enough approximation.
+ let inner = if frames.len() == 0 {
+ Inner::Unsupported
+ } else {
+ Inner::Captured(Mutex::new(Capture {
+ actual_start: actual_start.unwrap_or(0),
+ frames,
+ resolved: false,
+ }))
+ };
+
+ Backtrace { inner }
+ }
+
+ /// Returns the status of this backtrace, indicating whether this backtrace
+ /// request was unsupported, disabled, or a stack trace was actually
+ /// captured.
+ pub fn status(&self) -> BacktraceStatus {
+ match self.inner {
+ Inner::Unsupported => BacktraceStatus::Unsupported,
+ Inner::Disabled => BacktraceStatus::Disabled,
+ Inner::Captured(_) => BacktraceStatus::Captured,
+ }
+ }
+}
+
+impl fmt::Display for Backtrace {
+ fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+ fmt::Debug::fmt(self, fmt)
+ }
+}
+
+impl fmt::Debug for Backtrace {
+ fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+ let mut capture = match &self.inner {
+ Inner::Unsupported => return fmt.write_str("unsupported backtrace"),
+ Inner::Disabled => return fmt.write_str("disabled backtrace"),
+ Inner::Captured(c) => c.lock().unwrap(),
+ };
+ capture.resolve();
+
+ let full = fmt.alternate();
+ let (frames, style) = if full {
+ (&capture.frames[..], backtrace::PrintFmt::Full)
+ } else {
+ (&capture.frames[capture.actual_start..], backtrace::PrintFmt::Short)
+ };
+
+ // When printing paths we try to strip the cwd if it exists, otherwise
+ // we just print the path as-is. Note that we also only do this for the
+ // short format, because if it's full we presumably want to print
+ // everything.
+ let cwd = crate::env::current_dir();
+ let mut print_path = move |fmt: &mut fmt::Formatter<'_>, path: BytesOrWideString<'_>| {
+ output_filename(fmt, path, style, cwd.as_ref().ok())
+ };
+
+ let mut f = backtrace::BacktraceFmt::new(fmt, style, &mut print_path);
+ f.add_context()?;
+ for frame in frames {
+ let mut f = f.frame();
+ if frame.symbols.is_empty() {
+ f.print_raw(frame.frame.ip(), None, None, None)?;
+ } else {
+ for symbol in frame.symbols.iter() {
+ f.print_raw(
+ frame.frame.ip(),
+ symbol.name.as_ref().map(|b| backtrace::SymbolName::new(b)),
+ symbol.filename.as_ref().map(|b| match b {
+ BytesOrWide::Bytes(w) => BytesOrWideString::Bytes(w),
+ BytesOrWide::Wide(w) => BytesOrWideString::Wide(w),
+ }),
+ symbol.lineno,
+ )?;
+ }
+ }
+ }
+ f.finish()?;
+ Ok(())
+ }
+}
+
+impl Capture {
+ fn resolve(&mut self) {
+ // If we're already resolved, nothing to do!
+ if self.resolved {
+ return;
+ }
+ self.resolved = true;
+
+ // Use the global backtrace lock to synchronize this as it's a
+ // requirement of the `backtrace` crate, and then actually resolve
+ // everything.
+ let _lock = lock();
+ for frame in self.frames.iter_mut() {
+ let symbols = &mut frame.symbols;
+ unsafe {
+ backtrace::resolve_frame_unsynchronized(&frame.frame, |symbol| {
+ symbols.push(BacktraceSymbol {
+ name: symbol.name().map(|m| m.as_bytes().to_vec()),
+ filename: symbol.filename_raw().map(|b| match b {
+ BytesOrWideString::Bytes(b) => BytesOrWide::Bytes(b.to_owned()),
+ BytesOrWideString::Wide(b) => BytesOrWide::Wide(b.to_owned()),
+ }),
+ lineno: symbol.lineno(),
+ });
+ });
+ }
+ }
+ }
+}
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 117a430..998d59f 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -17,6 +17,7 @@
use crate::alloc::{AllocErr, LayoutErr, CannotReallocInPlace};
use crate::any::TypeId;
+use crate::backtrace::Backtrace;
use crate::borrow::Cow;
use crate::cell;
use crate::char;
@@ -204,6 +205,20 @@
fn type_id(&self, _: private::Internal) -> TypeId where Self: 'static {
TypeId::of::<Self>()
}
+
+ /// Returns a stack backtrace, if available, of where this error ocurred.
+ ///
+ /// This function allows inspecting the location, in code, of where an error
+ /// happened. The returned `Backtrace` contains information about the stack
+ /// trace of the OS thread of execution of where the error originated from.
+ ///
+ /// Note that not all errors contain a `Backtrace`. Also note that a
+ /// `Backtrace` may actually be empty. For more information consult the
+ /// `Backtrace` type itself.
+ #[unstable(feature = "backtrace", issue = "53487")]
+ fn backtrace(&self) -> Option<&Backtrace> {
+ None
+ }
}
mod private {
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 65f4e0c..bb346fb 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -935,8 +935,10 @@
/// Wraps a raw C string with a safe C string wrapper.
///
/// This function will wrap the provided `ptr` with a `CStr` wrapper, which
- /// allows inspection and interoperation of non-owned C strings. This method
- /// is unsafe for a number of reasons:
+ /// allows inspection and interoperation of non-owned C strings. The total
+ /// size of the raw C string must be smaller than `isize::MAX` **bytes**
+ /// in memory due to calling the `slice::from_raw_parts` function.
+ /// This method is unsafe for a number of reasons:
///
/// * There is no guarantee to the validity of `ptr`.
/// * The returned lifetime is not guaranteed to be the actual lifetime of
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 5f76875..b14e02a 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -2144,7 +2144,7 @@
use crate::sys_common::io::test::{TempDir, tmpdir};
use crate::thread;
- use rand::{rngs::StdRng, FromEntropy, RngCore};
+ use rand::{rngs::StdRng, RngCore, SeedableRng};
#[cfg(windows)]
use crate::os::windows::fs::{symlink_dir, symlink_file};
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 71050b0..21aeb9c 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -238,7 +238,7 @@
#![feature(array_error_internals)]
#![feature(asm)]
#![feature(associated_type_bounds)]
-#![feature(bind_by_move_pattern_guards)]
+#![cfg_attr(bootstrap, feature(bind_by_move_pattern_guards))]
#![feature(box_syntax)]
#![feature(c_variadic)]
#![feature(cfg_target_has_atomic)]
@@ -452,6 +452,7 @@
#[macro_use]
pub mod thread;
pub mod ascii;
+pub mod backtrace;
pub mod collections;
pub mod env;
pub mod error;
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index 952fd9e..db4089c 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -158,7 +158,7 @@
fn default_hook(info: &PanicInfo<'_>) {
#[cfg(feature = "backtrace")]
- use crate::sys_common::backtrace;
+ use crate::sys_common::{backtrace as backtrace_mod};
// If this is a double panic, make sure that we print a backtrace
// for this panic. Otherwise only print it if logging is enabled.
@@ -167,9 +167,9 @@
let panics = update_panic_count(0);
if panics >= 2 {
- Some(backtrace::PrintFormat::Full)
+ Some(backtrace::PrintFmt::Full)
} else {
- backtrace::log_enabled()
+ backtrace_mod::log_enabled()
}
};
@@ -197,7 +197,7 @@
static FIRST_PANIC: AtomicBool = AtomicBool::new(true);
if let Some(format) = log_backtrace {
- let _ = backtrace::print(err, format);
+ let _ = backtrace_mod::print(err, format);
} else if FIRST_PANIC.compare_and_swap(true, false, Ordering::SeqCst) {
let _ = writeln!(err, "note: run with `RUST_BACKTRACE=1` \
environment variable to display a backtrace.");
diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs
index 72e66cc..713d308 100644
--- a/src/libstd/sys/unix/process/process_common.rs
+++ b/src/libstd/sys/unix/process/process_common.rs
@@ -1,19 +1,27 @@
use crate::os::unix::prelude::*;
-use crate::ffi::{OsString, OsStr, CString, CStr};
+use crate::ffi::{OsString, OsStr, CString};
use crate::fmt;
use crate::io;
use crate::ptr;
use crate::sys::fd::FileDesc;
-use crate::sys::fs::{File, OpenOptions};
+use crate::sys::fs::File;
use crate::sys::pipe::{self, AnonPipe};
use crate::sys_common::process::CommandEnv;
use crate::collections::BTreeMap;
+#[cfg(not(target_os = "fuchsia"))]
+use {
+ crate::ffi::CStr,
+ crate::sys::fs::OpenOptions,
+};
+
use libc::{c_int, gid_t, uid_t, c_char, EXIT_SUCCESS, EXIT_FAILURE};
cfg_if::cfg_if! {
- if #[cfg(target_os = "redox")] {
+ if #[cfg(target_os = "fuchsia")] {
+ // fuchsia doesn't have /dev/null
+ } else if #[cfg(target_os = "redox")] {
const DEV_NULL: &'static str = "null:\0";
} else {
const DEV_NULL: &'static str = "/dev/null\0";
@@ -107,6 +115,11 @@
Inherit,
Explicit(c_int),
Owned(FileDesc),
+
+ // On Fuchsia, null stdio is the default, so we simply don't specify
+ // any actions at the time of spawning.
+ #[cfg(target_os = "fuchsia")]
+ Null,
}
pub enum Stdio {
@@ -325,6 +338,7 @@
Ok((ChildStdio::Owned(theirs.into_fd()), Some(ours)))
}
+ #[cfg(not(target_os = "fuchsia"))]
Stdio::Null => {
let mut opts = OpenOptions::new();
opts.read(readable);
@@ -335,6 +349,11 @@
let fd = File::open_c(&path, &opts)?;
Ok((ChildStdio::Owned(fd.into_fd()), None))
}
+
+ #[cfg(target_os = "fuchsia")]
+ Stdio::Null => {
+ Ok((ChildStdio::Null, None))
+ }
}
}
}
@@ -357,6 +376,9 @@
ChildStdio::Inherit => None,
ChildStdio::Explicit(fd) => Some(fd),
ChildStdio::Owned(ref fd) => Some(fd.raw()),
+
+ #[cfg(target_os = "fuchsia")]
+ ChildStdio::Null => None,
}
}
}
diff --git a/src/libstd/sys/unix/process/process_fuchsia.rs b/src/libstd/sys/unix/process/process_fuchsia.rs
index 7c6be9b..fff9fc6 100644
--- a/src/libstd/sys/unix/process/process_fuchsia.rs
+++ b/src/libstd/sys/unix/process/process_fuchsia.rs
@@ -48,30 +48,51 @@
use crate::sys::process::zircon::*;
let envp = match maybe_envp {
- Some(envp) => envp.as_ptr(),
+ // None means to clone the current environment, which is done in the
+ // flags below.
None => ptr::null(),
+ Some(envp) => envp.as_ptr(),
};
- let transfer_or_clone = |opt_fd, target_fd| if let Some(local_fd) = opt_fd {
- fdio_spawn_action_t {
- action: FDIO_SPAWN_ACTION_TRANSFER_FD,
- local_fd,
- target_fd,
- ..Default::default()
- }
- } else {
- fdio_spawn_action_t {
- action: FDIO_SPAWN_ACTION_CLONE_FD,
- local_fd: target_fd,
- target_fd,
- ..Default::default()
+ let make_action = |local_io: &ChildStdio, target_fd| -> io::Result<fdio_spawn_action_t> {
+ if let Some(local_fd) = local_io.fd() {
+ Ok(fdio_spawn_action_t {
+ action: FDIO_SPAWN_ACTION_TRANSFER_FD,
+ local_fd,
+ target_fd,
+ ..Default::default()
+ })
+ } else {
+ if let ChildStdio::Null = local_io {
+ // acts as no-op
+ return Ok(Default::default());
+ }
+
+ let mut handle = ZX_HANDLE_INVALID;
+ let status = fdio_fd_clone(target_fd, &mut handle);
+ if status == ERR_INVALID_ARGS || status == ERR_NOT_SUPPORTED {
+ // This descriptor is closed; skip it rather than generating an
+ // error.
+ return Ok(Default::default());
+ }
+ zx_cvt(status)?;
+
+ let mut cloned_fd = 0;
+ zx_cvt(fdio_fd_create(handle, &mut cloned_fd))?;
+
+ Ok(fdio_spawn_action_t {
+ action: FDIO_SPAWN_ACTION_TRANSFER_FD,
+ local_fd: cloned_fd as i32,
+ target_fd,
+ ..Default::default()
+ })
}
};
// Clone stdin, stdout, and stderr
- let action1 = transfer_or_clone(stdio.stdin.fd(), 0);
- let action2 = transfer_or_clone(stdio.stdout.fd(), 1);
- let action3 = transfer_or_clone(stdio.stderr.fd(), 2);
+ let action1 = make_action(&stdio.stdin, 0)?;
+ let action2 = make_action(&stdio.stdout, 1)?;
+ let action3 = make_action(&stdio.stderr, 2)?;
let actions = [action1, action2, action3];
// We don't want FileDesc::drop to be called on any stdio. fdio_spawn_etc
@@ -84,9 +105,11 @@
let mut process_handle: zx_handle_t = 0;
zx_cvt(fdio_spawn_etc(
- 0,
- FDIO_SPAWN_CLONE_JOB | FDIO_SPAWN_CLONE_LDSVC | FDIO_SPAWN_CLONE_NAMESPACE,
- self.get_argv()[0], self.get_argv().as_ptr(), envp, 3, actions.as_ptr(),
+ ZX_HANDLE_INVALID,
+ FDIO_SPAWN_CLONE_JOB | FDIO_SPAWN_CLONE_LDSVC | FDIO_SPAWN_CLONE_NAMESPACE
+ | FDIO_SPAWN_CLONE_ENVIRON, // this is ignored when envp is non-null
+ self.get_argv()[0], self.get_argv().as_ptr(), envp,
+ actions.len() as size_t, actions.as_ptr(),
&mut process_handle,
ptr::null_mut(),
))?;
diff --git a/src/libstd/sys/unix/process/zircon.rs b/src/libstd/sys/unix/process/zircon.rs
index ec715d5..1ba48de 100644
--- a/src/libstd/sys/unix/process/zircon.rs
+++ b/src/libstd/sys/unix/process/zircon.rs
@@ -2,8 +2,9 @@
use crate::convert::TryInto;
use crate::io;
+use crate::i64;
+use crate::mem::MaybeUninit;
use crate::os::raw::c_char;
-use crate::u64;
use libc::{c_int, c_void, size_t};
@@ -14,8 +15,8 @@
pub const ZX_HANDLE_INVALID: zx_handle_t = 0;
-pub type zx_time_t = u64;
-pub const ZX_TIME_INFINITE : zx_time_t = u64::MAX;
+pub type zx_time_t = i64;
+pub const ZX_TIME_INFINITE : zx_time_t = i64::MAX;
pub type zx_signals_t = u32;
@@ -120,8 +121,11 @@
extern {
pub fn fdio_spawn_etc(job: zx_handle_t, flags: u32, path: *const c_char,
argv: *const *const c_char, envp: *const *const c_char,
- action_count: u64, actions: *const fdio_spawn_action_t,
+ action_count: size_t, actions: *const fdio_spawn_action_t,
process: *mut zx_handle_t, err_msg: *mut c_char) -> zx_status_t;
+
+ pub fn fdio_fd_clone(fd: c_int, out_handle: *mut zx_handle_t) -> zx_status_t;
+ pub fn fdio_fd_create(handle: zx_handle_t, fd: *mut c_int) -> zx_status_t;
}
// fdio_spawn_etc flags
diff --git a/src/libstd/sys/vxworks/fast_thread_local.rs b/src/libstd/sys/vxworks/fast_thread_local.rs
index 2e02198..8b55939 100644
--- a/src/libstd/sys/vxworks/fast_thread_local.rs
+++ b/src/libstd/sys/vxworks/fast_thread_local.rs
@@ -1,5 +1,3 @@
-// Copyright (c) 2019 Wind River Systems, Inc.
-
#![cfg(target_thread_local)]
#![unstable(feature = "thread_local_internals", issue = "0")]
diff --git a/src/libstd/sys/vxworks/process/process_vxworks.rs b/src/libstd/sys/vxworks/process/process_vxworks.rs
index b07966f..8780df1 100644
--- a/src/libstd/sys/vxworks/process/process_vxworks.rs
+++ b/src/libstd/sys/vxworks/process/process_vxworks.rs
@@ -5,6 +5,7 @@
use crate::sys::cvt;
use crate::sys::process::rtp;
use crate::sys::process::process_common::*;
+use crate::sys_common::thread;
////////////////////////////////////////////////////////////////////////////////
// Command
@@ -57,8 +58,7 @@
self.get_argv().as_ptr() as *const _, // argv
*sys::os::environ() as *const *const c_char,
100 as c_int, // initial priority
- 0x16000, // initial stack size. 0 defaults
- // to 0x4000 in 32 bit and 0x8000 in 64 bit
+ thread::min_stack(), // initial stack size.
0, // options
0 // task options
);
diff --git a/src/libstd/sys/vxworks/thread.rs b/src/libstd/sys/vxworks/thread.rs
index ef896f6..e4396b0 100644
--- a/src/libstd/sys/vxworks/thread.rs
+++ b/src/libstd/sys/vxworks/thread.rs
@@ -8,7 +8,7 @@
use crate::sys_common::thread::*;
-pub const DEFAULT_MIN_STACK_SIZE: usize = 2 * 1024 * 1024;
+pub const DEFAULT_MIN_STACK_SIZE: usize = 0x40000; // 256K
pub struct Thread {
id: libc::pthread_t,
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
index bf37ff7..1a78abf 100644
--- a/src/libstd/sys_common/backtrace.rs
+++ b/src/libstd/sys_common/backtrace.rs
@@ -2,25 +2,39 @@
/// supported platforms.
use crate::env;
+use crate::fmt;
use crate::io;
+use crate::borrow::Cow;
use crate::io::prelude::*;
-use crate::mem;
-use crate::path::{self, Path};
-use crate::ptr;
+use crate::path::{self, Path, PathBuf};
use crate::sync::atomic::{self, Ordering};
use crate::sys::mutex::Mutex;
-use backtrace::{BytesOrWideString, Frame, Symbol};
-
-pub const HEX_WIDTH: usize = 2 + 2 * mem::size_of::<usize>();
+use backtrace::{BacktraceFmt, BytesOrWideString, PrintFmt};
/// Max number of frames to print.
const MAX_NB_FRAMES: usize = 100;
-/// Prints the current backtrace.
-pub fn print(w: &mut dyn Write, format: PrintFormat) -> io::Result<()> {
+pub fn lock() -> impl Drop {
+ struct Guard;
static LOCK: Mutex = Mutex::new();
+ impl Drop for Guard {
+ fn drop(&mut self) {
+ unsafe {
+ LOCK.unlock();
+ }
+ }
+ }
+
+ unsafe {
+ LOCK.lock();
+ return Guard;
+ }
+}
+
+/// Prints the current backtrace.
+pub fn print(w: &mut dyn Write, format: PrintFmt) -> io::Result<()> {
// There are issues currently linking libbacktrace into tests, and in
// general during libstd's own unit tests we're not testing this path. In
// test mode immediately return here to optimize away any references to the
@@ -32,33 +46,69 @@
// Use a lock to prevent mixed output in multithreading context.
// Some platforms also requires it, like `SymFromAddr` on Windows.
unsafe {
- LOCK.lock();
- let res = _print(w, format);
- LOCK.unlock();
- res
+ let _lock = lock();
+ _print(w, format)
}
}
-fn _print(w: &mut dyn Write, format: PrintFormat) -> io::Result<()> {
- writeln!(w, "stack backtrace:")?;
-
- let mut printer = Printer::new(format, w);
- unsafe {
- backtrace::trace_unsynchronized(|frame| {
- let mut hit = false;
- backtrace::resolve_frame_unsynchronized(frame, |symbol| {
- hit = true;
- printer.output(frame, Some(symbol));
- });
- if !hit {
- printer.output(frame, None);
- }
- !printer.done
- });
+unsafe fn _print(w: &mut dyn Write, format: PrintFmt) -> io::Result<()> {
+ struct DisplayBacktrace {
+ format: PrintFmt,
}
- if printer.skipped {
+ impl fmt::Display for DisplayBacktrace {
+ fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+ unsafe {
+ _print_fmt(fmt, self.format)
+ }
+ }
+ }
+ write!(w, "{}", DisplayBacktrace { format })
+}
+
+unsafe fn _print_fmt(fmt: &mut fmt::Formatter<'_>, print_fmt: PrintFmt) -> fmt::Result {
+ let cwd = env::current_dir().ok();
+ let mut print_path = move |fmt: &mut fmt::Formatter<'_>, bows: BytesOrWideString<'_>| {
+ output_filename(fmt, bows, print_fmt, cwd.as_ref())
+ };
+ let mut bt_fmt = BacktraceFmt::new(fmt, print_fmt, &mut print_path);
+ bt_fmt.add_context()?;
+ let mut idx = 0;
+ let mut res = Ok(());
+ backtrace::trace_unsynchronized(|frame| {
+ if print_fmt == PrintFmt::Short && idx > MAX_NB_FRAMES {
+ return false;
+ }
+
+ let mut hit = false;
+ let mut stop = false;
+ backtrace::resolve_frame_unsynchronized(frame, |symbol| {
+ hit = true;
+ if print_fmt == PrintFmt::Short {
+ if let Some(sym) = symbol.name().and_then(|s| s.as_str()) {
+ if sym.contains("__rust_begin_short_backtrace") {
+ stop = true;
+ return;
+ }
+ }
+ }
+
+ res = bt_fmt.frame().symbol(frame, symbol);
+ });
+ if stop {
+ return false;
+ }
+ if !hit {
+ res = bt_fmt.frame().print_raw(frame.ip(), None, None, None);
+ }
+
+ idx += 1;
+ res.is_ok()
+ });
+ res?;
+ bt_fmt.finish()?;
+ if print_fmt == PrintFmt::Short {
writeln!(
- w,
+ fmt,
"note: Some details are omitted, \
run with `RUST_BACKTRACE=full` for a verbose backtrace."
)?;
@@ -77,33 +127,30 @@
f()
}
-/// Controls how the backtrace should be formatted.
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum PrintFormat {
- /// Show only relevant data from the backtrace.
- Short = 2,
- /// Show all the frames with absolute path for files.
- Full = 3,
-}
-
// For now logging is turned off by default, and this function checks to see
// whether the magical environment variable is present to see if it's turned on.
-pub fn log_enabled() -> Option<PrintFormat> {
+pub fn log_enabled() -> Option<PrintFmt> {
+ // Setting environment variables for Fuchsia components isn't a standard
+ // or easily supported workflow. For now, always display backtraces.
+ if cfg!(target_os = "fuchsia") {
+ return Some(PrintFmt::Full);
+ }
+
static ENABLED: atomic::AtomicIsize = atomic::AtomicIsize::new(0);
match ENABLED.load(Ordering::SeqCst) {
0 => {}
1 => return None,
- 2 => return Some(PrintFormat::Short),
- _ => return Some(PrintFormat::Full),
+ 2 => return Some(PrintFmt::Short),
+ _ => return Some(PrintFmt::Full),
}
let val = env::var_os("RUST_BACKTRACE").and_then(|x| {
if &x == "0" {
None
} else if &x == "full" {
- Some(PrintFormat::Full)
+ Some(PrintFmt::Full)
} else {
- Some(PrintFormat::Short)
+ Some(PrintFmt::Short)
}
});
ENABLED.store(
@@ -116,130 +163,43 @@
val
}
-struct Printer<'a, 'b> {
- format: PrintFormat,
- done: bool,
- skipped: bool,
- idx: usize,
- out: &'a mut (dyn Write + 'b),
-}
-
-impl<'a, 'b> Printer<'a, 'b> {
- fn new(format: PrintFormat, out: &'a mut (dyn Write + 'b)) -> Printer<'a, 'b> {
- Printer { format, done: false, skipped: false, idx: 0, out }
- }
-
- /// Prints the symbol of the backtrace frame.
- ///
- /// These output functions should now be used everywhere to ensure consistency.
- /// You may want to also use `output_fileline`.
- fn output(&mut self, frame: &Frame, symbol: Option<&Symbol>) {
- if self.idx > MAX_NB_FRAMES {
- self.done = true;
- self.skipped = true;
- return;
+/// Prints the filename of the backtrace frame.
+///
+/// See also `output`.
+pub fn output_filename(
+ fmt: &mut fmt::Formatter<'_>,
+ bows: BytesOrWideString<'_>,
+ print_fmt: PrintFmt,
+ cwd: Option<&PathBuf>,
+) -> fmt::Result {
+ let file: Cow<'_, Path> = match bows {
+ #[cfg(unix)]
+ BytesOrWideString::Bytes(bytes) => {
+ use crate::os::unix::prelude::*;
+ Path::new(crate::ffi::OsStr::from_bytes(bytes)).into()
}
- if self._output(frame, symbol).is_err() {
- self.done = true;
+ #[cfg(not(unix))]
+ BytesOrWideString::Bytes(bytes) => {
+ Path::new(crate::str::from_utf8(bytes).unwrap_or("<unknown>")).into()
}
- self.idx += 1;
- }
-
- fn _output(&mut self, frame: &Frame, symbol: Option<&Symbol>) -> io::Result<()> {
- if self.format == PrintFormat::Short {
- if let Some(sym) = symbol.and_then(|s| s.name()).and_then(|s| s.as_str()) {
- if sym.contains("__rust_begin_short_backtrace") {
- self.skipped = true;
- self.done = true;
- return Ok(());
- }
- }
-
- // Remove the `17: 0x0 - <unknown>` line.
- if self.format == PrintFormat::Short && frame.ip() == ptr::null_mut() {
- self.skipped = true;
- return Ok(());
- }
- }
-
- match self.format {
- PrintFormat::Full => {
- write!(self.out, " {:2}: {:2$?} - ", self.idx, frame.ip(), HEX_WIDTH)?
- }
- PrintFormat::Short => write!(self.out, " {:2}: ", self.idx)?,
- }
-
- match symbol.and_then(|s| s.name()) {
- Some(symbol) => {
- match self.format {
- PrintFormat::Full => write!(self.out, "{}", symbol)?,
- // Strip the trailing hash if short mode.
- PrintFormat::Short => write!(self.out, "{:#}", symbol)?,
- }
- }
- None => self.out.write_all(b"<unknown>")?,
- }
- self.out.write_all(b"\n")?;
- if let Some(sym) = symbol {
- self.output_fileline(sym)?;
- }
- Ok(())
- }
-
- /// Prints the filename and line number of the backtrace frame.
- ///
- /// See also `output`.
- fn output_fileline(&mut self, symbol: &Symbol) -> io::Result<()> {
#[cfg(windows)]
- let path_buf;
- let file = match symbol.filename_raw() {
- #[cfg(unix)]
- Some(BytesOrWideString::Bytes(bytes)) => {
- use crate::os::unix::prelude::*;
- Path::new(crate::ffi::OsStr::from_bytes(bytes))
- }
- #[cfg(not(unix))]
- Some(BytesOrWideString::Bytes(bytes)) => {
- Path::new(crate::str::from_utf8(bytes).unwrap_or("<unknown>"))
- }
- #[cfg(windows)]
- Some(BytesOrWideString::Wide(wide)) => {
- use crate::os::windows::prelude::*;
- path_buf = crate::ffi::OsString::from_wide(wide);
- Path::new(&path_buf)
- }
- #[cfg(not(windows))]
- Some(BytesOrWideString::Wide(_wide)) => {
- Path::new("<unknown>")
- }
- None => return Ok(()),
- };
- let line = match symbol.lineno() {
- Some(line) => line,
- None => return Ok(()),
- };
- // prior line: " ##: {:2$} - func"
- self.out.write_all(b"")?;
- match self.format {
- PrintFormat::Full => write!(self.out, " {:1$}", "", HEX_WIDTH)?,
- PrintFormat::Short => write!(self.out, " ")?,
+ BytesOrWideString::Wide(wide) => {
+ use crate::os::windows::prelude::*;
+ Cow::Owned(crate::ffi::OsString::from_wide(wide).into())
}
-
- let mut already_printed = false;
- if self.format == PrintFormat::Short && file.is_absolute() {
- if let Ok(cwd) = env::current_dir() {
- if let Ok(stripped) = file.strip_prefix(&cwd) {
- if let Some(s) = stripped.to_str() {
- write!(self.out, " at .{}{}:{}", path::MAIN_SEPARATOR, s, line)?;
- already_printed = true;
- }
+ #[cfg(not(windows))]
+ BytesOrWideString::Wide(_wide) => {
+ Path::new("<unknown>").into()
+ }
+ };
+ if print_fmt == PrintFmt::Short && file.is_absolute() {
+ if let Some(cwd) = cwd {
+ if let Ok(stripped) = file.strip_prefix(&cwd) {
+ if let Some(s) = stripped.to_str() {
+ return write!(fmt, ".{}{}", path::MAIN_SEPARATOR, s);
}
}
}
- if !already_printed {
- write!(self.out, " at {}:{}", file.display(), line)?;
- }
-
- self.out.write_all(b"\n")
}
+ fmt::Display::fmt(&file.display(), fmt)
}
diff --git a/src/libstd/tests/env.rs b/src/libstd/tests/env.rs
index 06fb553..f8014cb 100644
--- a/src/libstd/tests/env.rs
+++ b/src/libstd/tests/env.rs
@@ -5,7 +5,7 @@
use rand::distributions::Alphanumeric;
fn make_rand_name() -> OsString {
- let mut rng = thread_rng();
+ let rng = thread_rng();
let n = format!("TEST{}", rng.sample_iter(&Alphanumeric).take(10)
.collect::<String>());
let n = OsString::from(n);
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index d59085c..dbec4da 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -216,7 +216,7 @@
}
/// Returns the amount of time elapsed from another instant to this one,
- /// or None if that instant is earlier than this one.
+ /// or None if that instant is later than this one.
///
/// # Examples
///
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index c93e6d1..bcbc0a1 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -352,7 +352,7 @@
pub ident: Ident,
pub attrs: ThinVec<Attribute>,
pub bounds: GenericBounds,
-
+ pub is_placeholder: bool,
pub kind: GenericParamKind,
}
@@ -413,11 +413,11 @@
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct WhereBoundPredicate {
pub span: Span,
- /// Any generics from a `for` binding
+ /// Any generics from a `for` binding.
pub bound_generic_params: Vec<GenericParam>,
- /// The type being bounded
+ /// The type being bounded.
pub bounded_ty: P<Ty>,
- /// Trait and lifetime bounds (`Clone+Send+'static`)
+ /// Trait and lifetime bounds (`Clone + Send + 'static`).
pub bounds: GenericBounds,
}
@@ -495,15 +495,15 @@
NameValue(Lit),
}
-/// A Block (`{ .. }`).
+/// A block (`{ .. }`).
///
/// E.g., `{ .. }` as in `fn foo() { .. }`.
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct Block {
- /// Statements in a block
+ /// The statements in the block.
pub stmts: Vec<Stmt>,
pub id: NodeId,
- /// Distinguishes between `unsafe { ... }` and `{ ... }`
+ /// Distinguishes between `unsafe { ... }` and `{ ... }`.
pub rules: BlockCheckMode,
pub span: Span,
}
@@ -613,6 +613,7 @@
pub attrs: ThinVec<Attribute>,
pub id: NodeId,
pub span: Span,
+ pub is_placeholder: bool,
}
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, Copy)]
@@ -908,11 +909,11 @@
/// Local represents a `let` statement, e.g., `let <pat>:<ty> = <expr>;`.
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct Local {
+ pub id: NodeId,
pub pat: P<Pat>,
pub ty: Option<P<Ty>>,
/// Initializer expression to set the value, if any.
pub init: Option<P<Expr>>,
- pub id: NodeId,
pub span: Span,
pub attrs: ThinVec<Attribute>,
}
@@ -935,6 +936,7 @@
pub body: P<Expr>,
pub span: Span,
pub id: NodeId,
+ pub is_placeholder: bool,
}
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
@@ -945,6 +947,7 @@
pub is_shorthand: bool,
pub attrs: ThinVec<Attribute>,
pub id: NodeId,
+ pub is_placeholder: bool,
}
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, Copy)]
@@ -970,7 +973,7 @@
pub value: P<Expr>,
}
-/// An expression
+/// An expression.
#[derive(Clone, RustcEncodable, RustcDecodable)]
pub struct Expr {
pub id: NodeId,
@@ -984,26 +987,26 @@
static_assert_size!(Expr, 96);
impl Expr {
- /// Whether this expression would be valid somewhere that expects a value; for example, an `if`
- /// condition.
+ /// Returns `true` if this expression would be valid somewhere that expects a value;
+ /// for example, an `if` condition.
pub fn returns(&self) -> bool {
if let ExprKind::Block(ref block, _) = self.node {
match block.stmts.last().map(|last_stmt| &last_stmt.node) {
- // implicit return
+ // Implicit return
Some(&StmtKind::Expr(_)) => true,
Some(&StmtKind::Semi(ref expr)) => {
if let ExprKind::Ret(_) = expr.node {
- // last statement is explicit return
+ // Last statement is explicit return.
true
} else {
false
}
}
- // This is a block that doesn't end in either an implicit or explicit return
+ // This is a block that doesn't end in either an implicit or explicit return.
_ => false,
}
} else {
- // This is not a block, it is a value
+ // This is not a block, it is a value.
true
}
}
@@ -1798,6 +1801,7 @@
pub pat: P<Pat>,
pub id: NodeId,
pub span: Span,
+ pub is_placeholder: bool,
}
/// Alternative representation for `Arg`s describing `self` parameter of methods.
@@ -1859,6 +1863,7 @@
span,
ty,
id: DUMMY_NODE_ID,
+ is_placeholder: false
};
match eself.node {
SelfKind::Explicit(ty, mutbl) => param(mutbl, ty),
@@ -2054,6 +2059,8 @@
pub disr_expr: Option<AnonConst>,
/// Span
pub span: Span,
+ /// Is a macro placeholder
+ pub is_placeholder: bool,
}
/// Part of `use` item to the right of its prefix.
@@ -2216,6 +2223,7 @@
pub id: NodeId,
pub ty: P<Ty>,
pub attrs: Vec<Attribute>,
+ pub is_placeholder: bool,
}
/// Fields and constructor ids of enum variants and structs.
@@ -2307,37 +2315,37 @@
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub enum ItemKind {
- /// An `extern crate` item, with optional *original* crate name if the crate was renamed.
+ /// An `extern crate` item, with the optional *original* crate name if the crate was renamed.
///
/// E.g., `extern crate foo` or `extern crate foo_bar as foo`.
ExternCrate(Option<Name>),
- /// A use declaration (`use` or `pub use`) item.
+ /// A use declaration item (`use`).
///
/// E.g., `use foo;`, `use foo::bar;` or `use foo::bar as FooBar;`.
Use(P<UseTree>),
- /// A static item (`static` or `pub static`).
+ /// A static item (`static`).
///
/// E.g., `static FOO: i32 = 42;` or `static FOO: &'static str = "bar";`.
Static(P<Ty>, Mutability, P<Expr>),
- /// A constant item (`const` or `pub const`).
+ /// A constant item (`const`).
///
/// E.g., `const FOO: i32 = 42;`.
Const(P<Ty>, P<Expr>),
- /// A function declaration (`fn` or `pub fn`).
+ /// A function declaration (`fn`).
///
/// E.g., `fn foo(bar: usize) -> usize { .. }`.
Fn(P<FnDecl>, FnHeader, Generics, P<Block>),
- /// A module declaration (`mod` or `pub mod`).
+ /// A module declaration (`mod`).
///
/// E.g., `mod foo;` or `mod foo { .. }`.
Mod(Mod),
- /// An external module (`extern` or `pub extern`).
+ /// An external module (`extern`).
///
/// E.g., `extern {}` or `extern "C" {}`.
ForeignMod(ForeignMod),
/// Module-level inline assembly (from `global_asm!()`).
GlobalAsm(P<GlobalAsm>),
- /// A type alias (`type` or `pub type`).
+ /// A type alias (`type`).
///
/// E.g., `type Foo = Bar<u8>;`.
TyAlias(P<Ty>, Generics),
@@ -2345,19 +2353,19 @@
///
/// E.g., `type Foo = impl Bar + Boo;`.
OpaqueTy(GenericBounds, Generics),
- /// An enum definition (`enum` or `pub enum`).
+ /// An enum definition (`enum`).
///
/// E.g., `enum Foo<A, B> { C<A>, D<B> }`.
Enum(EnumDef, Generics),
- /// A struct definition (`struct` or `pub struct`).
+ /// A struct definition (`struct`).
///
/// E.g., `struct Foo<A> { x: A }`.
Struct(VariantData, Generics),
- /// A union definition (`union` or `pub union`).
+ /// A union definition (`union`).
///
/// E.g., `union Foo<A, B> { x: A, y: B }`.
Union(VariantData, Generics),
- /// A Trait declaration (`trait` or `pub trait`).
+ /// A trait declaration (`trait`).
///
/// E.g., `trait Foo { .. }`, `trait Foo<T> { .. }` or `auto trait Foo {}`.
Trait(IsAuto, Unsafety, Generics, GenericBounds, Vec<TraitItem>),
diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs
index 5fb5137..b5037b7 100644
--- a/src/libsyntax/attr/builtin.rs
+++ b/src/libsyntax/attr/builtin.rs
@@ -154,23 +154,10 @@
#[derive(RustcEncodable, RustcDecodable, PartialEq, PartialOrd, Copy, Clone, Debug, Eq, Hash)]
pub enum StabilityLevel {
// Reason for the current stability level and the relevant rust-lang issue
- Unstable { reason: Option<Symbol>, issue: u32 },
+ Unstable { reason: Option<Symbol>, issue: u32, is_soft: bool },
Stable { since: Symbol },
}
-impl Stability {
- pub fn unstable(feature: Symbol, reason: Option<Symbol>, issue: u32) -> Stability {
- Stability {
- level: StabilityLevel::Unstable { reason, issue },
- feature,
- rustc_depr: None,
- const_stability: None,
- promotable: false,
- allow_const_fn_ptr: false,
- }
- }
-}
-
impl StabilityLevel {
pub fn is_unstable(&self) -> bool {
if let StabilityLevel::Unstable {..} = *self {
@@ -356,19 +343,27 @@
let mut feature = None;
let mut reason = None;
let mut issue = None;
+ let mut is_soft = false;
for meta in metas {
if let Some(mi) = meta.meta_item() {
match mi.name_or_empty() {
sym::feature => if !get(mi, &mut feature) { continue 'outer },
sym::reason => if !get(mi, &mut reason) { continue 'outer },
sym::issue => if !get(mi, &mut issue) { continue 'outer },
+ sym::soft => {
+ if !mi.is_word() {
+ let msg = "`soft` should not have any arguments";
+ sess.span_diagnostic.span_err(mi.span, msg);
+ }
+ is_soft = true;
+ }
_ => {
handle_errors(
sess,
meta.span(),
AttrError::UnknownMetaItem(
mi.path.to_string(),
- &["feature", "reason", "issue"]
+ &["feature", "reason", "issue", "soft"]
),
);
continue 'outer
@@ -400,7 +395,8 @@
"incorrect 'issue'");
continue
}
- }
+ },
+ is_soft,
},
feature,
rustc_depr: None,
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs
index 0e5cfa7..1f95406 100644
--- a/src/libsyntax/attr/mod.rs
+++ b/src/libsyntax/attr/mod.rs
@@ -1,4 +1,4 @@
-//! Functions dealing with attributes and meta items
+//! Functions dealing with attributes and meta items.
mod builtin;
@@ -16,7 +16,7 @@
use crate::source_map::{BytePos, Spanned, DUMMY_SP};
use crate::parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration};
use crate::parse::parser::Parser;
-use crate::parse::{self, ParseSess, PResult};
+use crate::parse::{ParseSess, PResult};
use crate::parse::token::{self, Token};
use crate::ptr::P;
use crate::symbol::{sym, Symbol};
@@ -25,7 +25,7 @@
use crate::GLOBALS;
use log::debug;
-use syntax_pos::{FileName, Span};
+use syntax_pos::Span;
use std::iter;
use std::ops::DerefMut;
@@ -61,7 +61,7 @@
}
impl NestedMetaItem {
- /// Returns the MetaItem if self is a NestedMetaItem::MetaItem.
+ /// Returns the `MetaItem` if `self` is a `NestedMetaItem::MetaItem`.
pub fn meta_item(&self) -> Option<&MetaItem> {
match *self {
NestedMetaItem::MetaItem(ref item) => Some(item),
@@ -69,7 +69,7 @@
}
}
- /// Returns the Lit if self is a NestedMetaItem::Literal.
+ /// Returns the `Lit` if `self` is a `NestedMetaItem::Literal`s.
pub fn literal(&self) -> Option<&Lit> {
match *self {
NestedMetaItem::Literal(ref lit) => Some(lit),
@@ -82,7 +82,7 @@
self.meta_item().map_or(false, |meta_item| meta_item.check_name(name))
}
- /// For a single-segment meta-item returns its name, otherwise returns `None`.
+ /// For a single-segment meta item, returns its name; otherwise, returns `None`.
pub fn ident(&self) -> Option<Ident> {
self.meta_item().and_then(|meta_item| meta_item.ident())
}
@@ -90,13 +90,13 @@
self.ident().unwrap_or(Ident::invalid()).name
}
- /// Gets the string value if self is a MetaItem and the MetaItem is a
- /// MetaItemKind::NameValue variant containing a string, otherwise None.
+ /// Gets the string value if `self` is a `MetaItem` and the `MetaItem` is a
+ /// `MetaItemKind::NameValue` variant containing a string, otherwise `None`.
pub fn value_str(&self) -> Option<Symbol> {
self.meta_item().and_then(|meta_item| meta_item.value_str())
}
- /// Returns a name and single literal value tuple of the MetaItem.
+ /// Returns a name and single literal value tuple of the `MetaItem`.
pub fn name_value_literal(&self) -> Option<(Name, &Lit)> {
self.meta_item().and_then(
|meta_item| meta_item.meta_item_list().and_then(
@@ -112,32 +112,32 @@
}))
}
- /// Gets a list of inner meta items from a list MetaItem type.
+ /// Gets a list of inner meta items from a list `MetaItem` type.
pub fn meta_item_list(&self) -> Option<&[NestedMetaItem]> {
self.meta_item().and_then(|meta_item| meta_item.meta_item_list())
}
- /// Returns `true` if the variant is MetaItem.
+ /// Returns `true` if the variant is `MetaItem`.
pub fn is_meta_item(&self) -> bool {
self.meta_item().is_some()
}
- /// Returns `true` if the variant is Literal.
+ /// Returns `true` if the variant is `Literal`.
pub fn is_literal(&self) -> bool {
self.literal().is_some()
}
- /// Returns `true` if self is a MetaItem and the meta item is a word.
+ /// Returns `true` if `self` is a `MetaItem` and the meta item is a word.
pub fn is_word(&self) -> bool {
self.meta_item().map_or(false, |meta_item| meta_item.is_word())
}
- /// Returns `true` if self is a MetaItem and the meta item is a ValueString.
+ /// Returns `true` if `self` is a `MetaItem` and the meta item is a `ValueString`.
pub fn is_value_str(&self) -> bool {
self.value_str().is_some()
}
- /// Returns `true` if self is a MetaItem and the meta item is a list.
+ /// Returns `true` if `self` is a `MetaItem` and the meta item is a list.
pub fn is_meta_item_list(&self) -> bool {
self.meta_item_list().is_some()
}
@@ -156,7 +156,7 @@
matches
}
- /// For a single-segment attribute returns its name, otherwise returns `None`.
+ /// For a single-segment attribute, returns its name; otherwise, returns `None`.
pub fn ident(&self) -> Option<Ident> {
if self.path.segments.len() == 1 {
Some(self.path.segments[0].ident)
@@ -187,14 +187,14 @@
self.meta_item_list().is_some()
}
- /// Indicates if the attribute is a Value String.
+ /// Indicates if the attribute is a `ValueString`.
pub fn is_value_str(&self) -> bool {
self.value_str().is_some()
}
}
impl MetaItem {
- /// For a single-segment meta-item returns its name, otherwise returns `None`.
+ /// For a single-segment meta item, returns its name; otherwise, returns `None`.
pub fn ident(&self) -> Option<Ident> {
if self.path.segments.len() == 1 {
Some(self.path.segments[0].ident)
@@ -206,8 +206,9 @@
self.ident().unwrap_or(Ident::invalid()).name
}
- // #[attribute(name = "value")]
- // ^^^^^^^^^^^^^^
+ // Example:
+ // #[attribute(name = "value")]
+ // ^^^^^^^^^^^^^^
pub fn name_value_literal(&self) -> Option<&Lit> {
match &self.node {
MetaItemKind::NameValue(v) => Some(v),
@@ -255,7 +256,7 @@
}
impl Attribute {
- /// Extracts the MetaItem from inside this Attribute.
+ /// Extracts the `MetaItem` from inside this `Attribute`.
pub fn meta(&self) -> Option<MetaItem> {
let mut tokens = self.tokens.trees().peekable();
Some(MetaItem {
@@ -318,8 +319,8 @@
})
}
- /// Converts self to a normal #[doc="foo"] comment, if it is a
- /// comment like `///` or `/** */`. (Returns self unchanged for
+ /// Converts `self` to a normal `#[doc="foo"]` comment, if it is a
+ /// comment like `///` or `/** */`. (Returns `self` unchanged for
/// non-sugared doc attributes.)
pub fn with_desugared_doc<T, F>(&self, f: F) -> T where
F: FnOnce(&Attribute) -> T,
@@ -381,28 +382,25 @@
AttrId(id)
}
-/// Returns an inner attribute with the given value and span.
-pub fn mk_attr_inner(item: MetaItem) -> Attribute {
+pub fn mk_attr(style: AttrStyle, path: Path, tokens: TokenStream, span: Span) -> Attribute {
Attribute {
id: mk_attr_id(),
- style: ast::AttrStyle::Inner,
- path: item.path,
- tokens: item.node.tokens(item.span),
+ style,
+ path,
+ tokens,
is_sugared_doc: false,
- span: item.span,
+ span,
}
}
+/// Returns an inner attribute with the given value and span.
+pub fn mk_attr_inner(item: MetaItem) -> Attribute {
+ mk_attr(AttrStyle::Inner, item.path, item.node.tokens(item.span), item.span)
+}
+
/// Returns an outer attribute with the given value and span.
pub fn mk_attr_outer(item: MetaItem) -> Attribute {
- Attribute {
- id: mk_attr_id(),
- style: ast::AttrStyle::Outer,
- path: item.path,
- tokens: item.node.tokens(item.span),
- is_sugared_doc: false,
- span: item.span,
- }
+ mk_attr(AttrStyle::Outer, item.path, item.node.tokens(item.span), item.span)
}
pub fn mk_sugared_doc_attr(text: Symbol, span: Span) -> Attribute {
@@ -716,33 +714,3 @@
Item, Expr, Local, ast::ForeignItem, ast::StructField, ast::ImplItem, ast::TraitItem, ast::Arm,
ast::Field, ast::FieldPat, ast::Variant, ast::Param
}
-
-pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -> ast::Crate {
- for raw_attr in attrs {
- let mut parser = parse::new_parser_from_source_str(
- parse_sess,
- FileName::cli_crate_attr_source_code(&raw_attr),
- raw_attr.clone(),
- );
-
- let start_span = parser.token.span;
- let (path, tokens) = panictry!(parser.parse_meta_item_unrestricted());
- let end_span = parser.token.span;
- if parser.token != token::Eof {
- parse_sess.span_diagnostic
- .span_err(start_span.to(end_span), "invalid crate attribute");
- continue;
- }
-
- krate.attrs.push(Attribute {
- id: mk_attr_id(),
- style: AttrStyle::Inner,
- path,
- tokens,
- is_sugared_doc: false,
- span: start_span.to(end_span),
- });
- }
-
- krate
-}
diff --git a/src/libsyntax/diagnostics/macros.rs b/src/libsyntax/diagnostics/macros.rs
index b754d08..c95c5bd 100644
--- a/src/libsyntax/diagnostics/macros.rs
+++ b/src/libsyntax/diagnostics/macros.rs
@@ -1,13 +1,14 @@
#[macro_export]
-macro_rules! register_diagnostic {
- ($code:tt, $description:tt) => (__register_diagnostic! { $code, $description });
- ($code:tt) => (__register_diagnostic! { $code })
+macro_rules! diagnostic_used {
+ ($code:ident) => (
+ let _ = crate::error_codes::$code;
+ )
}
#[macro_export]
macro_rules! span_fatal {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.span_fatal_with_code(
$span,
&format!($($message)*),
@@ -19,7 +20,7 @@
#[macro_export]
macro_rules! span_err {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.span_err_with_code(
$span,
&format!($($message)*),
@@ -31,7 +32,7 @@
#[macro_export]
macro_rules! span_warn {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.span_warn_with_code(
$span,
&format!($($message)*),
@@ -43,7 +44,7 @@
#[macro_export]
macro_rules! struct_err {
($session:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.struct_err_with_code(
&format!($($message)*),
$crate::errors::DiagnosticId::Error(stringify!($code).to_owned()),
@@ -54,7 +55,7 @@
#[macro_export]
macro_rules! span_err_or_warn {
($is_warning:expr, $session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
if $is_warning {
$session.span_warn_with_code(
$span,
@@ -74,7 +75,7 @@
#[macro_export]
macro_rules! struct_span_fatal {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.struct_span_fatal_with_code(
$span,
&format!($($message)*),
@@ -86,7 +87,7 @@
#[macro_export]
macro_rules! struct_span_err {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.struct_span_err_with_code(
$span,
&format!($($message)*),
@@ -98,7 +99,7 @@
#[macro_export]
macro_rules! stringify_error_code {
($code:ident) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$crate::errors::DiagnosticId::Error(stringify!($code).to_owned())
})
}
@@ -117,7 +118,7 @@
#[macro_export]
macro_rules! struct_span_warn {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
$session.struct_span_warn_with_code(
$span,
&format!($($message)*),
@@ -129,7 +130,7 @@
#[macro_export]
macro_rules! struct_span_err_or_warn {
($is_warning:expr, $session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
- __diagnostic_used!($code);
+ $crate::diagnostic_used!($code);
if $is_warning {
$session.struct_span_warn_with_code(
$span,
@@ -169,20 +170,22 @@
#[macro_export]
macro_rules! register_diagnostics {
- ($($code:tt),*) => (
- $($crate::register_diagnostic! { $code })*
+ ($($ecode:ident: $message:expr,)*) => (
+ $crate::register_diagnostics!{$($ecode:$message,)* ;}
);
- ($($code:tt),*,) => (
- $($crate::register_diagnostic! { $code })*
- )
-}
-#[macro_export]
-macro_rules! register_long_diagnostics {
- ($($code:tt: $description:tt),*) => (
- $($crate::register_diagnostic! { $code, $description })*
- );
- ($($code:tt: $description:tt),*,) => (
- $($crate::register_diagnostic! { $code, $description })*
+ ($($ecode:ident: $message:expr,)* ; $($code:ident,)*) => (
+ pub static DIAGNOSTICS: &[(&str, &str)] = &[
+ $( (stringify!($ecode), $message), )*
+ ];
+
+ $(
+ #[deny(unused)]
+ pub(crate) const $ecode: &str = $message;
+ )*
+ $(
+ #[deny(unused)]
+ pub(crate) const $code: () = ();
+ )*
)
}
diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs
deleted file mode 100644
index 5de39c8..0000000
--- a/src/libsyntax/diagnostics/plugin.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use std::collections::BTreeMap;
-
-use crate::ast::{self, Ident, Name};
-use crate::source_map;
-use crate::ext::base::{ExtCtxt, MacEager, MacResult};
-use crate::parse::token::{self, Token};
-use crate::ptr::P;
-use crate::symbol::kw;
-use crate::tokenstream::{TokenTree, TokenStream};
-
-use smallvec::smallvec;
-use syntax_pos::Span;
-
-pub use errors::*;
-
-// Maximum width of any line in an extended error description (inclusive).
-const MAX_DESCRIPTION_WIDTH: usize = 80;
-
-/// Error information type.
-pub struct ErrorInfo {
- pub description: Option<Name>,
- pub use_site: Option<Span>
-}
-
-/// Mapping from error codes to metadata.
-pub type ErrorMap = BTreeMap<Name, ErrorInfo>;
-
-pub fn expand_diagnostic_used<'cx>(ecx: &'cx mut ExtCtxt<'_>,
- span: Span,
- tts: TokenStream)
- -> Box<dyn MacResult+'cx> {
- assert_eq!(tts.len(), 1);
- let code = match tts.into_trees().next() {
- Some(TokenTree::Token(Token { kind: token::Ident(code, _), .. })) => code,
- _ => unreachable!()
- };
-
- ecx.parse_sess.registered_diagnostics.with_lock(|diagnostics| {
- match diagnostics.get_mut(&code) {
- // Previously used errors.
- Some(&mut ErrorInfo { description: _, use_site: Some(previous_span) }) => {
- ecx.struct_span_warn(span, &format!(
- "diagnostic code {} already used", code
- )).span_note(previous_span, "previous invocation")
- .emit();
- }
- // Newly used errors.
- Some(ref mut info) => {
- info.use_site = Some(span);
- }
- // Unregistered errors.
- None => {
- ecx.span_err(span, &format!(
- "used diagnostic code {} not registered", code
- ));
- }
- }
- });
- MacEager::expr(ecx.expr_tuple(span, Vec::new()))
-}
-
-pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt<'_>,
- span: Span,
- tts: TokenStream)
- -> Box<dyn MacResult+'cx> {
- assert!(tts.len() == 1 || tts.len() == 3);
- let mut cursor = tts.into_trees();
- let code = match cursor.next() {
- Some(TokenTree::Token(Token { kind: token::Ident(code, _), .. })) => code,
- _ => unreachable!()
- };
- let description = match (cursor.next(), cursor.next()) {
- (None, None) => None,
- (
- Some(TokenTree::Token(Token { kind: token::Comma, .. })),
- Some(TokenTree::Token(Token { kind: token::Literal(token::Lit { symbol, .. }), ..}))
- ) => {
- Some(symbol)
- },
- _ => unreachable!()
- };
-
- // Check that the description starts and ends with a newline and doesn't
- // overflow the maximum line width.
- description.map(|raw_msg| {
- let msg = raw_msg.as_str();
- if !msg.starts_with("\n") || !msg.ends_with("\n") {
- ecx.span_err(span, &format!(
- "description for error code {} doesn't start and end with a newline",
- code
- ));
- }
-
- // URLs can be unavoidably longer than the line limit, so we allow them.
- // Allowed format is: `[name]: https://www.rust-lang.org/`
- let is_url = |l: &str| l.starts_with("[") && l.contains("]:") && l.contains("http");
-
- if msg.lines().any(|line| line.len() > MAX_DESCRIPTION_WIDTH && !is_url(line)) {
- ecx.span_err(span, &format!(
- "description for error code {} contains a line longer than {} characters.\n\
- if you're inserting a long URL use the footnote style to bypass this check.",
- code, MAX_DESCRIPTION_WIDTH
- ));
- }
- });
- // Add the error to the map.
- ecx.parse_sess.registered_diagnostics.with_lock(|diagnostics| {
- let info = ErrorInfo {
- description,
- use_site: None
- };
- if diagnostics.insert(code, info).is_some() {
- ecx.span_err(span, &format!(
- "diagnostic code {} already registered", code
- ));
- }
- });
-
- MacEager::items(smallvec![])
-}
-
-pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt<'_>,
- span: Span,
- tts: TokenStream)
- -> Box<dyn MacResult+'cx> {
- assert_eq!(tts.len(), 3);
- let ident = match tts.into_trees().nth(2) {
- // DIAGNOSTICS ident.
- Some(TokenTree::Token(Token { kind: token::Ident(name, _), span }))
- => Ident::new(name, span),
- _ => unreachable!()
- };
-
- // Construct the output expression.
- let (count, expr) =
- ecx.parse_sess.registered_diagnostics.with_lock(|diagnostics| {
- let descriptions: Vec<P<ast::Expr>> =
- diagnostics.iter().filter_map(|(&code, info)| {
- info.description.map(|description| {
- ecx.expr_tuple(span, vec![
- ecx.expr_str(span, code),
- ecx.expr_str(span, description)
- ])
- })
- }).collect();
- (descriptions.len(), ecx.expr_vec(span, descriptions))
- });
-
- let static_ = ecx.lifetime(span, Ident::with_dummy_span(kw::StaticLifetime));
- let ty_str = ecx.ty_rptr(
- span,
- ecx.ty_ident(span, ecx.ident_of("str")),
- Some(static_),
- ast::Mutability::Immutable,
- );
-
- let ty = ecx.ty(
- span,
- ast::TyKind::Array(
- ecx.ty(
- span,
- ast::TyKind::Tup(vec![ty_str.clone(), ty_str])
- ),
- ast::AnonConst {
- id: ast::DUMMY_NODE_ID,
- value: ecx.expr_usize(span, count),
- },
- ),
- );
-
- MacEager::items(smallvec![
- P(ast::Item {
- ident,
- attrs: Vec::new(),
- id: ast::DUMMY_NODE_ID,
- node: ast::ItemKind::Const(
- ty,
- expr,
- ),
- vis: source_map::respan(span.shrink_to_lo(), ast::VisibilityKind::Public),
- span,
- tokens: None,
- })
- ])
-}
diff --git a/src/libsyntax/error_codes.rs b/src/libsyntax/error_codes.rs
index 1ba2901..9925dd8 100644
--- a/src/libsyntax/error_codes.rs
+++ b/src/libsyntax/error_codes.rs
@@ -1,7 +1,8 @@
// Error messages for EXXXX errors.
-// Each message should start and end with a new line, and be wrapped to 80 characters.
-// In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use `:set tw=0` to disable.
-register_long_diagnostics! {
+// Each message should start and end with a new line, and be wrapped to 80
+// characters. In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use
+// `:set tw=0` to disable.
+register_diagnostics! {
E0178: r##"
In types, the `+` type operator has low precedence, so it is often necessary
@@ -420,9 +421,8 @@
features in the `-Z allow_features` flag.
"##,
-}
+;
-register_diagnostics! {
E0539, // incorrect meta item
E0540, // multiple rustc_deprecated attributes
E0542, // missing 'since'
@@ -432,7 +432,9 @@
E0546, // missing 'feature'
E0547, // missing 'issue'
// E0548, // replaced with a generic attribute input check
- E0549, // rustc_deprecated attribute must be paired with either stable or unstable attribute
+ // rustc_deprecated attribute must be paired with either stable or unstable
+ // attribute
+ E0549,
E0550, // multiple deprecated attributes
E0551, // incorrect meta item
E0553, // multiple rustc_const_unstable attributes
@@ -440,9 +442,11 @@
E0556, // malformed feature, expected just one word
E0584, // file for module `..` found at both .. and ..
E0629, // missing 'feature' (rustc_const_unstable)
- E0630, // rustc_const_unstable attribute must be paired with stable/unstable attribute
+ // rustc_const_unstable attribute must be paired with stable/unstable
+ // attribute
+ E0630,
E0693, // incorrect `repr(align)` attribute format
- E0694, // an unknown tool name found in scoped attributes
+// E0694, // an unknown tool name found in scoped attributes
E0703, // invalid ABI
E0717, // rustc_promotable without stability attribute
}
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 109ba04..7759a98 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -3,7 +3,7 @@
use crate::source_map::SourceMap;
use crate::edition::Edition;
use crate::ext::expand::{self, AstFragment, Invocation};
-use crate::ext::hygiene::{ExpnId, Transparency};
+use crate::ext::hygiene::ExpnId;
use crate::mut_visit::{self, MutVisitor};
use crate::parse::{self, parser, ParseSess, DirectoryOwnership};
use crate::parse::token;
@@ -16,7 +16,7 @@
use errors::{DiagnosticBuilder, DiagnosticId};
use smallvec::{smallvec, SmallVec};
use syntax_pos::{FileName, Span, MultiSpan, DUMMY_SP};
-use syntax_pos::hygiene::{ExpnData, ExpnKind};
+use syntax_pos::hygiene::{AstPass, ExpnData, ExpnKind};
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::sync::{self, Lrc};
@@ -35,6 +35,13 @@
ForeignItem(P<ast::ForeignItem>),
Stmt(P<ast::Stmt>),
Expr(P<ast::Expr>),
+ Arm(ast::Arm),
+ Field(ast::Field),
+ FieldPat(ast::FieldPat),
+ GenericParam(ast::GenericParam),
+ Param(ast::Param),
+ StructField(ast::StructField),
+ Variant(ast::Variant),
}
impl HasAttrs for Annotatable {
@@ -46,6 +53,13 @@
Annotatable::ForeignItem(ref foreign_item) => &foreign_item.attrs,
Annotatable::Stmt(ref stmt) => stmt.attrs(),
Annotatable::Expr(ref expr) => &expr.attrs,
+ Annotatable::Arm(ref arm) => &arm.attrs,
+ Annotatable::Field(ref field) => &field.attrs,
+ Annotatable::FieldPat(ref fp) => &fp.attrs,
+ Annotatable::GenericParam(ref gp) => &gp.attrs,
+ Annotatable::Param(ref p) => &p.attrs,
+ Annotatable::StructField(ref sf) => &sf.attrs,
+ Annotatable::Variant(ref v) => &v.attrs(),
}
}
@@ -57,6 +71,13 @@
Annotatable::ForeignItem(foreign_item) => foreign_item.visit_attrs(f),
Annotatable::Stmt(stmt) => stmt.visit_attrs(f),
Annotatable::Expr(expr) => expr.visit_attrs(f),
+ Annotatable::Arm(arm) => arm.visit_attrs(f),
+ Annotatable::Field(field) => field.visit_attrs(f),
+ Annotatable::FieldPat(fp) => fp.visit_attrs(f),
+ Annotatable::GenericParam(gp) => gp.visit_attrs(f),
+ Annotatable::Param(p) => p.visit_attrs(f),
+ Annotatable::StructField(sf) => sf.visit_attrs(f),
+ Annotatable::Variant(v) => v.visit_attrs(f),
}
}
}
@@ -70,6 +91,13 @@
Annotatable::ForeignItem(ref foreign_item) => foreign_item.span,
Annotatable::Stmt(ref stmt) => stmt.span,
Annotatable::Expr(ref expr) => expr.span,
+ Annotatable::Arm(ref arm) => arm.span,
+ Annotatable::Field(ref field) => field.span,
+ Annotatable::FieldPat(ref fp) => fp.pat.span,
+ Annotatable::GenericParam(ref gp) => gp.ident.span,
+ Annotatable::Param(ref p) => p.span,
+ Annotatable::StructField(ref sf) => sf.span,
+ Annotatable::Variant(ref v) => v.span,
}
}
@@ -81,6 +109,13 @@
Annotatable::ForeignItem(foreign_item) => visitor.visit_foreign_item(foreign_item),
Annotatable::Stmt(stmt) => visitor.visit_stmt(stmt),
Annotatable::Expr(expr) => visitor.visit_expr(expr),
+ Annotatable::Arm(arm) => visitor.visit_arm(arm),
+ Annotatable::Field(field) => visitor.visit_field(field),
+ Annotatable::FieldPat(fp) => visitor.visit_field_pattern(fp),
+ Annotatable::GenericParam(gp) => visitor.visit_generic_param(gp),
+ Annotatable::Param(p) => visitor.visit_param(p),
+ Annotatable::StructField(sf) =>visitor.visit_struct_field(sf),
+ Annotatable::Variant(v) => visitor.visit_variant(v),
}
}
@@ -136,6 +171,55 @@
}
}
+ pub fn expect_arm(self) -> ast::Arm {
+ match self {
+ Annotatable::Arm(arm) => arm,
+ _ => panic!("expected match arm")
+ }
+ }
+
+ pub fn expect_field(self) -> ast::Field {
+ match self {
+ Annotatable::Field(field) => field,
+ _ => panic!("expected field")
+ }
+ }
+
+ pub fn expect_field_pattern(self) -> ast::FieldPat {
+ match self {
+ Annotatable::FieldPat(fp) => fp,
+ _ => panic!("expected field pattern")
+ }
+ }
+
+ pub fn expect_generic_param(self) -> ast::GenericParam {
+ match self {
+ Annotatable::GenericParam(gp) => gp,
+ _ => panic!("expected generic parameter")
+ }
+ }
+
+ pub fn expect_param(self) -> ast::Param {
+ match self {
+ Annotatable::Param(param) => param,
+ _ => panic!("expected parameter")
+ }
+ }
+
+ pub fn expect_struct_field(self) -> ast::StructField {
+ match self {
+ Annotatable::StructField(sf) => sf,
+ _ => panic!("expected struct field")
+ }
+ }
+
+ pub fn expect_variant(self) -> ast::Variant {
+ match self {
+ Annotatable::Variant(v) => v,
+ _ => panic!("expected variant")
+ }
+ }
+
pub fn derive_allowed(&self) -> bool {
match *self {
Annotatable::Item(ref item) => match item.node {
@@ -325,6 +409,34 @@
fn make_ty(self: Box<Self>) -> Option<P<ast::Ty>> {
None
}
+
+ fn make_arms(self: Box<Self>) -> Option<SmallVec<[ast::Arm; 1]>> {
+ None
+ }
+
+ fn make_fields(self: Box<Self>) -> Option<SmallVec<[ast::Field; 1]>> {
+ None
+ }
+
+ fn make_field_patterns(self: Box<Self>) -> Option<SmallVec<[ast::FieldPat; 1]>> {
+ None
+ }
+
+ fn make_generic_params(self: Box<Self>) -> Option<SmallVec<[ast::GenericParam; 1]>> {
+ None
+ }
+
+ fn make_params(self: Box<Self>) -> Option<SmallVec<[ast::Param; 1]>> {
+ None
+ }
+
+ fn make_struct_fields(self: Box<Self>) -> Option<SmallVec<[ast::StructField; 1]>> {
+ None
+ }
+
+ fn make_variants(self: Box<Self>) -> Option<SmallVec<[ast::Variant; 1]>> {
+ None
+ }
}
macro_rules! make_MacEager {
@@ -498,6 +610,34 @@
fn make_ty(self: Box<DummyResult>) -> Option<P<ast::Ty>> {
Some(DummyResult::raw_ty(self.span, self.is_error))
}
+
+ fn make_arms(self: Box<DummyResult>) -> Option<SmallVec<[ast::Arm; 1]>> {
+ Some(SmallVec::new())
+ }
+
+ fn make_fields(self: Box<DummyResult>) -> Option<SmallVec<[ast::Field; 1]>> {
+ Some(SmallVec::new())
+ }
+
+ fn make_field_patterns(self: Box<DummyResult>) -> Option<SmallVec<[ast::FieldPat; 1]>> {
+ Some(SmallVec::new())
+ }
+
+ fn make_generic_params(self: Box<DummyResult>) -> Option<SmallVec<[ast::GenericParam; 1]>> {
+ Some(SmallVec::new())
+ }
+
+ fn make_params(self: Box<DummyResult>) -> Option<SmallVec<[ast::Param; 1]>> {
+ Some(SmallVec::new())
+ }
+
+ fn make_struct_fields(self: Box<DummyResult>) -> Option<SmallVec<[ast::StructField; 1]>> {
+ Some(SmallVec::new())
+ }
+
+ fn make_variants(self: Box<DummyResult>) -> Option<SmallVec<[ast::Variant; 1]>> {
+ Some(SmallVec::new())
+ }
}
/// A syntax extension kind.
@@ -732,13 +872,19 @@
pub trait Resolver {
fn next_node_id(&mut self) -> NodeId;
- fn get_module_scope(&mut self, id: NodeId) -> ExpnId;
-
fn resolve_dollar_crates(&mut self);
fn visit_ast_fragment_with_placeholders(&mut self, expn_id: ExpnId, fragment: &AstFragment,
extra_placeholders: &[NodeId]);
fn register_builtin_macro(&mut self, ident: ast::Ident, ext: SyntaxExtension);
+ fn expansion_for_ast_pass(
+ &mut self,
+ call_site: Span,
+ pass: AstPass,
+ features: &[Symbol],
+ parent_module_id: Option<NodeId>,
+ ) -> ExpnId;
+
fn resolve_imports(&mut self);
fn resolve_macro_invocation(
@@ -822,20 +968,20 @@
/// Equivalent of `Span::def_site` from the proc macro API,
/// except that the location is taken from the span passed as an argument.
pub fn with_def_site_ctxt(&self, span: Span) -> Span {
- span.with_ctxt_from_mark(self.current_expansion.id, Transparency::Opaque)
+ span.with_def_site_ctxt(self.current_expansion.id)
}
/// Equivalent of `Span::call_site` from the proc macro API,
/// except that the location is taken from the span passed as an argument.
pub fn with_call_site_ctxt(&self, span: Span) -> Span {
- span.with_ctxt_from_mark(self.current_expansion.id, Transparency::Transparent)
+ span.with_call_site_ctxt(self.current_expansion.id)
}
/// Span with a context reproducing `macro_rules` hygiene (hygienic locals, unhygienic items).
/// FIXME: This should be eventually replaced either with `with_def_site_ctxt` (preferably),
/// or with `with_call_site_ctxt` (where necessary).
pub fn with_legacy_ctxt(&self, span: Span) -> Span {
- span.with_ctxt_from_mark(self.current_expansion.id, Transparency::SemiTransparent)
+ span.with_legacy_ctxt(self.current_expansion.id)
}
/// Returns span for the macro which originally caused the current expansion to happen.
@@ -952,7 +1098,7 @@
self.resolver.check_unused_macros();
}
- /// Resolve a path mentioned inside Rust code.
+ /// Resolves a path mentioned inside Rust code.
///
/// This unifies the logic used for resolving `include_X!`, and `#[doc(include)]` file paths.
///
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
index dc6cbfc..06a5531 100644
--- a/src/libsyntax/ext/build.rs
+++ b/src/libsyntax/ext/build.rs
@@ -166,7 +166,8 @@
bounds,
kind: ast::GenericParamKind::Type {
default,
- }
+ },
+ is_placeholder: false
}
}
@@ -207,6 +208,7 @@
attrs: attrs.into(),
bounds,
kind: ast::GenericParamKind::Lifetime,
+ is_placeholder: false
}
}
@@ -404,6 +406,7 @@
is_shorthand: false,
attrs: ThinVec::new(),
id: ast::DUMMY_NODE_ID,
+ is_placeholder: false,
}
}
pub fn expr_struct(
@@ -614,6 +617,7 @@
body: expr,
span,
id: ast::DUMMY_NODE_ID,
+ is_placeholder: false,
}
}
@@ -701,6 +705,7 @@
pat: arg_pat,
span,
ty,
+ is_placeholder: false,
}
}
@@ -774,6 +779,7 @@
vis: respan(span.shrink_to_lo(), ast::VisibilityKind::Inherited),
attrs: Vec::new(),
id: ast::DUMMY_NODE_ID,
+ is_placeholder: false,
}
}).collect();
@@ -790,6 +796,7 @@
id: ast::DUMMY_NODE_ID,
ident,
span,
+ is_placeholder: false,
}
}
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 4fd0c36..87e2d72 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -141,7 +141,40 @@
"impl item"; many fn flat_map_impl_item; fn visit_impl_item; fn make_impl_items;
}
ForeignItems(SmallVec<[ast::ForeignItem; 1]>) {
- "foreign item"; many fn flat_map_foreign_item; fn visit_foreign_item; fn make_foreign_items;
+ "foreign item";
+ many fn flat_map_foreign_item;
+ fn visit_foreign_item;
+ fn make_foreign_items;
+ }
+ Arms(SmallVec<[ast::Arm; 1]>) {
+ "match arm"; many fn flat_map_arm; fn visit_arm; fn make_arms;
+ }
+ Fields(SmallVec<[ast::Field; 1]>) {
+ "field expression"; many fn flat_map_field; fn visit_field; fn make_fields;
+ }
+ FieldPats(SmallVec<[ast::FieldPat; 1]>) {
+ "field pattern";
+ many fn flat_map_field_pattern;
+ fn visit_field_pattern;
+ fn make_field_patterns;
+ }
+ GenericParams(SmallVec<[ast::GenericParam; 1]>) {
+ "generic parameter";
+ many fn flat_map_generic_param;
+ fn visit_generic_param;
+ fn make_generic_params;
+ }
+ Params(SmallVec<[ast::Param; 1]>) {
+ "function parameter"; many fn flat_map_param; fn visit_param; fn make_params;
+ }
+ StructFields(SmallVec<[ast::StructField; 1]>) {
+ "field";
+ many fn flat_map_struct_field;
+ fn visit_struct_field;
+ fn make_struct_fields;
+ }
+ Variants(SmallVec<[ast::Variant; 1]>) {
+ "variant"; many fn flat_map_variant; fn visit_variant; fn make_variants;
}
}
@@ -154,6 +187,21 @@
-> AstFragment {
let mut items = items.into_iter();
match self {
+ AstFragmentKind::Arms =>
+ AstFragment::Arms(items.map(Annotatable::expect_arm).collect()),
+ AstFragmentKind::Fields =>
+ AstFragment::Fields(items.map(Annotatable::expect_field).collect()),
+ AstFragmentKind::FieldPats =>
+ AstFragment::FieldPats(items.map(Annotatable::expect_field_pattern).collect()),
+ AstFragmentKind::GenericParams =>
+ AstFragment::GenericParams(items.map(Annotatable::expect_generic_param).collect()),
+ AstFragmentKind::Params =>
+ AstFragment::Params(items.map(Annotatable::expect_param).collect()),
+ AstFragmentKind::StructFields => AstFragment::StructFields(
+ items.map(Annotatable::expect_struct_field).collect()
+ ),
+ AstFragmentKind::Variants =>
+ AstFragment::Variants(items.map(Annotatable::expect_variant).collect()),
AstFragmentKind::Items =>
AstFragment::Items(items.map(Annotatable::expect_item).collect()),
AstFragmentKind::ImplItems =>
@@ -177,7 +225,7 @@
pub struct Invocation {
pub kind: InvocationKind,
- fragment_kind: AstFragmentKind,
+ pub fragment_kind: AstFragmentKind,
pub expansion_data: ExpansionData,
}
@@ -482,6 +530,27 @@
Annotatable::Expr(mut expr) => {
Annotatable::Expr({ cfg.visit_expr(&mut expr); expr })
}
+ Annotatable::Arm(arm) => {
+ Annotatable::Arm(cfg.flat_map_arm(arm).pop().unwrap())
+ }
+ Annotatable::Field(field) => {
+ Annotatable::Field(cfg.flat_map_field(field).pop().unwrap())
+ }
+ Annotatable::FieldPat(fp) => {
+ Annotatable::FieldPat(cfg.flat_map_field_pattern(fp).pop().unwrap())
+ }
+ Annotatable::GenericParam(param) => {
+ Annotatable::GenericParam(cfg.flat_map_generic_param(param).pop().unwrap())
+ }
+ Annotatable::Param(param) => {
+ Annotatable::Param(cfg.flat_map_param(param).pop().unwrap())
+ }
+ Annotatable::StructField(sf) => {
+ Annotatable::StructField(cfg.flat_map_struct_field(sf).pop().unwrap())
+ }
+ Annotatable::Variant(v) => {
+ Annotatable::Variant(cfg.flat_map_variant(v).pop().unwrap())
+ }
}
}
@@ -547,6 +616,14 @@
Annotatable::ForeignItem(item) => token::NtForeignItem(item.into_inner()),
Annotatable::Stmt(stmt) => token::NtStmt(stmt.into_inner()),
Annotatable::Expr(expr) => token::NtExpr(expr),
+ Annotatable::Arm(..)
+ | Annotatable::Field(..)
+ | Annotatable::FieldPat(..)
+ | Annotatable::GenericParam(..)
+ | Annotatable::Param(..)
+ | Annotatable::StructField(..)
+ | Annotatable::Variant(..)
+ => panic!("unexpected annotatable"),
})), DUMMY_SP).into();
let input = self.extract_proc_macro_attr_input(attr.tokens, span);
let tok_result = expander.expand(self.cx, span, input, item_tok);
@@ -625,6 +702,14 @@
Annotatable::Expr(_) if self.cx.ecfg.proc_macro_hygiene() => return,
Annotatable::Stmt(_) => ("statements", sym::proc_macro_hygiene),
Annotatable::Expr(_) => ("expressions", sym::proc_macro_hygiene),
+ Annotatable::Arm(..)
+ | Annotatable::Field(..)
+ | Annotatable::FieldPat(..)
+ | Annotatable::GenericParam(..)
+ | Annotatable::Param(..)
+ | Annotatable::StructField(..)
+ | Annotatable::Variant(..)
+ => panic!("unexpected annotatable"),
};
emit_feature_err(
self.cx.parse_sess,
@@ -681,6 +766,14 @@
AstFragmentKind::TraitItems => return,
AstFragmentKind::ImplItems => return,
AstFragmentKind::ForeignItems => return,
+ AstFragmentKind::Arms
+ | AstFragmentKind::Fields
+ | AstFragmentKind::FieldPats
+ | AstFragmentKind::GenericParams
+ | AstFragmentKind::Params
+ | AstFragmentKind::StructFields
+ | AstFragmentKind::Variants
+ => panic!("unexpected AST fragment kind"),
};
if self.cx.ecfg.proc_macro_hygiene() {
return
@@ -771,6 +864,14 @@
},
AstFragmentKind::Ty => AstFragment::Ty(self.parse_ty()?),
AstFragmentKind::Pat => AstFragment::Pat(self.parse_pat(None)?),
+ AstFragmentKind::Arms
+ | AstFragmentKind::Fields
+ | AstFragmentKind::FieldPats
+ | AstFragmentKind::GenericParams
+ | AstFragmentKind::Params
+ | AstFragmentKind::StructFields
+ | AstFragmentKind::Variants
+ => panic!("unexpected AST fragment kind"),
})
}
@@ -972,6 +1073,84 @@
});
}
+ fn flat_map_arm(&mut self, arm: ast::Arm) -> SmallVec<[ast::Arm; 1]> {
+ let mut arm = configure!(self, arm);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut arm);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::Arm(arm),
+ AstFragmentKind::Arms, after_derive)
+ .make_arms();
+ }
+
+ noop_flat_map_arm(arm, self)
+ }
+
+ fn flat_map_field(&mut self, field: ast::Field) -> SmallVec<[ast::Field; 1]> {
+ let mut field = configure!(self, field);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut field);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::Field(field),
+ AstFragmentKind::Fields, after_derive)
+ .make_fields();
+ }
+
+ noop_flat_map_field(field, self)
+ }
+
+ fn flat_map_field_pattern(&mut self, fp: ast::FieldPat) -> SmallVec<[ast::FieldPat; 1]> {
+ let mut fp = configure!(self, fp);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut fp);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::FieldPat(fp),
+ AstFragmentKind::FieldPats, after_derive)
+ .make_field_patterns();
+ }
+
+ noop_flat_map_field_pattern(fp, self)
+ }
+
+ fn flat_map_param(&mut self, p: ast::Param) -> SmallVec<[ast::Param; 1]> {
+ let mut p = configure!(self, p);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut p);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::Param(p),
+ AstFragmentKind::Params, after_derive)
+ .make_params();
+ }
+
+ noop_flat_map_param(p, self)
+ }
+
+ fn flat_map_struct_field(&mut self, sf: ast::StructField) -> SmallVec<[ast::StructField; 1]> {
+ let mut sf = configure!(self, sf);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut sf);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::StructField(sf),
+ AstFragmentKind::StructFields, after_derive)
+ .make_struct_fields();
+ }
+
+ noop_flat_map_struct_field(sf, self)
+ }
+
+ fn flat_map_variant(&mut self, variant: ast::Variant) -> SmallVec<[ast::Variant; 1]> {
+ let mut variant = configure!(self, variant);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut variant);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::Variant(variant),
+ AstFragmentKind::Variants, after_derive)
+ .make_variants();
+ }
+
+ noop_flat_map_variant(variant, self)
+ }
+
fn filter_map_expr(&mut self, expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
let expr = configure!(self, expr);
expr.filter_map(|mut expr| {
@@ -1227,12 +1406,20 @@
}
}
- fn flat_map_generic_param(
- &mut self,
- param: ast::GenericParam
+ fn flat_map_generic_param(
+ &mut self,
+ param: ast::GenericParam
) -> SmallVec<[ast::GenericParam; 1]>
{
- let param = configure!(self, param);
+ let mut param = configure!(self, param);
+
+ let (attr, traits, after_derive) = self.classify_item(&mut param);
+ if attr.is_some() || !traits.is_empty() {
+ return self.collect_attr(attr, traits, Annotatable::GenericParam(param),
+ AstFragmentKind::GenericParams, after_derive)
+ .make_generic_params();
+ }
+
noop_flat_map_generic_param(param, self)
}
diff --git a/src/libsyntax/ext/placeholders.rs b/src/libsyntax/ext/placeholders.rs
index d800cfe..52a0f95 100644
--- a/src/libsyntax/ext/placeholders.rs
+++ b/src/libsyntax/ext/placeholders.rs
@@ -32,6 +32,16 @@
attrs: ThinVec::new(),
node: ast::ExprKind::Mac(mac_placeholder()),
});
+ let ty = P(ast::Ty {
+ id,
+ node: ast::TyKind::Mac(mac_placeholder()),
+ span,
+ });
+ let pat = P(ast::Pat {
+ id,
+ node: ast::PatKind::Mac(mac_placeholder()),
+ span,
+ });
match kind {
AstFragmentKind::Expr => AstFragment::Expr(expr_placeholder()),
@@ -67,6 +77,81 @@
let mac = P((mac_placeholder(), ast::MacStmtStyle::Braces, ThinVec::new()));
ast::Stmt { id, span, node: ast::StmtKind::Mac(mac) }
}]),
+ AstFragmentKind::Arms => AstFragment::Arms(smallvec![
+ ast::Arm {
+ attrs: Default::default(),
+ body: expr_placeholder(),
+ guard: None,
+ id,
+ pat,
+ span,
+ is_placeholder: true,
+ }
+ ]),
+ AstFragmentKind::Fields => AstFragment::Fields(smallvec![
+ ast::Field {
+ attrs: Default::default(),
+ expr: expr_placeholder(),
+ id,
+ ident,
+ is_shorthand: false,
+ span,
+ is_placeholder: true,
+ }
+ ]),
+ AstFragmentKind::FieldPats => AstFragment::FieldPats(smallvec![
+ ast::FieldPat {
+ attrs: Default::default(),
+ id,
+ ident,
+ is_shorthand: false,
+ pat,
+ span,
+ is_placeholder: true,
+ }
+ ]),
+ AstFragmentKind::GenericParams => AstFragment::GenericParams(smallvec![{
+ ast::GenericParam {
+ attrs: Default::default(),
+ bounds: Default::default(),
+ id,
+ ident,
+ is_placeholder: true,
+ kind: ast::GenericParamKind::Lifetime,
+ }
+ }]),
+ AstFragmentKind::Params => AstFragment::Params(smallvec![
+ ast::Param {
+ attrs: Default::default(),
+ id,
+ pat,
+ span,
+ ty,
+ is_placeholder: true,
+ }
+ ]),
+ AstFragmentKind::StructFields => AstFragment::StructFields(smallvec![
+ ast::StructField {
+ attrs: Default::default(),
+ id,
+ ident: None,
+ span,
+ ty,
+ vis,
+ is_placeholder: true,
+ }
+ ]),
+ AstFragmentKind::Variants => AstFragment::Variants(smallvec![
+ ast::Variant {
+ attrs: Default::default(),
+ data: ast::VariantData::Struct(Default::default(), false),
+ disr_expr: None,
+ id,
+ ident,
+ span,
+ is_placeholder: true,
+ }
+ ])
}
}
@@ -105,6 +190,66 @@
}
impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
+ fn flat_map_arm(&mut self, arm: ast::Arm) -> SmallVec<[ast::Arm; 1]> {
+ if arm.is_placeholder {
+ self.remove(arm.id).make_arms()
+ } else {
+ noop_flat_map_arm(arm, self)
+ }
+ }
+
+ fn flat_map_field(&mut self, field: ast::Field) -> SmallVec<[ast::Field; 1]> {
+ if field.is_placeholder {
+ self.remove(field.id).make_fields()
+ } else {
+ noop_flat_map_field(field, self)
+ }
+ }
+
+ fn flat_map_field_pattern(&mut self, fp: ast::FieldPat) -> SmallVec<[ast::FieldPat; 1]> {
+ if fp.is_placeholder {
+ self.remove(fp.id).make_field_patterns()
+ } else {
+ noop_flat_map_field_pattern(fp, self)
+ }
+ }
+
+ fn flat_map_generic_param(
+ &mut self,
+ param: ast::GenericParam
+ ) -> SmallVec<[ast::GenericParam; 1]>
+ {
+ if param.is_placeholder {
+ self.remove(param.id).make_generic_params()
+ } else {
+ noop_flat_map_generic_param(param, self)
+ }
+ }
+
+ fn flat_map_param(&mut self, p: ast::Param) -> SmallVec<[ast::Param; 1]> {
+ if p.is_placeholder {
+ self.remove(p.id).make_params()
+ } else {
+ noop_flat_map_param(p, self)
+ }
+ }
+
+ fn flat_map_struct_field(&mut self, sf: ast::StructField) -> SmallVec<[ast::StructField; 1]> {
+ if sf.is_placeholder {
+ self.remove(sf.id).make_struct_fields()
+ } else {
+ noop_flat_map_struct_field(sf, self)
+ }
+ }
+
+ fn flat_map_variant(&mut self, variant: ast::Variant) -> SmallVec<[ast::Variant; 1]> {
+ if variant.is_placeholder {
+ self.remove(variant.id).make_variants()
+ } else {
+ noop_flat_map_variant(variant, self)
+ }
+ }
+
fn flat_map_item(&mut self, item: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
match item.node {
ast::ItemKind::Mac(_) => return self.remove(item.id).make_items(),
diff --git a/src/libsyntax/ext/proc_macro.rs b/src/libsyntax/ext/proc_macro.rs
index 4a44c9a..47b17ce 100644
--- a/src/libsyntax/ext/proc_macro.rs
+++ b/src/libsyntax/ext/proc_macro.rs
@@ -88,6 +88,14 @@
item: Annotatable)
-> Vec<Annotatable> {
let item = match item {
+ Annotatable::Arm(..) |
+ Annotatable::Field(..) |
+ Annotatable::FieldPat(..) |
+ Annotatable::GenericParam(..) |
+ Annotatable::Param(..) |
+ Annotatable::StructField(..) |
+ Annotatable::Variant(..)
+ => panic!("unexpected annotatable"),
Annotatable::Item(item) => item,
Annotatable::ImplItem(_) |
Annotatable::TraitItem(_) |
diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index 30d5df1..2373572 100644
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -345,8 +345,13 @@
LockstepIterSize::Constraint(r_len, _) if l_len == r_len => self,
LockstepIterSize::Constraint(r_len, r_id) => {
let msg = format!(
- "meta-variable `{}` repeats {} times, but `{}` repeats {} times",
- l_id, l_len, r_id, r_len
+ "meta-variable `{}` repeats {} time{}, but `{}` repeats {} time{}",
+ l_id,
+ l_len,
+ if l_len != 1 { "s" } else { "" },
+ r_id,
+ r_len,
+ if r_len != 1 { "s" } else { "" },
);
LockstepIterSize::Contradiction(msg)
}
diff --git a/src/libsyntax/feature_gate/accepted.rs b/src/libsyntax/feature_gate/accepted.rs
index 6c0b271..eff9f90 100644
--- a/src/libsyntax/feature_gate/accepted.rs
+++ b/src/libsyntax/feature_gate/accepted.rs
@@ -241,6 +241,8 @@
(accepted, underscore_const_names, "1.37.0", Some(54912), None),
/// Allows free and inherent `async fn`s, `async` blocks, and `<expr>.await` expressions.
(accepted, async_await, "1.39.0", Some(50547), None),
+ /// Allows mixing bind-by-move in patterns and references to those identifiers in guards.
+ (accepted, bind_by_move_pattern_guards, "1.39.0", Some(15287), None),
// -------------------------------------------------------------------------
// feature-group-end: accepted features
diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs
index c947b09..dd78777 100644
--- a/src/libsyntax/feature_gate/active.rs
+++ b/src/libsyntax/feature_gate/active.rs
@@ -1,9 +1,11 @@
//! List of the active feature gates.
+use super::{State, Feature};
+
use crate::edition::Edition;
use crate::symbol::{Symbol, sym};
+
use syntax_pos::Span;
-use super::{State, Feature};
macro_rules! set {
($field: ident) => {{
@@ -37,9 +39,9 @@
/// A set of features to be used by later passes.
#[derive(Clone)]
pub struct Features {
- /// `#![feature]` attrs for language features, for error reporting
+ /// `#![feature]` attrs for language features, for error reporting.
pub declared_lang_features: Vec<(Symbol, Span, Option<Symbol>)>,
- /// `#![feature]` attrs for non-language (library) features
+ /// `#![feature]` attrs for non-language (library) features.
pub declared_lib_features: Vec<(Symbol, Span)>,
$(
$(#[doc = $doc])*
@@ -66,11 +68,11 @@
}
impl Feature {
- /// Set this feature in `Features`. Panics if called on a non-active feature.
+ /// Sets this feature in `Features`. Panics if called on a non-active feature.
pub fn set(&self, features: &mut Features, span: Span) {
match self.state {
State::Active { set } => set(features, span),
- _ => panic!("Called `set` on feature `{}` which is not `active`", self.name)
+ _ => panic!("called `set` on feature `{}` which is not `active`", self.name)
}
}
}
@@ -120,12 +122,6 @@
/// macros disappear).
(active, allow_internal_unsafe, "1.0.0", None, None),
- /// Allows using the macros:
- /// + `__diagnostic_used`
- /// + `__register_diagnostic`
- /// +`__build_diagnostic_array`
- (active, rustc_diagnostic_macros, "1.0.0", None, None),
-
/// Allows using `#[rustc_const_unstable(feature = "foo", ..)]` which
/// lets a function to be `const` when opted into with `#![feature(foo)]`.
(active, rustc_const_unstable, "1.0.0", None, None),
@@ -465,9 +461,6 @@
/// Allows non-builtin attributes in inner attribute position.
(active, custom_inner_attributes, "1.30.0", Some(54726), None),
- /// Allows mixing bind-by-move in patterns and references to those identifiers in guards.
- (active, bind_by_move_pattern_guards, "1.30.0", Some(15287), None),
-
/// Allows `impl Trait` in bindings (`let`, `const`, `static`).
(active, impl_trait_in_bindings, "1.30.0", Some(63065), None),
@@ -478,7 +471,7 @@
(active, precise_pointer_size_matching, "1.32.0", Some(56354), None),
/// Allows relaxing the coherence rules such that
- /// `impl<T> ForeignTrait<LocalType> for ForeignType<T> is permitted.
+ /// `impl<T> ForeignTrait<LocalType> for ForeignType<T>` is permitted.
(active, re_rebalance_coherence, "1.32.0", Some(55437), None),
/// Allows using `#[ffi_returns_twice]` on foreign functions.
@@ -520,7 +513,7 @@
/// Allows `async || body` closures.
(active, async_closure, "1.37.0", Some(62290), None),
- /// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests
+ /// Allows the use of `#[cfg(doctest)]`; set when rustdoc is collecting doctests.
(active, cfg_doctest, "1.37.0", Some(62210), None),
/// Allows `[x; N]` where `x` is a constant (RFC 2203).
@@ -529,7 +522,7 @@
/// Allows `impl Trait` to be used inside type aliases (RFC 2515).
(active, type_alias_impl_trait, "1.38.0", Some(63063), None),
- /// Allows the use of or-patterns, e.g. `0 | 1`.
+ /// Allows the use of or-patterns (e.g., `0 | 1`).
(active, or_patterns, "1.38.0", Some(54883), None),
// -------------------------------------------------------------------------
diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs
index ee7ac3b..763c3ff 100644
--- a/src/libsyntax/feature_gate/builtin_attrs.rs
+++ b/src/libsyntax/feature_gate/builtin_attrs.rs
@@ -169,7 +169,7 @@
pub type BuiltinAttribute = (Symbol, AttributeType, AttributeTemplate, AttributeGate);
-/// Attributes that have a special meaning to rustc or rustdoc
+/// Attributes that have a special meaning to rustc or rustdoc.
pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// ==========================================================================
// Stable attributes:
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs
index f3a9d13..5711b26 100644
--- a/src/libsyntax/feature_gate/check.rs
+++ b/src/libsyntax/feature_gate/check.rs
@@ -920,9 +920,9 @@
impl UnstableFeatures {
pub fn from_environment() -> UnstableFeatures {
- // Whether this is a feature-staged build, i.e., on the beta or stable channel
+ // `true` if this is a feature-staged build, i.e., on the beta or stable channel.
let disable_unstable_features = option_env!("CFG_DISABLE_UNSTABLE_FEATURES").is_some();
- // Whether we should enable unstable features for bootstrapping
+ // `true` if we should enable unstable features for bootstrapping.
let bootstrap = env::var("RUSTC_BOOTSTRAP").is_ok();
match (disable_unstable_features, bootstrap) {
(_, true) => UnstableFeatures::Cheat,
diff --git a/src/libsyntax/feature_gate/removed.rs b/src/libsyntax/feature_gate/removed.rs
index ad7d69b..2c29e1e 100644
--- a/src/libsyntax/feature_gate/removed.rs
+++ b/src/libsyntax/feature_gate/removed.rs
@@ -94,6 +94,11 @@
/// Allows defining `existential type`s.
(removed, existential_type, "1.38.0", Some(63063), None,
Some("removed in favor of `#![feature(type_alias_impl_trait)]`")),
+ /// Allows using the macros:
+ /// + `__diagnostic_used`
+ /// + `__register_diagnostic`
+ /// +`__build_diagnostic_array`
+ (removed, rustc_diagnostic_macros, "1.38.0", None, None, None),
// -------------------------------------------------------------------------
// feature-group-end: removed features
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 1741932..aaf6f3e 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -7,7 +7,7 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
test(attr(deny(warnings))))]
-#![feature(bind_by_move_pattern_guards)]
+#![cfg_attr(bootstrap, feature(bind_by_move_pattern_guards))]
#![feature(box_syntax)]
#![feature(const_fn)]
#![feature(const_transmute)]
@@ -18,7 +18,6 @@
#![feature(proc_macro_diagnostic)]
#![feature(proc_macro_internals)]
#![feature(proc_macro_span)]
-#![feature(rustc_diagnostic_macros)]
#![feature(try_trait)]
#![feature(unicode_internals)]
@@ -123,11 +122,8 @@
pub mod diagnostics {
#[macro_use]
pub mod macros;
- pub mod plugin;
}
-// N.B., this module needs to be declared first so diagnostics are
-// registered before they are used.
pub mod error_codes;
pub mod util {
@@ -182,5 +178,3 @@
}
pub mod early_buffered_lints;
-
-__build_diagnostic_array! { libsyntax, DIAGNOSTICS }
diff --git a/src/libsyntax/mut_visit.rs b/src/libsyntax/mut_visit.rs
index 6023c51..5a37222 100644
--- a/src/libsyntax/mut_visit.rs
+++ b/src/libsyntax/mut_visit.rs
@@ -1,10 +1,10 @@
-//! A MutVisitor represents an AST modification; it accepts an AST piece and
-//! and mutates it in place. So, for instance, macro expansion is a MutVisitor
+//! A `MutVisitor` represents an AST modification; it accepts an AST piece and
+//! and mutates it in place. So, for instance, macro expansion is a `MutVisitor`
//! that walks over an AST and modifies it.
//!
-//! Note: using a MutVisitor (other than the MacroExpander MutVisitor) on
+//! Note: using a `MutVisitor` (other than the `MacroExpander` `MutVisitor`) on
//! an AST before macro expansion is probably a bad idea. For instance,
-//! a MutVisitor renaming item names in a module will miss all of those
+//! a `MutVisitor` renaming item names in a module will miss all of those
//! that are created by the expansion of a macro.
use crate::ast::*;
@@ -370,6 +370,7 @@
attrs,
id,
ident,
+ is_placeholder: _,
is_shorthand: _,
pat,
span,
@@ -403,7 +404,7 @@
}
pub fn noop_flat_map_arm<T: MutVisitor>(mut arm: Arm, vis: &mut T) -> SmallVec<[Arm; 1]> {
- let Arm { attrs, pat, guard, body, span, id } = &mut arm;
+ let Arm { attrs, pat, guard, body, span, id, is_placeholder: _ } = &mut arm;
visit_attrs(attrs, vis);
vis.visit_id(id);
vis.visit_pat(pat);
@@ -477,7 +478,7 @@
pub fn noop_flat_map_variant<T: MutVisitor>(mut variant: Variant, vis: &mut T)
-> SmallVec<[Variant; 1]>
{
- let Variant { ident, attrs, id, data, disr_expr, span } = &mut variant;
+ let Variant { ident, attrs, id, data, disr_expr, span, is_placeholder: _ } = &mut variant;
vis.visit_ident(ident);
visit_attrs(attrs, vis);
vis.visit_id(id);
@@ -585,7 +586,7 @@
}
pub fn noop_flat_map_param<T: MutVisitor>(mut param: Param, vis: &mut T) -> SmallVec<[Param; 1]> {
- let Param { attrs, id, pat, span, ty } = &mut param;
+ let Param { attrs, id, pat, span, ty, is_placeholder: _ } = &mut param;
vis.visit_id(id);
visit_thin_attrs(attrs, vis);
vis.visit_pat(pat);
@@ -614,7 +615,7 @@
})
}
-// Apply ident visitor if it's an ident, apply other visits to interpolated nodes.
+// Applies ident visitor if it's an ident; applies other visits to interpolated nodes.
// In practice the ident part is not actually used by specific visitors right now,
// but there's a test below checking that it works.
pub fn noop_visit_token<T: MutVisitor>(t: &mut Token, vis: &mut T) {
@@ -625,7 +626,7 @@
vis.visit_ident(&mut ident);
*name = ident.name;
*span = ident.span;
- return; // avoid visiting the span for the second time
+ return; // Avoid visiting the span for the second time.
}
token::Interpolated(nt) => {
let mut nt = Lrc::make_mut(nt);
@@ -636,28 +637,28 @@
vis.visit_span(span);
}
-/// Apply visitor to elements of interpolated nodes.
+/// Applies the visitor to elements of interpolated nodes.
//
// N.B., this can occur only when applying a visitor to partially expanded
// code, where parsed pieces have gotten implanted ito *other* macro
// invocations. This is relevant for macro hygiene, but possibly not elsewhere.
//
// One problem here occurs because the types for flat_map_item, flat_map_stmt,
-// etc. allow the visitor to return *multiple* items; this is a problem for the
+// etc., allow the visitor to return *multiple* items; this is a problem for the
// nodes here, because they insist on having exactly one piece. One solution
// would be to mangle the MutVisitor trait to include one-to-many and
// one-to-one versions of these entry points, but that would probably confuse a
// lot of people and help very few. Instead, I'm just going to put in dynamic
// checks. I think the performance impact of this will be pretty much
-// nonexistent. The danger is that someone will apply a MutVisitor to a
+// nonexistent. The danger is that someone will apply a `MutVisitor` to a
// partially expanded node, and will be confused by the fact that their
-// "flat_map_item" or "flat_map_stmt" isn't getting called on NtItem or NtStmt
+// `flat_map_item` or `flat_map_stmt` isn't getting called on `NtItem` or `NtStmt`
// nodes. Hopefully they'll wind up reading this comment, and doing something
// appropriate.
//
-// BTW, design choice: I considered just changing the type of, e.g., NtItem to
+// BTW, design choice: I considered just changing the type of, e.g., `NtItem` to
// contain multiple items, but decided against it when I looked at
-// parse_item_or_view_item and tried to figure out what I would do with
+// `parse_item_or_view_item` and tried to figure out what I would do with
// multiple items there....
pub fn noop_visit_interpolated<T: MutVisitor>(nt: &mut token::Nonterminal, vis: &mut T) {
match nt {
@@ -736,7 +737,7 @@
vis: &mut T
) -> SmallVec<[GenericParam; 1]>
{
- let GenericParam { id, ident, attrs, bounds, kind } = &mut param;
+ let GenericParam { id, ident, attrs, bounds, kind, is_placeholder: _ } = &mut param;
vis.visit_id(id);
vis.visit_ident(ident);
visit_thin_attrs(attrs, vis);
@@ -828,7 +829,7 @@
pub fn noop_flat_map_struct_field<T: MutVisitor>(mut sf: StructField, visitor: &mut T)
-> SmallVec<[StructField; 1]>
{
- let StructField { span, ident, vis, id, ty, attrs } = &mut sf;
+ let StructField { span, ident, vis, id, ty, attrs, is_placeholder: _ } = &mut sf;
visitor.visit_span(span);
visit_opt(ident, |ident| visitor.visit_ident(ident));
visitor.visit_vis(vis);
@@ -839,7 +840,7 @@
}
pub fn noop_flat_map_field<T: MutVisitor>(mut f: Field, vis: &mut T) -> SmallVec<[Field; 1]> {
- let Field { ident, expr, span, is_shorthand: _, attrs, id } = &mut f;
+ let Field { ident, expr, span, is_shorthand: _, attrs, id, is_placeholder: _ } = &mut f;
vis.visit_ident(ident);
vis.visit_expr(expr);
vis.visit_id(id);
@@ -1014,7 +1015,7 @@
});
}
-// Mutate one item into possibly many items.
+// Mutates one item into possibly many items.
pub fn noop_flat_map_item<T: MutVisitor>(mut item: P<Item>, visitor: &mut T)
-> SmallVec<[P<Item>; 1]> {
let Item { ident, attrs, id, node, vis, span, tokens: _ } = item.deref_mut();
@@ -1224,7 +1225,7 @@
ExprKind::Paren(expr) => {
vis.visit_expr(expr);
- // Nodes that are equal modulo `Paren` sugar no-ops should have the same ids.
+ // Nodes that are equal modulo `Paren` sugar no-ops should have the same IDs.
*id = expr.id;
vis.visit_span(span);
visit_thin_attrs(attrs, vis);
diff --git a/src/libsyntax/mut_visit/tests.rs b/src/libsyntax/mut_visit/tests.rs
index 6868736..f779e0d 100644
--- a/src/libsyntax/mut_visit/tests.rs
+++ b/src/libsyntax/mut_visit/tests.rs
@@ -6,13 +6,13 @@
use crate::mut_visit;
use crate::with_default_globals;
-// this version doesn't care about getting comments or docstrings in.
+// This version doesn't care about getting comments or doc-strings in.
fn fake_print_crate(s: &mut pprust::State<'_>,
krate: &ast::Crate) {
s.print_mod(&krate.module, &krate.attrs)
}
-// change every identifier to "zz"
+// Change every identifier to "zz".
struct ToZzIdentMutVisitor;
impl MutVisitor for ToZzIdentMutVisitor {
@@ -24,7 +24,7 @@
}
}
-// maybe add to expand.rs...
+// Maybe add to `expand.rs`.
macro_rules! assert_pred {
($pred:expr, $predname:expr, $a:expr , $b:expr) => (
{
@@ -39,7 +39,7 @@
)
}
-// make sure idents get transformed everywhere
+// Make sure idents get transformed everywhere.
#[test] fn ident_transformation () {
with_default_globals(|| {
let mut zz_visitor = ToZzIdentMutVisitor;
@@ -54,7 +54,7 @@
})
}
-// even inside macro defs....
+// Make sure idents get transformed even inside macro defs.
#[test] fn ident_transformation_in_defs () {
with_default_globals(|| {
let mut zz_visitor = ToZzIdentMutVisitor;
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs
index 6711782..9aa1ec0 100644
--- a/src/libsyntax/parse/attr.rs
+++ b/src/libsyntax/parse/attr.rs
@@ -26,7 +26,7 @@
Ok(attrs)
}
- /// Parse attributes that appear before an item
+ /// Parses attributes that appear before an item.
crate fn parse_outer_attributes(&mut self) -> PResult<'a, Vec<ast::Attribute>> {
let mut attrs: Vec<ast::Attribute> = Vec::new();
let mut just_parsed_doc_comment = false;
@@ -69,10 +69,10 @@
Ok(attrs)
}
- /// Matches `attribute = # ! [ meta_item ]`
+ /// Matches `attribute = # ! [ meta_item ]`.
///
- /// If permit_inner is true, then a leading `!` indicates an inner
- /// attribute
+ /// If `permit_inner` is `true`, then a leading `!` indicates an inner
+ /// attribute.
pub fn parse_attribute(&mut self, permit_inner: bool) -> PResult<'a, ast::Attribute> {
debug!("parse_attribute: permit_inner={:?} self.token={:?}",
permit_inner,
@@ -167,16 +167,16 @@
})
}
- /// Parse an inner part of attribute - path and following tokens.
+ /// Parses an inner part of an attribute (the path and following tokens).
/// The tokens must be either a delimited token stream, or empty token stream,
/// or the "legacy" key-value form.
- /// PATH `(` TOKEN_STREAM `)`
- /// PATH `[` TOKEN_STREAM `]`
- /// PATH `{` TOKEN_STREAM `}`
- /// PATH
- /// PATH `=` TOKEN_TREE
+ /// PATH `(` TOKEN_STREAM `)`
+ /// PATH `[` TOKEN_STREAM `]`
+ /// PATH `{` TOKEN_STREAM `}`
+ /// PATH
+ /// PATH `=` TOKEN_TREE
/// The delimiters or `=` are still put into the resulting token stream.
- crate fn parse_meta_item_unrestricted(&mut self) -> PResult<'a, (ast::Path, TokenStream)> {
+ pub fn parse_meta_item_unrestricted(&mut self) -> PResult<'a, (ast::Path, TokenStream)> {
let meta = match self.token.kind {
token::Interpolated(ref nt) => match **nt {
Nonterminal::NtMeta(ref meta) => Some(meta.clone()),
@@ -217,11 +217,11 @@
})
}
- /// Parse attributes that appear after the opening of an item. These should
+ /// Parses attributes that appear after the opening of an item. These should
/// be preceded by an exclamation mark, but we accept and warn about one
/// terminated by a semicolon.
-
- /// matches inner_attrs*
+ ///
+ /// Matches `inner_attrs*`.
crate fn parse_inner_attributes(&mut self) -> PResult<'a, Vec<ast::Attribute>> {
let mut attrs: Vec<ast::Attribute> = vec![];
loop {
@@ -237,7 +237,7 @@
attrs.push(attr);
}
token::DocComment(s) => {
- // we need to get the position of this token before we bump.
+ // We need to get the position of this token before we bump.
let attr = attr::mk_sugared_doc_attr(s, self.token.span);
if attr.style == ast::AttrStyle::Inner {
attrs.push(attr);
@@ -268,10 +268,10 @@
Ok(lit)
}
- /// Per RFC#1559, matches the following grammar:
+ /// Matches the following grammar (per RFC 1559).
///
- /// meta_item : IDENT ( '=' UNSUFFIXED_LIT | '(' meta_item_inner? ')' )? ;
- /// meta_item_inner : (meta_item | UNSUFFIXED_LIT) (',' meta_item_inner)? ;
+ /// meta_item : IDENT ( '=' UNSUFFIXED_LIT | '(' meta_item_inner? ')' )? ;
+ /// meta_item_inner : (meta_item | UNSUFFIXED_LIT) (',' meta_item_inner)? ;
pub fn parse_meta_item(&mut self) -> PResult<'a, ast::MetaItem> {
let nt_meta = match self.token.kind {
token::Interpolated(ref nt) => match **nt {
@@ -303,7 +303,7 @@
})
}
- /// matches meta_item_inner : (meta_item | UNSUFFIXED_LIT) ;
+ /// Matches `meta_item_inner : (meta_item | UNSUFFIXED_LIT) ;`.
fn parse_meta_item_inner(&mut self) -> PResult<'a, ast::NestedMetaItem> {
match self.parse_unsuffixed_lit() {
Ok(lit) => {
@@ -324,7 +324,7 @@
Err(self.diagnostic().struct_span_err(self.token.span, &msg))
}
- /// matches meta_seq = ( COMMASEP(meta_item_inner) )
+ /// Matches `meta_seq = ( COMMASEP(meta_item_inner) )`.
fn parse_meta_seq(&mut self) -> PResult<'a, Vec<ast::NestedMetaItem>> {
self.parse_seq_to_end(&token::CloseDelim(token::Paren),
SeqSep::trailing_allowed(token::Comma),
diff --git a/src/libsyntax/parse/diagnostics.rs b/src/libsyntax/parse/diagnostics.rs
index d4e661d..b74f249 100644
--- a/src/libsyntax/parse/diagnostics.rs
+++ b/src/libsyntax/parse/diagnostics.rs
@@ -29,7 +29,14 @@
span: ident.span,
id: ast::DUMMY_NODE_ID
};
- Param { attrs: ThinVec::default(), id: ast::DUMMY_NODE_ID, pat, span: ident.span, ty: P(ty) }
+ Param {
+ attrs: ThinVec::default(),
+ id: ast::DUMMY_NODE_ID,
+ pat,
+ span: ident.span,
+ ty: P(ty),
+ is_placeholder: false,
+ }
}
pub enum Error {
@@ -240,7 +247,7 @@
) -> PResult<'a, bool /* recovered */> {
fn tokens_to_string(tokens: &[TokenType]) -> String {
let mut i = tokens.iter();
- // This might be a sign we need a connect method on Iterator.
+ // This might be a sign we need a connect method on `Iterator`.
let b = i.next()
.map_or(String::new(), |t| t.to_string());
i.enumerate().fold(b, |mut b, (i, a)| {
@@ -301,7 +308,7 @@
);
}
let sp = if self.token == token::Eof {
- // This is EOF, don't want to point at the following char, but rather the last token
+ // This is EOF; don't want to point at the following char, but rather the last token.
self.prev_span
} else {
label_sp
@@ -317,9 +324,9 @@
}
let is_semi_suggestable = expected.iter().any(|t| match t {
- TokenType::Token(token::Semi) => true, // we expect a `;` here
+ TokenType::Token(token::Semi) => true, // We expect a `;` here.
_ => false,
- }) && ( // a `;` would be expected before the current keyword
+ }) && ( // A `;` would be expected before the current keyword.
self.token.is_keyword(kw::Break) ||
self.token.is_keyword(kw::Continue) ||
self.token.is_keyword(kw::For) ||
@@ -541,16 +548,16 @@
}
}
- /// Produce an error if comparison operators are chained (RFC #558).
- /// We only need to check lhs, not rhs, because all comparison ops
- /// have same precedence and are left-associative
- crate fn check_no_chained_comparison(&self, lhs: &Expr, outer_op: &AssocOp) {
+ /// Produces an error if comparison operators are chained (RFC #558).
+ /// We only need to check the LHS, not the RHS, because all comparison ops
+ /// have same precedence and are left-associative.
+ crate fn check_no_chained_comparison(&self, lhs: &Expr, outer_op: &AssocOp) -> PResult<'a, ()> {
debug_assert!(outer_op.is_comparison(),
"check_no_chained_comparison: {:?} is not comparison",
outer_op);
match lhs.node {
ExprKind::Binary(op, _, _) if op.node.is_comparison() => {
- // respan to include both operators
+ // Respan to include both operators.
let op_span = op.span.to(self.token.span);
let mut err = self.struct_span_err(
op_span,
@@ -563,11 +570,14 @@
err.help(
"use `::<...>` instead of `<...>` if you meant to specify type arguments");
err.help("or use `(...)` if you meant to specify fn arguments");
+ // These cases cause too many knock-down errors, bail out (#61329).
+ return Err(err);
}
err.emit();
}
_ => {}
}
+ Ok(())
}
crate fn maybe_report_ambiguous_plus(
@@ -688,9 +698,9 @@
Ok(())
}
- /// Try to recover from associated item paths like `[T]::AssocItem`/`(T, U)::AssocItem`.
- /// Attempt to convert the base expression/pattern/type into a type, parse the `::AssocItem`
- /// tail, and combine them into a `<Ty>::AssocItem` expression/pattern/type.
+ /// Tries to recover from associated item paths like `[T]::AssocItem` / `(T, U)::AssocItem`.
+ /// Attempts to convert the base expression/pattern/type into a type, parses the `::AssocItem`
+ /// tail, and combines them into a `<Ty>::AssocItem` expression/pattern/type.
crate fn maybe_recover_from_bad_qpath<T: RecoverQPath>(
&mut self,
base: P<T>,
@@ -705,8 +715,8 @@
Ok(base)
}
- /// Given an already parsed `Ty` parse the `::AssocItem` tail and
- /// combine them into a `<Ty>::AssocItem` expression/pattern/type.
+ /// Given an already parsed `Ty`, parses the `::AssocItem` tail and
+ /// combines them into a `<Ty>::AssocItem` expression/pattern/type.
crate fn maybe_recover_from_bad_qpath_stage_2<T: RecoverQPath>(
&mut self,
ty_span: Span,
@@ -727,7 +737,7 @@
self.diagnostic()
.struct_span_err(path.span, "missing angle brackets in associated item path")
.span_suggestion(
- // this is a best-effort recovery
+ // This is a best-effort recovery.
path.span,
"try",
format!("<{}>::{}", ty_str, path),
@@ -735,7 +745,7 @@
)
.emit();
- let path_span = ty_span.shrink_to_hi(); // use an empty path since `position` == 0
+ let path_span = ty_span.shrink_to_hi(); // Use an empty path since `position == 0`.
Ok(P(T::recovered(
Some(QSelf {
ty,
@@ -758,8 +768,8 @@
if !items.is_empty() {
let previous_item = &items[items.len() - 1];
let previous_item_kind_name = match previous_item.node {
- // say "braced struct" because tuple-structs and
- // braceless-empty-struct declarations do take a semicolon
+ // Say "braced struct" because tuple-structs and
+ // braceless-empty-struct declarations do take a semicolon.
ItemKind::Struct(..) => Some("braced struct"),
ItemKind::Enum(..) => Some("enum"),
ItemKind::Trait(..) => Some("trait"),
@@ -780,7 +790,7 @@
}
}
- /// Create a `DiagnosticBuilder` for an unexpected token `t` and try to recover if it is a
+ /// Creates a `DiagnosticBuilder` for an unexpected token `t` and tries to recover if it is a
/// closing delimiter.
pub fn unexpected_try_recover(
&mut self,
@@ -838,7 +848,7 @@
extern_sp: Span,
) -> PResult<'a, ()> {
if self.token != token::Semi {
- // this might be an incorrect fn definition (#62109)
+ // This might be an incorrect fn definition (#62109).
let parser_snapshot = self.clone();
match self.parse_inner_attrs_and_block() {
Ok((_, body)) => {
@@ -868,7 +878,7 @@
Ok(())
}
- /// Consume alternative await syntaxes like `await!(<expr>)`, `await <expr>`,
+ /// Consumes alternative await syntaxes like `await!(<expr>)`, `await <expr>`,
/// `await? <expr>`, `await(<expr>)`, and `await { <expr> }`.
crate fn parse_incorrect_await_syntax(
&mut self,
@@ -921,7 +931,7 @@
sp
}
- /// If encountering `future.await()`, consume and emit error.
+ /// If encountering `future.await()`, consumes and emits an error.
crate fn recover_from_await_method_call(&mut self) {
if self.token == token::OpenDelim(token::Paren) &&
self.look_ahead(1, |t| t == &token::CloseDelim(token::Paren))
@@ -941,7 +951,7 @@
}
}
- /// Recover a situation like `for ( $pat in $expr )`
+ /// Recovers a situation like `for ( $pat in $expr )`
/// and suggest writing `for $pat in $expr` instead.
///
/// This should be called before parsing the `$block`.
@@ -1007,7 +1017,7 @@
Ok(x) => x,
Err(mut err) => {
err.emit();
- // recover from parse error
+ // Recover from parse error.
self.consume_block(delim);
self.mk_expr(lo.to(self.prev_span), ExprKind::Err, ThinVec::new())
}
@@ -1020,7 +1030,7 @@
mut err: DiagnosticBuilder<'a>,
) -> PResult<'a, bool> {
let mut pos = None;
- // we want to use the last closing delim that would apply
+ // We want to use the last closing delim that would apply.
for (i, unmatched) in self.unclosed_delims.iter().enumerate().rev() {
if tokens.contains(&token::CloseDelim(unmatched.expected_delim))
&& Some(self.token.span) > unmatched.unclosed_span
@@ -1038,7 +1048,7 @@
let unmatched = self.unclosed_delims.remove(pos);
let delim = TokenType::Token(token::CloseDelim(unmatched.expected_delim));
- // We want to suggest the inclusion of the closing delimiter where it makes
+ // We want to suggest the inclusion of the closing delimiter where it makes
// the most sense, which is immediately after the last token:
//
// {foo(bar {}}
@@ -1064,7 +1074,7 @@
}
}
- /// Recover from `pub` keyword in places where it seems _reasonable_ but isn't valid.
+ /// Recovers from `pub` keyword in places where it seems _reasonable_ but isn't valid.
crate fn eat_bad_pub(&mut self) {
if self.token.is_keyword(kw::Pub) {
match self.parse_visibility(false) {
@@ -1079,21 +1089,21 @@
}
}
- // Eat tokens until we can be relatively sure we reached the end of the
- // statement. This is something of a best-effort heuristic.
- //
- // We terminate when we find an unmatched `}` (without consuming it).
+ /// Eats tokens until we can be relatively sure we reached the end of the
+ /// statement. This is something of a best-effort heuristic.
+ ///
+ /// We terminate when we find an unmatched `}` (without consuming it).
crate fn recover_stmt(&mut self) {
self.recover_stmt_(SemiColonMode::Ignore, BlockMode::Ignore)
}
- // If `break_on_semi` is `Break`, then we will stop consuming tokens after
- // finding (and consuming) a `;` outside of `{}` or `[]` (note that this is
- // approximate - it can mean we break too early due to macros, but that
- // should only lead to sub-optimal recovery, not inaccurate parsing).
- //
- // If `break_on_block` is `Break`, then we will stop consuming tokens
- // after finding (and consuming) a brace-delimited block.
+ /// If `break_on_semi` is `Break`, then we will stop consuming tokens after
+ /// finding (and consuming) a `;` outside of `{}` or `[]` (note that this is
+ /// approximate -- it can mean we break too early due to macros, but that
+ /// should only lead to sub-optimal recovery, not inaccurate parsing).
+ ///
+ /// If `break_on_block` is `Break`, then we will stop consuming tokens
+ /// after finding (and consuming) a brace-delimited block.
crate fn recover_stmt_(&mut self, break_on_semi: SemiColonMode, break_on_block: BlockMode) {
let mut brace_depth = 0;
let mut bracket_depth = 0;
diff --git a/src/libsyntax/parse/lexer/tests.rs b/src/libsyntax/parse/lexer/tests.rs
index 652ae95..c1ec419 100644
--- a/src/libsyntax/parse/lexer/tests.rs
+++ b/src/libsyntax/parse/lexer/tests.rs
@@ -4,9 +4,10 @@
use crate::source_map::{SourceMap, FilePathMapping};
use crate::parse::token;
use crate::with_default_globals;
+
+use errors::{Handler, emitter::EmitterWriter};
use std::io;
use std::path::PathBuf;
-use errors::{Handler, emitter::EmitterWriter};
use syntax_pos::{BytePos, Span};
fn mk_sess(sm: Lrc<SourceMap>) -> ParseSess {
@@ -21,7 +22,7 @@
ParseSess::with_span_handler(Handler::with_emitter(true, None, Box::new(emitter)), sm)
}
-// open a string reader for the given string
+// Creates a string reader for the given string.
fn setup<'a>(sm: &SourceMap,
sess: &'a ParseSess,
teststr: String)
@@ -50,7 +51,7 @@
assert_eq!(tok1.kind, tok2.kind);
assert_eq!(tok1.span, tok2.span);
assert_eq!(string_reader.next_token(), token::Whitespace);
- // read another token:
+ // Read another token.
let tok3 = string_reader.next_token();
assert_eq!(string_reader.pos.clone(), BytePos(28));
let tok4 = Token::new(
@@ -65,15 +66,15 @@
})
}
-// check that the given reader produces the desired stream
-// of tokens (stop checking after exhausting the expected vec)
+// Checks that the given reader produces the desired stream
+// of tokens (stop checking after exhausting `expected`).
fn check_tokenization(mut string_reader: StringReader<'_>, expected: Vec<TokenKind>) {
for expected_tok in &expected {
assert_eq!(&string_reader.next_token(), expected_tok);
}
}
-// make the identifier by looking up the string in the interner
+// Makes the identifier by looking up the string in the interner.
fn mk_ident(id: &str) -> TokenKind {
token::Ident(Symbol::intern(id), false)
}
@@ -201,7 +202,7 @@
setup(&sm, &sh, format!("{}suffix", $input)).next_token(),
mk_lit(token::$tok_type, $tok_contents, Some("suffix")),
);
- // with a whitespace separator:
+ // with a whitespace separator
assert_eq!(
setup(&sm, &sh, format!("{} suffix", $input)).next_token(),
mk_lit(token::$tok_type, $tok_contents, None),
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index b1af480..bc1bc00 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -8,17 +8,16 @@
use crate::parse::parser::emit_unclosed_delims;
use crate::parse::token::TokenKind;
use crate::tokenstream::{TokenStream, TokenTree};
-use crate::diagnostics::plugin::ErrorMap;
use crate::print::pprust;
use crate::symbol::Symbol;
use errors::{Applicability, FatalError, Level, Handler, ColorConfig, Diagnostic, DiagnosticBuilder};
+use rustc_data_structures::fx::{FxHashSet, FxHashMap};
use rustc_data_structures::sync::{Lrc, Lock, Once};
use syntax_pos::{Span, SourceFile, FileName, MultiSpan};
use syntax_pos::edition::Edition;
use syntax_pos::hygiene::ExpnId;
-use rustc_data_structures::fx::{FxHashSet, FxHashMap};
use std::borrow::Cow;
use std::path::{Path, PathBuf};
use std::str;
@@ -64,8 +63,6 @@
pub missing_fragment_specifiers: Lock<FxHashSet<Span>>,
/// Places where raw identifiers were used. This is used for feature-gating raw identifiers.
pub raw_identifier_spans: Lock<Vec<Span>>,
- /// The registered diagnostics codes.
- crate registered_diagnostics: Lock<ErrorMap>,
/// Used to determine and report recursive module inclusions.
included_mod_stack: Lock<Vec<PathBuf>>,
source_map: Lrc<SourceMap>,
@@ -81,25 +78,26 @@
impl ParseSess {
pub fn new(file_path_mapping: FilePathMapping) -> Self {
let cm = Lrc::new(SourceMap::new(file_path_mapping));
- let handler = Handler::with_tty_emitter(ColorConfig::Auto,
- true,
- None,
- Some(cm.clone()));
+ let handler = Handler::with_tty_emitter(
+ ColorConfig::Auto,
+ true,
+ None,
+ Some(cm.clone()),
+ );
ParseSess::with_span_handler(handler, cm)
}
- pub fn with_span_handler(handler: Handler, source_map: Lrc<SourceMap>) -> ParseSess {
- ParseSess {
+ pub fn with_span_handler(handler: Handler, source_map: Lrc<SourceMap>) -> Self {
+ Self {
span_diagnostic: handler,
unstable_features: UnstableFeatures::from_environment(),
config: FxHashSet::default(),
+ edition: ExpnId::root().expn_data().edition,
missing_fragment_specifiers: Lock::new(FxHashSet::default()),
raw_identifier_spans: Lock::new(Vec::new()),
- registered_diagnostics: Lock::new(ErrorMap::new()),
included_mod_stack: Lock::new(vec![]),
source_map,
buffered_lints: Lock::new(vec![]),
- edition: ExpnId::root().expn_data().edition,
ambiguous_block_expr_parse: Lock::new(FxHashMap::default()),
injected_crate_name: Once::new(),
gated_spans: GatedSpans::default(),
@@ -155,17 +153,17 @@
#[derive(Copy, Clone)]
pub enum DirectoryOwnership {
Owned {
- // None if `mod.rs`, `Some("foo")` if we're in `foo.rs`
+ // None if `mod.rs`, `Some("foo")` if we're in `foo.rs`.
relative: Option<ast::Ident>,
},
UnownedViaBlock,
UnownedViaMod(bool /* legacy warnings? */),
}
-// a bunch of utility functions of the form parse_<thing>_from_<source>
+// A bunch of utility functions of the form `parse_<thing>_from_<source>`
// where <thing> includes crate, expr, item, stmt, tts, and one that
// uses a HOF to parse anything, and <source> includes file and
-// source_str.
+// `source_str`.
pub fn parse_crate_from_file<'a>(input: &Path, sess: &'a ParseSess) -> PResult<'a, ast::Crate> {
let mut parser = new_parser_from_file(sess, input);
@@ -219,14 +217,13 @@
Ok(parser)
}
-/// Creates a new parser, handling errors as appropriate
-/// if the file doesn't exist
+/// Creates a new parser, handling errors as appropriate if the file doesn't exist.
pub fn new_parser_from_file<'a>(sess: &'a ParseSess, path: &Path) -> Parser<'a> {
source_file_to_parser(sess, file_to_source_file(sess, path, None))
}
-/// Creates a new parser, returning buffered diagnostics if the file doesn't
-/// exist or from lexing the initial token stream.
+/// Creates a new parser, returning buffered diagnostics if the file doesn't exist,
+/// or from lexing the initial token stream.
pub fn maybe_new_parser_from_file<'a>(sess: &'a ParseSess, path: &Path)
-> Result<Parser<'a>, Vec<Diagnostic>> {
let file = try_file_to_source_file(sess, path, None).map_err(|db| vec![db])?;
@@ -234,8 +231,8 @@
}
/// Given a session, a crate config, a path, and a span, add
-/// the file at the given path to the source_map, and return a parser.
-/// On an error, use the given span as the source of the problem.
+/// the file at the given path to the `source_map`, and returns a parser.
+/// On an error, uses the given span as the source of the problem.
pub fn new_sub_parser_from_file<'a>(sess: &'a ParseSess,
path: &Path,
directory_ownership: DirectoryOwnership,
@@ -247,13 +244,13 @@
p
}
-/// Given a source_file and config, return a parser
+/// Given a `source_file` and config, returns a parser.
fn source_file_to_parser(sess: &ParseSess, source_file: Lrc<SourceFile>) -> Parser<'_> {
panictry_buffer!(&sess.span_diagnostic,
maybe_source_file_to_parser(sess, source_file))
}
-/// Given a source_file and config, return a parser. Returns any buffered errors from lexing the
+/// Given a `source_file` and config, return a parser. Returns any buffered errors from lexing the
/// initial token stream.
fn maybe_source_file_to_parser(
sess: &ParseSess,
@@ -270,14 +267,14 @@
Ok(parser)
}
-// must preserve old name for now, because quote! from the *existing*
-// compiler expands into it
+// Must preserve old name for now, because `quote!` from the *existing*
+// compiler expands into it.
pub fn new_parser_from_tts(sess: &ParseSess, tts: Vec<TokenTree>) -> Parser<'_> {
stream_to_parser(sess, tts.into_iter().collect(), crate::MACRO_ARGUMENTS)
}
-// base abstractions
+// Base abstractions
/// Given a session and a path and an optional span (for error reporting),
/// add the path to the session's source_map and return the new source_file or
@@ -296,7 +293,7 @@
}
/// Given a session and a path and an optional span (for error reporting),
-/// add the path to the session's `source_map` and return the new `source_file`.
+/// adds the path to the session's `source_map` and returns the new `source_file`.
fn file_to_source_file(sess: &ParseSess, path: &Path, spanopt: Option<Span>)
-> Lrc<SourceFile> {
match try_file_to_source_file(sess, path, spanopt) {
@@ -308,7 +305,7 @@
}
}
-/// Given a source_file, produces a sequence of token trees.
+/// Given a `source_file`, produces a sequence of token trees.
pub fn source_file_to_stream(
sess: &ParseSess,
source_file: Lrc<SourceFile>,
@@ -352,7 +349,7 @@
}
}
-/// Given stream and the `ParseSess`, produces a parser.
+/// Given a stream and the `ParseSess`, produces a parser.
pub fn stream_to_parser<'a>(
sess: &'a ParseSess,
stream: TokenStream,
@@ -361,7 +358,7 @@
Parser::new(sess, stream, None, true, false, subparser_name)
}
-/// Given stream, the `ParseSess` and the base directory, produces a parser.
+/// Given a stream, the `ParseSess` and the base directory, produces a parser.
///
/// Use this function when you are creating a parser from the token stream
/// and also care about the current working directory of the parser (e.g.,
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 49b0555..fcebfa2 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -10,22 +10,22 @@
mod stmt;
mod generics;
-use crate::ast::{self, AttrStyle, Attribute, Param, BindingMode, StrStyle, SelfKind};
-use crate::ast::{FnDecl, Ident, IsAsync, MacDelimiter, Mutability, TyKind};
-use crate::ast::{Visibility, VisibilityKind, Unsafety, CrateSugar};
-use crate::source_map::{self, respan};
-use crate::parse::{SeqSep, literal, token};
+use crate::ast::{
+ self, DUMMY_NODE_ID, AttrStyle, Attribute, BindingMode, CrateSugar, FnDecl, Ident,
+ IsAsync, MacDelimiter, Mutability, Param, StrStyle, SelfKind, TyKind, Visibility,
+ VisibilityKind, Unsafety,
+};
+use crate::parse::{ParseSess, PResult, Directory, DirectoryOwnership, SeqSep, literal, token};
+use crate::parse::diagnostics::{Error, dummy_arg};
use crate::parse::lexer::UnmatchedBrace;
use crate::parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration};
use crate::parse::token::{Token, TokenKind, DelimToken};
-use crate::parse::{ParseSess, Directory, DirectoryOwnership};
use crate::print::pprust;
use crate::ptr::P;
-use crate::parse::PResult;
-use crate::ThinVec;
-use crate::tokenstream::{self, DelimSpan, TokenTree, TokenStream, TreeAndJoint};
+use crate::source_map::{self, respan};
use crate::symbol::{kw, sym, Symbol};
-use crate::parse::diagnostics::{Error, dummy_arg};
+use crate::tokenstream::{self, DelimSpan, TokenTree, TokenStream, TreeAndJoint};
+use crate::ThinVec;
use errors::{Applicability, DiagnosticId, FatalError};
use rustc_target::spec::abi::{self, Abi};
@@ -56,7 +56,7 @@
Ignore,
}
-/// As maybe_whole_expr, but for things other than expressions
+/// Like `maybe_whole_expr`, but for things other than expressions.
#[macro_export]
macro_rules! maybe_whole {
($p:expr, $constructor:ident, |$x:ident| $e:expr) => {
@@ -116,11 +116,11 @@
/// with non-interpolated identifier and lifetime tokens they refer to.
/// Perhaps the normalized / non-normalized setup can be simplified somehow.
pub token: Token,
- /// Span of the current non-normalized token.
+ /// The span of the current non-normalized token.
meta_var_span: Option<Span>,
- /// Span of the previous non-normalized token.
+ /// The span of the previous non-normalized token.
pub prev_span: Span,
- /// Kind of the previous normalized token (in simplified form).
+ /// The kind of the previous normalized token (in simplified form).
prev_token_kind: PrevTokenKind,
restrictions: Restrictions,
/// Used to determine the path to externally loaded source files.
@@ -132,7 +132,7 @@
/// into modules, and sub-parsers have new values for this name.
pub root_module_name: Option<String>,
crate expected_tokens: Vec<TokenType>,
- crate token_cursor: TokenCursor,
+ token_cursor: TokenCursor,
desugar_doc_comments: bool,
/// `true` we should configure out of line modules as we parse.
pub cfg_mods: bool,
@@ -143,7 +143,7 @@
/// See the comments in the `parse_path_segment` function for more details.
crate unmatched_angle_bracket_count: u32,
crate max_angle_bracket_count: u32,
- /// List of all unclosed delimiters found by the lexer. If an entry is used for error recovery
+ /// A list of all unclosed delimiters found by the lexer. If an entry is used for error recovery
/// it gets removed from here. Every entry left at the end gets emitted as an independent
/// error.
crate unclosed_delims: Vec<UnmatchedBrace>,
@@ -161,19 +161,19 @@
}
#[derive(Clone)]
-crate struct TokenCursor {
- crate frame: TokenCursorFrame,
- crate stack: Vec<TokenCursorFrame>,
+struct TokenCursor {
+ frame: TokenCursorFrame,
+ stack: Vec<TokenCursorFrame>,
}
#[derive(Clone)]
-crate struct TokenCursorFrame {
- crate delim: token::DelimToken,
- crate span: DelimSpan,
- crate open_delim: bool,
- crate tree_cursor: tokenstream::Cursor,
- crate close_delim: bool,
- crate last_token: LastToken,
+struct TokenCursorFrame {
+ delim: token::DelimToken,
+ span: DelimSpan,
+ open_delim: bool,
+ tree_cursor: tokenstream::Cursor,
+ close_delim: bool,
+ last_token: LastToken,
}
/// This is used in `TokenCursorFrame` above to track tokens that are consumed
@@ -799,14 +799,14 @@
break;
}
Err(mut e) => {
- // Attempt to keep parsing if it was a similar separator
+ // Attempt to keep parsing if it was a similar separator.
if let Some(ref tokens) = t.similar_tokens() {
if tokens.contains(&self.token.kind) {
self.bump();
}
}
e.emit();
- // Attempt to keep parsing if it was an omitted separator
+ // Attempt to keep parsing if it was an omitted separator.
match f(self) {
Ok(t) => {
v.push(t);
@@ -871,7 +871,7 @@
self.parse_delim_comma_seq(token::Paren, f)
}
- /// Advance the parser by one token
+ /// Advance the parser by one token.
pub fn bump(&mut self) {
if self.prev_token_kind == PrevTokenKind::Eof {
// Bumping after EOF is a bad sign, usually an infinite loop.
@@ -894,17 +894,17 @@
self.token = self.next_tok();
self.expected_tokens.clear();
- // check after each token
+ // Check after each token.
self.process_potential_macro_variable();
}
- /// Advance the parser using provided token as a next one. Use this when
+ /// Advances the parser using provided token as a next one. Use this when
/// consuming a part of a token. For example a single `<` from `<<`.
fn bump_with(&mut self, next: TokenKind, span: Span) {
self.prev_span = self.token.span.with_hi(span.lo());
// It would be incorrect to record the kind of the current token, but
// fortunately for tokens currently using `bump_with`, the
- // prev_token_kind will be of no use anyway.
+ // `prev_token_kind` will be of no use anyway.
self.prev_token_kind = PrevTokenKind::Other;
self.token = Token::new(next, span);
self.expected_tokens.clear();
@@ -937,8 +937,8 @@
fn parse_asyncness(&mut self) -> IsAsync {
if self.eat_keyword(kw::Async) {
IsAsync::Async {
- closure_id: ast::DUMMY_NODE_ID,
- return_impl_trait_id: ast::DUMMY_NODE_ID,
+ closure_id: DUMMY_NODE_ID,
+ return_impl_trait_id: DUMMY_NODE_ID,
}
} else {
IsAsync::NotAsync
@@ -1040,7 +1040,14 @@
let span = lo.to(self.token.span);
- Ok(Param { attrs: attrs.into(), id: ast::DUMMY_NODE_ID, pat, span, ty })
+ Ok(Param {
+ attrs: attrs.into(),
+ id: ast::DUMMY_NODE_ID,
+ is_placeholder: false,
+ pat,
+ span,
+ ty,
+ })
}
/// Parses mutability (`mut` or nothing).
@@ -1497,7 +1504,7 @@
format!("in {}", path),
Applicability::MachineApplicable,
)
- .emit(); // emit diagnostic, but continue with public visibility
+ .emit(); // Emit diagnostic, but continue with public visibility.
}
}
diff --git a/src/libsyntax/parse/parser/expr.rs b/src/libsyntax/parse/parser/expr.rs
index 59b936a..31b2844 100644
--- a/src/libsyntax/parse/parser/expr.rs
+++ b/src/libsyntax/parse/parser/expr.rs
@@ -1,26 +1,26 @@
-use super::{Parser, PResult, Restrictions, PrevTokenKind, TokenType, PathStyle};
-use super::{BlockMode, SemiColonMode};
-use super::{SeqSep, TokenExpectType};
+use super::{
+ Parser, PResult, Restrictions, PrevTokenKind, TokenType, PathStyle, BlockMode, SemiColonMode,
+ SeqSep, TokenExpectType,
+};
use super::pat::{GateOr, PARAM_EXPECTED};
+use crate::ast::{
+ self, DUMMY_NODE_ID, Attribute, AttrStyle, Ident, CaptureBy, BlockCheckMode,
+ Expr, ExprKind, RangeLimits, Label, Movability, IsAsync, Arm, Ty, TyKind,
+ FunctionRetTy, Param, FnDecl, BinOpKind, BinOp, UnOp, Mac, AnonConst, Field,
+};
use crate::maybe_recover_from_interpolated_ty_qpath;
-use crate::ptr::P;
-use crate::ast::{self, Attribute, AttrStyle, Ident, CaptureBy, BlockCheckMode};
-use crate::ast::{Expr, ExprKind, RangeLimits, Label, Movability, IsAsync, Arm};
-use crate::ast::{Ty, TyKind, FunctionRetTy, Param, FnDecl};
-use crate::ast::{BinOpKind, BinOp, UnOp};
-use crate::ast::{Mac, AnonConst, Field};
-
use crate::parse::classify;
use crate::parse::token::{self, Token};
-use crate::parse::diagnostics::{Error};
+use crate::parse::diagnostics::Error;
use crate::print::pprust;
+use crate::ptr::P;
use crate::source_map::{self, Span};
use crate::symbol::{kw, sym};
use crate::util::parser::{AssocOp, Fixity, prec_let_scrutinee_needs_par};
-use std::mem;
use errors::Applicability;
+use std::mem;
use rustc_data_structures::thin_vec::ThinVec;
/// Possibly accepts an `token::Interpolated` expression (a pre-parsed expression
@@ -51,7 +51,7 @@
$p.token.span, ExprKind::Block(block, None), ThinVec::new()
));
}
- // N.B: `NtIdent(ident)` is normalized to `Ident` in `fn bump`.
+ // N.B., `NtIdent(ident)` is normalized to `Ident` in `fn bump`.
_ => {},
};
}
@@ -231,7 +231,7 @@
self.bump();
if op.is_comparison() {
- self.check_no_chained_comparison(&lhs, &op);
+ self.check_no_chained_comparison(&lhs, &op)?;
}
// Special cases:
if op == AssocOp::As {
@@ -340,7 +340,7 @@
fn is_at_start_of_range_notation_rhs(&self) -> bool {
if self.token.can_begin_expr() {
- // parse `for i in 1.. { }` as infinite loop, not as `for i in (1..{})`.
+ // Parse `for i in 1.. { }` as infinite loop, not as `for i in (1..{})`.
if self.token == token::OpenDelim(token::Brace) {
return !self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL);
}
@@ -350,12 +350,12 @@
}
}
- /// Parse prefix-forms of range notation: `..expr`, `..`, `..=expr`
+ /// Parses prefix-forms of range notation: `..expr`, `..`, `..=expr`.
fn parse_prefix_range_expr(
&mut self,
already_parsed_attrs: Option<ThinVec<Attribute>>
) -> PResult<'a, P<Expr>> {
- // Check for deprecated `...` syntax
+ // Check for deprecated `...` syntax.
if self.token == token::DotDotDot {
self.err_dotdotdot_syntax(self.token.span);
}
@@ -389,7 +389,7 @@
Ok(self.mk_expr(lo.to(hi), r, attrs))
}
- /// Parse a prefix-unary-operator expr
+ /// Parses a prefix-unary-operator expr.
fn parse_prefix_expr(
&mut self,
already_parsed_attrs: Option<ThinVec<Attribute>>
@@ -549,7 +549,7 @@
let expr = mk_expr(self, P(Ty {
span: path.span,
node: TyKind::Path(None, path),
- id: ast::DUMMY_NODE_ID
+ id: DUMMY_NODE_ID,
}));
let expr_str = self.span_to_snippet(expr.span)
@@ -565,7 +565,7 @@
expr.span,
&format!("try {} the cast value", op_verb),
format!("({})", expr_str),
- Applicability::MachineApplicable
+ Applicability::MachineApplicable,
)
.emit();
@@ -741,7 +741,6 @@
})
}
-
/// At the bottom (top?) of the precedence hierarchy,
/// Parses things like parenthesized exprs, macros, `return`, etc.
///
@@ -755,7 +754,7 @@
// added to the return value after the fact.
//
// Therefore, prevent sub-parser from parsing
- // attributes by giving them a empty "already parsed" list.
+ // attributes by giving them a empty "already-parsed" list.
let mut attrs = ThinVec::new();
let lo = self.token.span;
@@ -778,7 +777,7 @@
}
}
- // Note: when adding new syntax here, don't forget to adjust TokenKind::can_begin_expr().
+ // Note: when adding new syntax here, don't forget to adjust `TokenKind::can_begin_expr()`.
match self.token.kind {
// This match arm is a special-case of the `_` match arm below and
// could be removed without changing functionality, but it's faster
@@ -791,8 +790,8 @@
attrs.extend(self.parse_inner_attributes()?);
- // (e) is parenthesized e
- // (e,) is a tuple with only one field, e
+ // `(e)` is parenthesized `e`.
+ // `(e,)` is a tuple with only one field, `e`.
let mut es = vec![];
let mut trailing_comma = false;
let mut recovered = false;
@@ -800,7 +799,7 @@
es.push(match self.parse_expr() {
Ok(es) => es,
Err(mut err) => {
- // recover from parse error in tuple list
+ // Recover from parse error in tuple list.
match self.token.kind {
token::Ident(name, false)
if name == kw::Underscore && self.look_ahead(1, |t| {
@@ -844,7 +843,7 @@
return self.parse_block_expr(None, lo, BlockCheckMode::Default, attrs);
}
token::BinOp(token::Or) | token::OrOr => {
- return self.parse_lambda_expr(attrs);
+ return self.parse_closure_expr(attrs);
}
token::OpenDelim(token::Bracket) => {
self.bump();
@@ -852,21 +851,21 @@
attrs.extend(self.parse_inner_attributes()?);
if self.eat(&token::CloseDelim(token::Bracket)) {
- // Empty vector.
+ // Empty vector
ex = ExprKind::Array(Vec::new());
} else {
- // Nonempty vector.
+ // Non-empty vector
let first_expr = self.parse_expr()?;
if self.eat(&token::Semi) {
- // Repeating array syntax: [ 0; 512 ]
+ // Repeating array syntax: `[ 0; 512 ]`
let count = AnonConst {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
value: self.parse_expr()?,
};
self.expect(&token::CloseDelim(token::Bracket))?;
ex = ExprKind::Repeat(first_expr, count);
} else if self.eat(&token::Comma) {
- // Vector with two or more elements.
+ // Vector with two or more elements
let remaining_exprs = self.parse_seq_to_end(
&token::CloseDelim(token::Bracket),
SeqSep::trailing_allowed(token::Comma),
@@ -876,7 +875,7 @@
exprs.extend(remaining_exprs);
ex = ExprKind::Array(exprs);
} else {
- // Vector with one element.
+ // Vector with one element
self.expect(&token::CloseDelim(token::Bracket))?;
ex = ExprKind::Array(vec![first_expr]);
}
@@ -892,7 +891,7 @@
if self.token.is_path_start() {
let path = self.parse_path(PathStyle::Expr)?;
- // `!`, as an operator, is prefix, so we know this isn't that
+ // `!`, as an operator, is prefix, so we know this isn't that.
if self.eat(&token::Not) {
// MACRO INVOCATION expression
let (delim, tts) = self.expect_delimited_token_tree()?;
@@ -920,7 +919,7 @@
return self.maybe_recover_from_bad_qpath(expr, true);
}
if self.check_keyword(kw::Move) || self.check_keyword(kw::Static) {
- return self.parse_lambda_expr(attrs);
+ return self.parse_closure_expr(attrs);
}
if self.eat_keyword(kw::If) {
return self.parse_if_expr(attrs);
@@ -991,13 +990,13 @@
return self.parse_try_block(lo, attrs);
}
- // Span::rust_2018() is somewhat expensive; don't get it repeatedly.
+ // `Span::rust_2018()` is somewhat expensive; don't get it repeatedly.
let is_span_rust_2018 = self.token.span.rust_2018();
if is_span_rust_2018 && self.check_keyword(kw::Async) {
- return if self.is_async_block() { // check for `async {` and `async move {`
+ return if self.is_async_block() { // Check for `async {` and `async move {`.
self.parse_async_block(attrs)
} else {
- self.parse_lambda_expr(attrs)
+ self.parse_closure_expr(attrs)
};
}
if self.eat_keyword(kw::Return) {
@@ -1043,13 +1042,12 @@
// recovery in order to keep the error count down. Fixing the
// delimiters will possibly also fix the bare semicolon found in
// expression context. For example, silence the following error:
- // ```
- // error: expected expression, found `;`
- // --> file.rs:2:13
- // |
- // 2 | foo(bar(;
- // | ^ expected expression
- // ```
+ //
+ // error: expected expression, found `;`
+ // --> file.rs:2:13
+ // |
+ // 2 | foo(bar(;
+ // | ^ expected expression
self.bump();
return Ok(self.mk_expr(self.token.span, ExprKind::Err, ThinVec::new()));
}
@@ -1096,11 +1094,11 @@
attrs.extend(self.parse_inner_attributes()?);
let blk = self.parse_block_tail(lo, blk_mode)?;
- return Ok(self.mk_expr(blk.span, ExprKind::Block(blk, opt_label), attrs));
+ Ok(self.mk_expr(blk.span, ExprKind::Block(blk, opt_label), attrs))
}
- /// Parses `move |args| expr`.
- fn parse_lambda_expr(&mut self, attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
+ /// Parses a closure expression (e.g., `move |args| expr`).
+ fn parse_closure_expr(&mut self, attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
let lo = self.token.span;
let movability = if self.eat_keyword(kw::Static) {
@@ -1115,7 +1113,7 @@
IsAsync::NotAsync
};
if asyncness.is_async() {
- // Feature gate `async ||` closures.
+ // Feature-gate `async ||` closures.
self.sess.gated_spans.async_closure.borrow_mut().push(self.prev_span);
}
@@ -1128,8 +1126,7 @@
self.parse_expr_res(restrictions, None)?
},
_ => {
- // If an explicit return type is given, require a
- // block to appear (RFC 968).
+ // If an explicit return type is given, require a block to appear (RFC 968).
let body_lo = self.token.span;
self.parse_block_expr(None, body_lo, BlockCheckMode::Default, ThinVec::new())?
}
@@ -1141,7 +1138,7 @@
attrs))
}
- /// Parse an optional `move` prefix to a closure lke construct.
+ /// Parses an optional `move` prefix to a closure lke construct.
fn parse_capture_clause(&mut self) -> CaptureBy {
if self.eat_keyword(kw::Move) {
CaptureBy::Value
@@ -1176,7 +1173,7 @@
}))
}
- /// Parses a parameter in a lambda header (e.g., `|arg, arg|`).
+ /// Parses a parameter in a closure header (e.g., `|arg, arg|`).
fn parse_fn_block_param(&mut self) -> PResult<'a, Param> {
let lo = self.token.span;
let attrs = self.parse_param_attributes()?;
@@ -1185,7 +1182,7 @@
self.parse_ty()?
} else {
P(Ty {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
node: TyKind::Infer,
span: self.prev_span,
})
@@ -1196,7 +1193,8 @@
ty: t,
pat,
span,
- id: ast::DUMMY_NODE_ID
+ id: DUMMY_NODE_ID,
+ is_placeholder: false,
})
}
@@ -1233,7 +1231,7 @@
Ok(self.mk_expr(lo.to(hi), ExprKind::If(cond, thn, els), attrs))
}
- /// Parse the condition of a `if`- or `while`-expression
+ /// Parses the condition of a `if` or `while` expression.
fn parse_cond_expr(&mut self) -> PResult<'a, P<Expr>> {
let cond = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
@@ -1261,7 +1259,7 @@
Ok(self.mk_expr(span, ExprKind::Let(pat, expr), attrs))
}
- /// `else` token already eaten
+ /// Parses an `else { ... }` expression (`else` token already eaten).
fn parse_else_expr(&mut self) -> PResult<'a, P<Expr>> {
if self.eat_keyword(kw::If) {
return self.parse_if_expr(ThinVec::new());
@@ -1271,7 +1269,7 @@
}
}
- /// Parse a 'for' .. 'in' expression ('for' token already eaten)
+ /// Parses a `for ... in` expression (`for` token already eaten).
fn parse_for_expr(
&mut self,
opt_label: Option<Label>,
@@ -1327,7 +1325,7 @@
Ok(self.mk_expr(span, ExprKind::While(cond, body, opt_label), attrs))
}
- /// Parse `loop {...}`, `loop` token already eaten.
+ /// Parses `loop { ... }` (`loop` token already eaten).
fn parse_loop_expr(
&mut self,
opt_label: Option<Label>,
@@ -1350,7 +1348,7 @@
}
}
- // `match` token already eaten
+ /// Parses a `match ... { ... }` expression (`match` token already eaten).
fn parse_match_expr(&mut self, mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
let match_span = self.prev_span;
let lo = self.prev_span;
@@ -1457,7 +1455,8 @@
guard,
body: expr,
span: lo.to(hi),
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
+ is_placeholder: false,
})
}
@@ -1491,7 +1490,7 @@
self.token.is_keyword(kw::Try) &&
self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace)) &&
self.token.span.rust_2018() &&
- // prevent `while try {} {}`, `if try {} {} else {}`, etc.
+ // Prevent `while try {} {}`, `if try {} {} else {}`, etc.
!self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL)
}
@@ -1504,7 +1503,7 @@
attrs.extend(iattrs);
Ok(self.mk_expr(
span_lo.to(body.span),
- ExprKind::Async(capture_clause, ast::DUMMY_NODE_ID, body), attrs))
+ ExprKind::Async(capture_clause, DUMMY_NODE_ID, body), attrs))
}
fn is_async_block(&self) -> bool {
@@ -1527,18 +1526,18 @@
) -> Option<PResult<'a, P<Expr>>> {
let struct_allowed = !self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL);
let certainly_not_a_block = || self.look_ahead(1, |t| t.is_ident()) && (
- // `{ ident, ` cannot start a block
+ // `{ ident, ` cannot start a block.
self.look_ahead(2, |t| t == &token::Comma) ||
self.look_ahead(2, |t| t == &token::Colon) && (
- // `{ ident: token, ` cannot start a block
+ // `{ ident: token, ` cannot start a block.
self.look_ahead(4, |t| t == &token::Comma) ||
- // `{ ident: ` cannot start a block unless it's a type ascription `ident: Type`
+ // `{ ident: ` cannot start a block unless it's a type ascription `ident: Type`.
self.look_ahead(3, |t| !t.can_begin_type())
)
);
if struct_allowed || certainly_not_a_block() {
- // This is a struct literal, but we don't can't accept them here
+ // This is a struct literal, but we don't can't accept them here.
let expr = self.parse_struct_expr(lo, path.clone(), attrs.clone());
if let (Ok(expr), false) = (&expr, struct_allowed) {
self.struct_span_err(
@@ -1606,14 +1605,15 @@
let mut recovery_field = None;
if let token::Ident(name, _) = self.token.kind {
if !self.token.is_reserved_ident() && self.look_ahead(1, |t| *t == token::Colon) {
- // Use in case of error after field-looking code: `S { foo: () with a }`
+ // Use in case of error after field-looking code: `S { foo: () with a }`.
recovery_field = Some(ast::Field {
ident: Ident::new(name, self.token.span),
span: self.token.span,
expr: self.mk_expr(self.token.span, ExprKind::Err, ThinVec::new()),
is_shorthand: false,
attrs: ThinVec::new(),
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
+ is_placeholder: false,
});
}
}
@@ -1639,7 +1639,7 @@
match self.expect_one_of(&[token::Comma],
&[token::CloseDelim(token::Brace)]) {
Ok(_) => if let Some(f) = parsed_field.or(recovery_field) {
- // only include the field if there's no parse error for the field name
+ // Only include the field if there's no parse error for the field name.
fields.push(f);
}
Err(mut e) => {
@@ -1659,7 +1659,7 @@
return Ok(self.mk_expr(span, ExprKind::Struct(pth, fields, base), attrs));
}
- /// Parse ident (COLON expr)?
+ /// Parses `ident (COLON expr)?`.
fn parse_field(&mut self) -> PResult<'a, Field> {
let attrs = self.parse_outer_attributes()?;
let lo = self.token.span;
@@ -1699,7 +1699,8 @@
expr,
is_shorthand,
attrs: attrs.into(),
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
+ is_placeholder: false,
})
}
@@ -1772,6 +1773,6 @@
}
crate fn mk_expr(&self, span: Span, node: ExprKind, attrs: ThinVec<Attribute>) -> P<Expr> {
- P(Expr { node, span, attrs, id: ast::DUMMY_NODE_ID })
+ P(Expr { node, span, attrs, id: DUMMY_NODE_ID })
}
}
diff --git a/src/libsyntax/parse/parser/generics.rs b/src/libsyntax/parse/parser/generics.rs
index 54f24f8..3e6118a 100644
--- a/src/libsyntax/parse/parser/generics.rs
+++ b/src/libsyntax/parse/parser/generics.rs
@@ -49,7 +49,8 @@
bounds,
kind: GenericParamKind::Type {
default,
- }
+ },
+ is_placeholder: false
})
}
@@ -66,7 +67,8 @@
bounds: Vec::new(),
kind: GenericParamKind::Const {
ty,
- }
+ },
+ is_placeholder: false
})
}
@@ -90,6 +92,7 @@
attrs: attrs.into(),
bounds,
kind: ast::GenericParamKind::Lifetime,
+ is_placeholder: false
});
} else if self.check_keyword(kw::Const) {
// Parse const parameter.
diff --git a/src/libsyntax/parse/parser/item.rs b/src/libsyntax/parse/parser/item.rs
index 59a3ade..baae615 100644
--- a/src/libsyntax/parse/parser/item.rs
+++ b/src/libsyntax/parse/parser/item.rs
@@ -2,34 +2,36 @@
use crate::maybe_whole;
use crate::ptr::P;
-use crate::ast::{self, Ident, Attribute, AttrStyle};
-use crate::ast::{Item, ItemKind, ImplItem, TraitItem, TraitItemKind};
-use crate::ast::{UseTree, UseTreeKind, PathSegment};
-use crate::ast::{IsAuto, Constness, IsAsync, Unsafety, Defaultness};
-use crate::ast::{Visibility, VisibilityKind, Mutability, FnDecl, FnHeader};
-use crate::ast::{ForeignItem, ForeignItemKind};
-use crate::ast::{Ty, TyKind, GenericBounds, TraitRef};
-use crate::ast::{EnumDef, VariantData, StructField, AnonConst};
-use crate::ast::{Mac, MacDelimiter};
+use crate::ast::{
+ self, DUMMY_NODE_ID, Ident, Attribute, AttrStyle,
+ Item, ItemKind, ImplItem, TraitItem, TraitItemKind,
+ UseTree, UseTreeKind, PathSegment,
+ IsAuto, Constness, IsAsync, Unsafety, Defaultness,
+ Visibility, VisibilityKind, Mutability, FnDecl, FnHeader,
+ ForeignItem, ForeignItemKind,
+ Ty, TyKind, Generics, GenericBounds, TraitRef,
+ EnumDef, VariantData, StructField, AnonConst,
+ Mac, MacDelimiter,
+};
use crate::ext::base::DummyResult;
use crate::parse::token;
use crate::parse::parser::maybe_append;
-use crate::parse::diagnostics::{Error};
+use crate::parse::diagnostics::Error;
use crate::tokenstream::{TokenTree, TokenStream};
use crate::source_map::{respan, Span, Spanned};
use crate::symbol::{kw, sym};
use std::mem;
use log::debug;
-use rustc_target::spec::abi::{Abi};
+use rustc_target::spec::abi::Abi;
use errors::{Applicability, DiagnosticBuilder, DiagnosticId};
-/// Whether the type alias or associated type is a concrete type or an opaque type
+/// Whether the type alias or associated type is a concrete type or an opaque type.
#[derive(Debug)]
pub enum AliasKind {
- /// Just a new name for the same type
+ /// Just a new name for the same type.
Weak(P<Ty>),
- /// Only trait impls of the type will be usable, not the actual type itself
+ /// Only trait impls of the type will be usable, not the actual type itself.
OpaqueTy(GenericBounds),
}
@@ -200,7 +202,7 @@
return Ok(Some(item));
}
- // Parse `async unsafe? fn`.
+ // Parses `async unsafe? fn`.
if self.check_keyword(kw::Async) {
let async_span = self.token.span;
if self.is_keyword_ahead(1, &[kw::Fn])
@@ -214,8 +216,8 @@
let (ident, item_, extra_attrs) =
self.parse_item_fn(unsafety,
respan(async_span, IsAsync::Async {
- closure_id: ast::DUMMY_NODE_ID,
- return_impl_trait_id: ast::DUMMY_NODE_ID,
+ closure_id: DUMMY_NODE_ID,
+ return_impl_trait_id: DUMMY_NODE_ID,
}),
respan(fn_span, Constness::NotConst),
Abi::Rust)?;
@@ -286,7 +288,7 @@
&& self.look_ahead(1, |t| *t != token::OpenDelim(token::Brace)) {
// UNSAFE FUNCTION ITEM
self.bump(); // `unsafe`
- // `{` is also expected after `unsafe`, in case of error, include it in the diagnostic
+ // `{` is also expected after `unsafe`; in case of error, include it in the diagnostic.
self.check(&token::OpenDelim(token::Brace));
let abi = if self.eat_keyword(kw::Extern) {
self.parse_opt_abi()?.unwrap_or(Abi::C)
@@ -521,7 +523,7 @@
let mac_lo = self.token.span;
- // item macro.
+ // Item macro
let path = self.parse_path(PathStyle::Mod)?;
self.expect(&token::Not)?;
let (delim, tts) = self.expect_delimited_token_tree()?;
@@ -659,7 +661,7 @@
let mut generics = if self.choose_generics_over_qpath() {
self.parse_generics()?
} else {
- ast::Generics::default()
+ Generics::default()
};
// Disambiguate `impl !Trait for Type { ... }` and `impl ! { ... }` for the never type.
@@ -676,7 +678,7 @@
self.look_ahead(1, |t| t != &token::Lt) {
let span = self.prev_span.between(self.token.span);
self.struct_span_err(span, "missing trait in a trait impl").emit();
- P(Ty { node: TyKind::Path(None, err_path(span)), span, id: ast::DUMMY_NODE_ID })
+ P(Ty { node: TyKind::Path(None, err_path(span)), span, id: DUMMY_NODE_ID })
} else {
self.parse_ty()?
};
@@ -798,7 +800,7 @@
self.expect(&token::Eq)?;
let expr = self.parse_expr()?;
self.expect(&token::Semi)?;
- (name, ast::ImplItemKind::Const(typ, expr), ast::Generics::default())
+ (name, ast::ImplItemKind::Const(typ, expr), Generics::default())
} else {
let (name, inner_attrs, generics, node) = self.parse_impl_method(&vis, at_end)?;
attrs.extend(inner_attrs);
@@ -806,7 +808,7 @@
};
Ok(ImplItem {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(self.prev_span),
ident: name,
vis,
@@ -847,14 +849,13 @@
!self.is_keyword_ahead(1, &[kw::Fn, kw::Unsafe])
}
- /// Parse a method or a macro invocation in a trait impl.
+ /// Parses a method or a macro invocation in a trait impl.
fn parse_impl_method(&mut self, vis: &Visibility, at_end: &mut bool)
- -> PResult<'a, (Ident, Vec<Attribute>, ast::Generics,
- ast::ImplItemKind)> {
- // code copied from parse_macro_use_or_failure... abstraction!
+ -> PResult<'a, (Ident, Vec<Attribute>, Generics, ast::ImplItemKind)> {
+ // FIXME: code copied from `parse_macro_use_or_failure` -- use abstraction!
if let Some(mac) = self.parse_assoc_macro_invoc("impl", Some(vis), at_end)? {
// method macro
- Ok((Ident::invalid(), vec![], ast::Generics::default(),
+ Ok((Ident::invalid(), vec![], Generics::default(),
ast::ImplItemKind::Macro(mac)))
} else {
let (constness, unsafety, asyncness, abi) = self.parse_fn_front_matter()?;
@@ -930,7 +931,7 @@
};
if self.eat(&token::Eq) {
- // it's a trait alias
+ // It's a trait alias.
let bounds = self.parse_generic_bounds(None)?;
tps.where_clause = self.parse_where_clause()?;
self.expect(&token::Semi)?;
@@ -948,7 +949,7 @@
}
Ok((ident, ItemKind::TraitAlias(tps, bounds), None))
} else {
- // it's a normal trait
+ // It's a normal trait.
tps.where_clause = self.parse_where_clause()?;
self.expect(&token::OpenDelim(token::Brace))?;
let mut trait_items = vec![];
@@ -1023,10 +1024,10 @@
self.expect(&token::Semi)?;
None
};
- (ident, TraitItemKind::Const(ty, default), ast::Generics::default())
+ (ident, TraitItemKind::Const(ty, default), Generics::default())
} else if let Some(mac) = self.parse_assoc_macro_invoc("trait", None, &mut false)? {
// trait item macro.
- (Ident::invalid(), ast::TraitItemKind::Macro(mac), ast::Generics::default())
+ (Ident::invalid(), ast::TraitItemKind::Macro(mac), Generics::default())
} else {
let (constness, unsafety, asyncness, abi) = self.parse_fn_front_matter()?;
@@ -1089,7 +1090,7 @@
};
Ok(TraitItem {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
ident: name,
attrs,
generics,
@@ -1103,7 +1104,7 @@
///
/// TraitItemAssocTy = Ident ["<"...">"] [":" [GenericBounds]] ["where" ...] ["=" Ty]
fn parse_trait_item_assoc_ty(&mut self)
- -> PResult<'a, (Ident, TraitItemKind, ast::Generics)> {
+ -> PResult<'a, (Ident, TraitItemKind, Generics)> {
let ident = self.parse_ident()?;
let mut generics = self.parse_generics()?;
@@ -1165,7 +1166,7 @@
UseTreeKind::Nested(self.parse_use_tree_list()?)
}
} else {
- UseTreeKind::Simple(self.parse_rename()?, ast::DUMMY_NODE_ID, ast::DUMMY_NODE_ID)
+ UseTreeKind::Simple(self.parse_rename()?, DUMMY_NODE_ID, DUMMY_NODE_ID)
}
};
@@ -1178,7 +1179,7 @@
/// USE_TREE_LIST = Ø | (USE_TREE `,`)* USE_TREE [`,`]
/// ```
fn parse_use_tree_list(&mut self) -> PResult<'a, Vec<(UseTree, ast::NodeId)>> {
- self.parse_delim_comma_seq(token::Brace, |p| Ok((p.parse_use_tree()?, ast::DUMMY_NODE_ID)))
+ self.parse_delim_comma_seq(token::Brace, |p| Ok((p.parse_use_tree()?, DUMMY_NODE_ID)))
.map(|(r, _)| r)
}
@@ -1240,9 +1241,9 @@
let mut idents = vec![];
let mut replacement = vec![];
let mut fixed_crate_name = false;
- // Accept `extern crate name-like-this` for better diagnostics
+ // Accept `extern crate name-like-this` for better diagnostics.
let dash = token::BinOp(token::BinOpToken::Minus);
- if self.token == dash { // Do not include `-` as part of the expected tokens list
+ if self.token == dash { // Do not include `-` as part of the expected tokens list.
while self.eat(&dash) {
fixed_crate_name = true;
replacement.push((self.prev_span, "_".to_string()));
@@ -1283,7 +1284,7 @@
}
/// Parses the name and optional generic types of a function header.
- fn parse_fn_header(&mut self) -> PResult<'a, (Ident, ast::Generics)> {
+ fn parse_fn_header(&mut self) -> PResult<'a, (Ident, Generics)> {
let id = self.parse_ident()?;
let generics = self.parse_generics()?;
Ok((id, generics))
@@ -1379,7 +1380,7 @@
ForeignItem {
ident: Ident::invalid(),
span: lo.to(self.prev_span),
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
attrs,
vis: visibility,
node: ForeignItemKind::Macro(mac),
@@ -1415,7 +1416,7 @@
ident,
attrs,
node: ForeignItemKind::Fn(decl, generics),
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(hi),
vis,
})
@@ -1435,7 +1436,7 @@
ident,
attrs,
node: ForeignItemKind::Static(ty, mutbl),
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(hi),
vis,
})
@@ -1453,7 +1454,7 @@
ident,
attrs,
node: ForeignItemKind::Ty,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(hi),
vis
})
@@ -1461,7 +1462,7 @@
fn is_static_global(&mut self) -> bool {
if self.check_keyword(kw::Static) {
- // Check if this could be a closure
+ // Check if this could be a closure.
!self.look_ahead(1, |token| {
if token.is_keyword(kw::Move) {
return true;
@@ -1492,7 +1493,7 @@
/// Parses `type Foo = Bar;` or returns `None`
/// without modifying the parser state.
- fn eat_type(&mut self) -> Option<PResult<'a, (Ident, AliasKind, ast::Generics)>> {
+ fn eat_type(&mut self) -> Option<PResult<'a, (Ident, AliasKind, Generics)>> {
// This parses the grammar:
// Ident ["<"...">"] ["where" ...] ("=" | ":") Ty ";"
if self.eat_keyword(kw::Type) {
@@ -1503,7 +1504,7 @@
}
/// Parses a type alias or opaque type.
- fn parse_type_alias(&mut self) -> PResult<'a, (Ident, AliasKind, ast::Generics)> {
+ fn parse_type_alias(&mut self) -> PResult<'a, (Ident, AliasKind, Generics)> {
let ident = self.parse_ident()?;
let mut tps = self.parse_generics()?;
tps.where_clause = self.parse_where_clause()?;
@@ -1536,7 +1537,7 @@
}
/// Parses the part of an enum declaration following the `{`.
- fn parse_enum_def(&mut self, _generics: &ast::Generics) -> PResult<'a, EnumDef> {
+ fn parse_enum_def(&mut self, _generics: &Generics) -> PResult<'a, EnumDef> {
let mut variants = Vec::new();
while self.token != token::CloseDelim(token::Brace) {
let variant_attrs = self.parse_outer_attributes()?;
@@ -1552,15 +1553,15 @@
} else if self.check(&token::OpenDelim(token::Paren)) {
VariantData::Tuple(
self.parse_tuple_struct_body()?,
- ast::DUMMY_NODE_ID,
+ DUMMY_NODE_ID,
)
} else {
- VariantData::Unit(ast::DUMMY_NODE_ID)
+ VariantData::Unit(DUMMY_NODE_ID)
};
let disr_expr = if self.eat(&token::Eq) {
Some(AnonConst {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
value: self.parse_expr()?,
})
} else {
@@ -1569,11 +1570,12 @@
let vr = ast::Variant {
ident,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
attrs: variant_attrs,
data: struct_def,
disr_expr,
span: vlo.to(self.prev_span),
+ is_placeholder: false,
};
variants.push(vr);
@@ -1622,7 +1624,7 @@
generics.where_clause = self.parse_where_clause()?;
if self.eat(&token::Semi) {
// If we see a: `struct Foo<T> where T: Copy;` style decl.
- VariantData::Unit(ast::DUMMY_NODE_ID)
+ VariantData::Unit(DUMMY_NODE_ID)
} else {
// If we see: `struct Foo<T> where T: Copy { ... }`
let (fields, recovered) = self.parse_record_struct_body()?;
@@ -1630,14 +1632,14 @@
}
// No `where` so: `struct Foo<T>;`
} else if self.eat(&token::Semi) {
- VariantData::Unit(ast::DUMMY_NODE_ID)
+ VariantData::Unit(DUMMY_NODE_ID)
// Record-style struct definition
} else if self.token == token::OpenDelim(token::Brace) {
let (fields, recovered) = self.parse_record_struct_body()?;
VariantData::Struct(fields, recovered)
// Tuple-style struct definition with optional where-clause.
} else if self.token == token::OpenDelim(token::Paren) {
- let body = VariantData::Tuple(self.parse_tuple_struct_body()?, ast::DUMMY_NODE_ID);
+ let body = VariantData::Tuple(self.parse_tuple_struct_body()?, DUMMY_NODE_ID);
generics.where_clause = self.parse_where_clause()?;
self.expect(&token::Semi)?;
body
@@ -1726,9 +1728,10 @@
span: lo.to(ty.span),
vis,
ident: None,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
ty,
attrs,
+ is_placeholder: false,
})
}).map(|(r, _)| r)
}
@@ -1817,9 +1820,10 @@
span: lo.to(self.prev_span),
ident: Some(name),
vis,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
ty,
attrs,
+ is_placeholder: false,
})
}
@@ -1909,7 +1913,7 @@
P(Item {
ident,
attrs,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
node,
vis,
span,
diff --git a/src/libsyntax/parse/parser/module.rs b/src/libsyntax/parse/parser/module.rs
index 3f6f87b..2d2fb48 100644
--- a/src/libsyntax/parse/parser/module.rs
+++ b/src/libsyntax/parse/parser/module.rs
@@ -36,12 +36,12 @@
krate
}
- /// Parse a `mod <foo> { ... }` or `mod <foo>;` item
+ /// Parses a `mod <foo> { ... }` or `mod <foo>;` item.
pub(super) fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> {
let (in_cfg, outer_attrs) = {
let mut strip_unconfigured = crate::config::StripUnconfigured {
sess: self.sess,
- features: None, // don't perform gated feature checking
+ features: None, // Don't perform gated feature checking.
};
let mut outer_attrs = outer_attrs.to_owned();
strip_unconfigured.process_cfg_attrs(&mut outer_attrs);
@@ -57,7 +57,7 @@
self.submod_path(id, &outer_attrs, id_span)?;
let (module, mut attrs) =
self.eval_src_mod(path, directory_ownership, id.to_string(), id_span)?;
- // Record that we fetched the mod from an external file
+ // Record that we fetched the mod from an external file.
if warn {
let attr = attr::mk_attr_outer(
attr::mk_word_item(Ident::with_dummy_span(sym::warn_directory_ownership)));
diff --git a/src/libsyntax/parse/parser/pat.rs b/src/libsyntax/parse/parser/pat.rs
index 669f657..08ee3a6 100644
--- a/src/libsyntax/parse/parser/pat.rs
+++ b/src/libsyntax/parse/parser/pat.rs
@@ -844,14 +844,14 @@
// Check if a colon exists one ahead. This means we're parsing a fieldname.
let hi;
let (subpat, fieldname, is_shorthand) = if self.look_ahead(1, |t| t == &token::Colon) {
- // Parsing a pattern of the form "fieldname: pat"
+ // Parsing a pattern of the form `fieldname: pat`.
let fieldname = self.parse_field_name()?;
self.bump();
let pat = self.parse_pat_with_or_inner()?;
hi = pat.span;
(pat, fieldname, false)
} else {
- // Parsing a pattern of the form "(box) (ref) (mut) fieldname"
+ // Parsing a pattern of the form `(box) (ref) (mut) fieldname`.
let is_box = self.eat_keyword(kw::Box);
let boxed_span = self.token.span;
let is_ref = self.eat_keyword(kw::Ref);
@@ -882,6 +882,7 @@
attrs: attrs.into(),
id: ast::DUMMY_NODE_ID,
span: lo.to(hi),
+ is_placeholder: false,
})
}
diff --git a/src/libsyntax/parse/parser/stmt.rs b/src/libsyntax/parse/parser/stmt.rs
index 748c1a1..04bd61a 100644
--- a/src/libsyntax/parse/parser/stmt.rs
+++ b/src/libsyntax/parse/parser/stmt.rs
@@ -5,12 +5,12 @@
use crate::ptr::P;
use crate::{maybe_whole, ThinVec};
-use crate::ast::{self, Stmt, StmtKind, Local, Block, BlockCheckMode, Expr, ExprKind};
+use crate::ast::{self, DUMMY_NODE_ID, Stmt, StmtKind, Local, Block, BlockCheckMode, Expr, ExprKind};
use crate::ast::{Attribute, AttrStyle, VisibilityKind, MacStmtStyle, Mac, MacDelimiter};
use crate::ext::base::DummyResult;
use crate::parse::{classify, DirectoryOwnership};
use crate::parse::diagnostics::Error;
-use crate::parse::token::{self};
+use crate::parse::token;
use crate::source_map::{respan, Span};
use crate::symbol::{kw, sym};
@@ -18,7 +18,7 @@
use errors::Applicability;
impl<'a> Parser<'a> {
- /// Parse a statement. This stops just before trailing semicolons on everything but items.
+ /// Parses a statement. This stops just before trailing semicolons on everything but items.
/// e.g., a `StmtKind::Semi` parses to a `StmtKind::Expr`, leaving the trailing `;` unconsumed.
pub fn parse_stmt(&mut self) -> PResult<'a, Option<Stmt>> {
Ok(self.parse_stmt_(true))
@@ -43,7 +43,7 @@
Ok(Some(if self.eat_keyword(kw::Let) {
Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
node: StmtKind::Local(self.parse_local(attrs.into())?),
span: lo.to(self.prev_span),
}
@@ -53,7 +53,7 @@
lo,
)? {
Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
node: StmtKind::Item(macro_def),
span: lo.to(self.prev_span),
}
@@ -85,7 +85,7 @@
})?;
return Ok(Some(Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
node: StmtKind::Expr(expr),
span: lo.to(self.prev_span),
}));
@@ -114,17 +114,17 @@
// We used to incorrectly stop parsing macro-expanded statements here.
// If the next token will be an error anyway but could have parsed with the
// earlier behavior, stop parsing here and emit a warning to avoid breakage.
- else if macro_legacy_warnings &&
- self.token.can_begin_expr() &&
- match self.token.kind {
- // These can continue an expression, so we can't stop parsing and warn.
- token::OpenDelim(token::Paren) | token::OpenDelim(token::Bracket) |
- token::BinOp(token::Minus) | token::BinOp(token::Star) |
- token::BinOp(token::And) | token::BinOp(token::Or) |
- token::AndAnd | token::OrOr |
- token::DotDot | token::DotDotDot | token::DotDotEq => false,
- _ => true,
- } {
+ else if macro_legacy_warnings && self.token.can_begin_expr() &&
+ match self.token.kind {
+ // These can continue an expression, so we can't stop parsing and warn.
+ token::OpenDelim(token::Paren) | token::OpenDelim(token::Bracket) |
+ token::BinOp(token::Minus) | token::BinOp(token::Star) |
+ token::BinOp(token::And) | token::BinOp(token::Or) |
+ token::AndAnd | token::OrOr |
+ token::DotDot | token::DotDotDot | token::DotDotEq => false,
+ _ => true,
+ }
+ {
self.warn_missing_semicolon();
StmtKind::Mac(P((mac, style, attrs.into())))
} else {
@@ -135,7 +135,7 @@
StmtKind::Expr(e)
};
Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(hi),
node,
}
@@ -148,7 +148,7 @@
match item {
Some(i) => Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(i.span),
node: StmtKind::Item(i),
},
@@ -178,7 +178,7 @@
// an empty tuple that spans the excess semicolons
// to preserve this info until the lint stage
return Ok(Some(Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(last_semi),
node: StmtKind::Semi(self.mk_expr(lo.to(last_semi),
ExprKind::Tup(Vec::new()),
@@ -196,7 +196,7 @@
let e = self.parse_expr_res(
Restrictions::STMT_EXPR, Some(attrs.into()))?;
Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(e.span),
node: StmtKind::Expr(e),
}
@@ -218,7 +218,7 @@
match self.parse_ty() {
Ok(ty) => (None, Some(ty)),
Err(mut err) => {
- // Rewind to before attempting to parse the type and continue parsing
+ // Rewind to before attempting to parse the type and continue parsing.
let parser_snapshot_after_type = self.clone();
mem::replace(self, parser_snapshot_before_type);
@@ -272,7 +272,7 @@
ty,
pat,
init,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
span: lo.to(hi),
attrs,
}))
@@ -334,18 +334,18 @@
// if (cond)
// bar;
//
- // Which is valid in other languages, but not Rust.
+ // which is valid in other languages, but not Rust.
match self.parse_stmt_without_recovery(false) {
Ok(Some(stmt)) => {
if self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace))
|| do_not_suggest_help {
- // if the next token is an open brace (e.g., `if a b {`), the place-
- // inside-a-block suggestion would be more likely wrong than right
+ // If the next token is an open brace (e.g., `if a b {`), the place-
+ // inside-a-block suggestion would be more likely wrong than right.
e.span_label(sp, "expected `{`");
return Err(e);
}
let mut stmt_span = stmt.span;
- // expand the span to include the semicolon, if it exists
+ // Expand the span to include the semicolon, if it exists.
if self.eat(&token::Semi) {
stmt_span = stmt_span.with_hi(self.prev_span.hi());
}
@@ -354,7 +354,7 @@
stmt_span,
"try placing this code inside a block",
format!("{{ {} }}", snippet),
- // speculative, has been misleading in the past (#46836)
+ // Speculative; has been misleading in the past (#46836).
Applicability::MaybeIncorrect,
);
}
@@ -399,7 +399,7 @@
err.emit();
self.recover_stmt_(SemiColonMode::Ignore, BlockMode::Ignore);
Some(Stmt {
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
node: StmtKind::Expr(DummyResult::raw_expr(self.token.span, true)),
span: self.token.span,
})
@@ -415,7 +415,7 @@
}
Ok(P(ast::Block {
stmts,
- id: ast::DUMMY_NODE_ID,
+ id: DUMMY_NODE_ID,
rules: s,
span: lo.to(self.prev_span),
}))
@@ -423,7 +423,7 @@
/// Parses a statement, including the trailing semicolon.
crate fn parse_full_stmt(&mut self, macro_legacy_warnings: bool) -> PResult<'a, Option<Stmt>> {
- // skip looking for a trailing semicolon when we have an interpolated statement
+ // Skip looking for a trailing semicolon when we have an interpolated statement.
maybe_whole!(self, NtStmt, |x| Some(x));
let mut stmt = match self.parse_stmt_without_recovery(macro_legacy_warnings)? {
diff --git a/src/libsyntax/parse/tests.rs b/src/libsyntax/parse/tests.rs
index 6a789ef..5cb59b3 100644
--- a/src/libsyntax/parse/tests.rs
+++ b/src/libsyntax/parse/tests.rs
@@ -25,12 +25,12 @@
new_parser_from_source_str(sess, name, source).parse_item()
}
-// produce a syntax_pos::span
+// Produces a `syntax_pos::span`.
fn sp(a: u32, b: u32) -> Span {
Span::with_root_ctxt(BytePos(a), BytePos(b))
}
-/// Parse a string, return an expr
+/// Parses a string, return an expression.
fn string_to_expr(source_str : String) -> P<ast::Expr> {
let ps = ParseSess::new(FilePathMapping::empty());
with_error_checking_parse(source_str, &ps, |p| {
@@ -38,7 +38,7 @@
})
}
-/// Parse a string, return an item
+/// Parses a string, returns an item.
fn string_to_item(source_str : String) -> Option<P<ast::Item>> {
let ps = ParseSess::new(FilePathMapping::empty());
with_error_checking_parse(source_str, &ps, |p| {
@@ -53,7 +53,7 @@
})
}
-// check the token-tree-ization of macros
+// Checks the token-tree-ization of macros.
#[test]
fn string_to_tts_macro () {
with_default_globals(|| {
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 6772bbc..5d8498f 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -119,19 +119,23 @@
if is_expanded && sess.injected_crate_name.try_get().is_some() {
// We need to print `#![no_std]` (and its feature gate) so that
// compiling pretty-printed source won't inject libstd again.
- // However we don't want these attributes in the AST because
+ // However, we don't want these attributes in the AST because
// of the feature gate, so we fake them up here.
- // #![feature(prelude_import)]
+ // `#![feature(prelude_import)]`
let pi_nested = attr::mk_nested_word_item(ast::Ident::with_dummy_span(sym::prelude_import));
let list = attr::mk_list_item(ast::Ident::with_dummy_span(sym::feature), vec![pi_nested]);
let fake_attr = attr::mk_attr_inner(list);
s.print_attribute(&fake_attr);
- // #![no_std]
- let no_std_meta = attr::mk_word_item(ast::Ident::with_dummy_span(sym::no_std));
- let fake_attr = attr::mk_attr_inner(no_std_meta);
- s.print_attribute(&fake_attr);
+ // Currently, in Rust 2018 we don't have `extern crate std;` at the crate
+ // root, so this is not needed, and actually breaks things.
+ if sess.edition == syntax_pos::edition::Edition::Edition2015 {
+ // `#![no_std]`
+ let no_std_meta = attr::mk_word_item(ast::Ident::with_dummy_span(sym::no_std));
+ let fake_attr = attr::mk_attr_inner(no_std_meta);
+ s.print_attribute(&fake_attr);
+ }
}
s.print_mod(&krate.module, &krate.attrs);
@@ -394,9 +398,9 @@
fn block_to_string(blk: &ast::Block) -> String {
to_string(|s| {
- // containing cbox, will be closed by print-block at }
+ // Containing cbox, will be closed by `print_block` at `}`.
s.cbox(INDENT_UNIT);
- // head-ibox, will be closed by print-block after {
+ // Head-ibox, will be closed by `print_block` after `{`.
s.ibox(0);
s.print_block(blk)
})
@@ -439,7 +443,7 @@
}
}
-pub trait PrintState<'a>: std::ops::Deref<Target=pp::Printer> + std::ops::DerefMut {
+pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::DerefMut {
fn comments(&mut self) -> &mut Option<Comments<'a>>;
fn print_ident(&mut self, ident: ast::Ident);
fn print_generic_args(&mut self, args: &ast::GenericArgs, colons_before_params: bool);
@@ -491,7 +495,7 @@
self.hardbreak_if_not_bol();
for line in &cmnt.lines {
// Don't print empty lines because they will end up as trailing
- // whitespace
+ // whitespace.
if !line.is_empty() {
self.word(line.clone());
}
@@ -779,11 +783,11 @@
fn head<S: Into<Cow<'static, str>>>(&mut self, w: S) {
let w = w.into();
- // outer-box is consistent
+ // Outer-box is consistent.
self.cbox(INDENT_UNIT);
- // head-box is inconsistent
+ // Head-box is inconsistent.
self.ibox(w.len() + 1);
- // keyword that starts the head
+ // Keyword that starts the head.
if !w.is_empty() {
self.word_nbsp(w);
}
@@ -791,7 +795,7 @@
fn bopen(&mut self) {
self.word("{");
- self.end(); // close the head-box
+ self.end(); // Close the head-box.
}
fn bclose_maybe_open(&mut self, span: syntax_pos::Span, close_box: bool) {
@@ -799,7 +803,7 @@
self.break_offset_if_not_bol(1, -(INDENT_UNIT as isize));
self.word("}");
if close_box {
- self.end(); // close the outer-box
+ self.end(); // Close the outer-box.
}
}
@@ -896,8 +900,6 @@
self.s.word("*/")
}
-
-
crate fn commasep_cmnt<T, F, G>(&mut self,
b: Breaks,
elts: &[T],
@@ -924,12 +926,12 @@
}
crate fn commasep_exprs(&mut self, b: Breaks,
- exprs: &[P<ast::Expr>]) {
+ exprs: &[P<ast::Expr>]) {
self.commasep_cmnt(b, exprs, |s, e| s.print_expr(e), |e| e.span)
}
crate fn print_mod(&mut self, _mod: &ast::Mod,
- attrs: &[ast::Attribute]) {
+ attrs: &[ast::Attribute]) {
self.print_inner_attributes(attrs);
for item in &_mod.items {
self.print_item(item);
@@ -937,7 +939,7 @@
}
crate fn print_foreign_mod(&mut self, nmod: &ast::ForeignMod,
- attrs: &[ast::Attribute]) {
+ attrs: &[ast::Attribute]) {
self.print_inner_attributes(attrs);
for item in &nmod.items {
self.print_foreign_item(item);
@@ -1132,7 +1134,7 @@
self.s.word(";")
}
- /// Pretty-print an item
+ /// Pretty-prints an item.
crate fn print_item(&mut self, item: &ast::Item) {
self.hardbreak_if_not_bol();
self.maybe_print_comment(item.span.lo());
@@ -1485,7 +1487,7 @@
self.s.word(";");
}
self.end();
- self.end(); // close the outer-box
+ self.end(); // Close the outer-box.
}
ast::VariantData::Struct(..) => {
self.print_where_clause(&generics.where_clause);
@@ -1789,7 +1791,7 @@
self.print_expr_cond_paren(expr, expr.precedence().order() < prec)
}
- /// Print an expr using syntax that's acceptable in a condition position, such as the `cond` in
+ /// Prints an expr using syntax that's acceptable in a condition position, such as the `cond` in
/// `if cond { ... }`.
crate fn print_expr_as_cond(&mut self, expr: &ast::Expr) {
self.print_expr_cond_paren(expr, Self::cond_needs_par(expr))
@@ -1808,7 +1810,7 @@
}
}
- /// Print `expr` or `(expr)` when `needs_par` holds.
+ /// Prints `expr` or `(expr)` when `needs_par` holds.
fn print_expr_cond_paren(&mut self, expr: &ast::Expr, needs_par: bool) {
if needs_par {
self.popen();
@@ -2452,7 +2454,7 @@
}
fn print_arm(&mut self, arm: &ast::Arm) {
- // I have no idea why this check is necessary, but here it is :(
+ // Note, I have no idea why this check is necessary, but here it is.
if arm.attrs.is_empty() {
self.s.space();
}
@@ -2476,21 +2478,21 @@
self.word_space(":");
}
- // the block will close the pattern's ibox
+ // The block will close the pattern's ibox.
self.print_block_unclosed_indent(blk);
- // If it is a user-provided unsafe block, print a comma after it
+ // If it is a user-provided unsafe block, print a comma after it.
if let BlockCheckMode::Unsafe(ast::UserProvided) = blk.rules {
self.s.word(",");
}
}
_ => {
- self.end(); // close the ibox for the pattern
+ self.end(); // Close the ibox for the pattern.
self.print_expr(&arm.body);
self.s.word(",");
}
}
- self.end(); // close enclosing cbox
+ self.end(); // Close enclosing cbox.
}
fn print_explicit_self(&mut self, explicit_self: &ast::ExplicitSelf) {
diff --git a/src/libsyntax/print/pprust/tests.rs b/src/libsyntax/print/pprust/tests.rs
index 2521467..05d78cd 100644
--- a/src/libsyntax/print/pprust/tests.rs
+++ b/src/libsyntax/print/pprust/tests.rs
@@ -12,8 +12,8 @@
s.head("");
s.print_fn(decl, header, Some(name),
generics, &source_map::dummy_spanned(ast::VisibilityKind::Inherited));
- s.end(); // Close the head box
- s.end(); // Close the outer box
+ s.end(); // Close the head box.
+ s.end(); // Close the outer box.
})
}
@@ -58,10 +58,10 @@
ident,
attrs: Vec::new(),
id: ast::DUMMY_NODE_ID,
- // making this up as I go.... ?
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),
disr_expr: None,
span: syntax_pos::DUMMY_SP,
+ is_placeholder: false,
};
let varstr = variant_to_string(&var);
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs
index 7190cfd..d7ea799 100644
--- a/src/libsyntax/source_map.rs
+++ b/src/libsyntax/source_map.rs
@@ -1,10 +1,10 @@
-//! The SourceMap tracks all the source code used within a single crate, mapping
+//! The `SourceMap` tracks all the source code used within a single crate, mapping
//! from integer byte positions to the original source code location. Each bit
//! of source parsed during crate parsing (typically files, in-memory strings,
//! or various bits of macro expansion) cover a continuous range of bytes in the
-//! SourceMap and are represented by SourceFiles. Byte positions are stored in
-//! `spans` and used pervasively in the compiler. They are absolute positions
-//! within the SourceMap, which upon request can be converted to line and column
+//! `SourceMap` and are represented by `SourceFile`s. Byte positions are stored in
+//! `Span`` and used pervasively in the compiler. They are absolute positions
+//! within the `SourceMap`, which upon request can be converted to line and column
//! information, source code snippets, etc.
pub use syntax_pos::*;
@@ -94,7 +94,7 @@
}
}
-// This is a SourceFile identifier that is used to correlate SourceFiles between
+// This is a `SourceFile` identifier that is used to correlate `SourceFile`s between
// subsequent compilation sessions (which is something we need to do during
// incremental compilation).
#[derive(Copy, Clone, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, Debug)]
@@ -103,8 +103,8 @@
impl StableSourceFileId {
pub fn new(source_file: &SourceFile) -> StableSourceFileId {
StableSourceFileId::new_from_pieces(&source_file.name,
- source_file.name_was_remapped,
- source_file.unmapped_path.as_ref())
+ source_file.name_was_remapped,
+ source_file.unmapped_path.as_ref())
}
pub fn new_from_pieces(name: &FileName,
@@ -134,7 +134,7 @@
files: Lock<SourceMapFiles>,
file_loader: Box<dyn FileLoader + Sync + Send>,
// This is used to apply the file path remapping as specified via
- // --remap-path-prefix to all SourceFiles allocated within this SourceMap.
+ // `--remap-path-prefix` to all `SourceFile`s allocated within this `SourceMap`.
path_mapping: FilePathMapping,
}
@@ -204,14 +204,14 @@
match self.files.borrow().source_files.last() {
None => 0,
// Add one so there is some space between files. This lets us distinguish
- // positions in the source_map, even in the presence of zero-length files.
+ // positions in the `SourceMap`, even in the presence of zero-length files.
Some(last) => last.end_pos.to_usize() + 1,
}
}
- /// Creates a new source_file.
- /// If a file already exists in the source_map with the same id, that file is returned
- /// unmodified
+ /// Creates a new `SourceFile`.
+ /// If a file already exists in the `SourceMap` with the same ID, that file is returned
+ /// unmodified.
pub fn new_source_file(&self, filename: FileName, src: String) -> Lrc<SourceFile> {
self.try_new_source_file(filename, src)
.unwrap_or_else(|OffsetOverflowError| {
@@ -268,8 +268,8 @@
Ok(lrc_sf)
}
- /// Allocates a new SourceFile representing a source file from an external
- /// crate. The source code of such an "imported source_file" is not available,
+ /// Allocates a new `SourceFile` representing a source file from an external
+ /// crate. The source code of such an "imported `SourceFile`" is not available,
/// but we still know enough to generate accurate debuginfo location
/// information for things inlined from other crates.
pub fn new_imported_source_file(
@@ -334,7 +334,7 @@
pos.col.to_usize() + 1)
}
- // If there is a doctest_offset, apply it to the line
+ // If there is a doctest offset, applies it to the line.
pub fn doctest_offset_line(&self, file: &FileName, orig: usize) -> usize {
return match file {
FileName::DocTest(_, offset) => {
@@ -348,7 +348,7 @@
}
}
- /// Lookup source information about a BytePos
+ /// Looks up source information about a `BytePos`.
pub fn lookup_char_pos(&self, pos: BytePos) -> Loc {
let chpos = self.bytepos_to_file_charpos(pos);
match self.lookup_line(pos) {
@@ -411,7 +411,7 @@
}
}
- // If the relevant source_file is empty, we don't return a line number.
+ // If the corresponding `SourceFile` is empty, does not return a line number.
pub fn lookup_line(&self, pos: BytePos) -> Result<SourceFileAndLine, Lrc<SourceFile>> {
let idx = self.lookup_source_file_idx(pos);
@@ -423,15 +423,15 @@
}
}
- /// Returns `Some(span)`, a union of the lhs and rhs span. The lhs must precede the rhs. If
- /// there are gaps between lhs and rhs, the resulting union will cross these gaps.
- /// For this to work, the spans have to be:
+ /// Returns `Some(span)`, a union of the LHS and RHS span. The LHS must precede the RHS. If
+ /// there are gaps between LHS and RHS, the resulting union will cross these gaps.
+ /// For this to work,
///
- /// * the ctxt of both spans much match
- /// * the lhs span needs to end on the same line the rhs span begins
- /// * the lhs span must start at or before the rhs span
+ /// * the syntax contexts of both spans much match,
+ /// * the LHS span needs to end on the same line the RHS span begins,
+ /// * the LHS span must start at or before the RHS span.
pub fn merge_spans(&self, sp_lhs: Span, sp_rhs: Span) -> Option<Span> {
- // make sure we're at the same expansion id
+ // Ensure we're at the same expansion ID.
if sp_lhs.ctxt() != sp_rhs.ctxt() {
return None;
}
@@ -445,12 +445,12 @@
Err(_) => return None
};
- // if we must cross lines to merge, don't merge
+ // If we must cross lines to merge, don't merge.
if lhs_end.line != rhs_begin.line {
return None;
}
- // ensure these follow the expected order and we don't overlap
+ // Ensure these follow the expected order and that we don't overlap.
if (sp_lhs.lo() <= sp_rhs.lo()) && (sp_lhs.hi() <= sp_rhs.lo()) {
Some(sp_lhs.to(sp_rhs))
} else {
@@ -466,11 +466,12 @@
let lo = self.lookup_char_pos(sp.lo());
let hi = self.lookup_char_pos(sp.hi());
format!("{}:{}:{}: {}:{}",
- lo.file.name,
- lo.line,
- lo.col.to_usize() + 1,
- hi.line,
- hi.col.to_usize() + 1)
+ lo.file.name,
+ lo.line,
+ lo.col.to_usize() + 1,
+ hi.line,
+ hi.col.to_usize() + 1,
+ )
}
pub fn span_to_filename(&self, sp: Span) -> FileName {
@@ -479,7 +480,7 @@
pub fn span_to_unmapped_path(&self, sp: Span) -> FileName {
self.lookup_char_pos(sp.lo()).file.unmapped_path.clone()
- .expect("SourceMap::span_to_unmapped_path called for imported SourceFile?")
+ .expect("`SourceMap::span_to_unmapped_path` called for imported `SourceFile`?")
}
pub fn is_multiline(&self, sp: Span) -> bool {
@@ -586,7 +587,7 @@
}
}
- /// Returns the source snippet as `String` corresponding to the given `Span`
+ /// Returns the source snippet as `String` corresponding to the given `Span`.
pub fn span_to_snippet(&self, sp: Span) -> Result<String, SpanSnippetError> {
self.span_to_source(sp, |src, start_index, end_index| src.get(start_index..end_index)
.map(|s| s.to_string())
@@ -602,14 +603,14 @@
}
}
- /// Returns the source snippet as `String` before the given `Span`
+ /// Returns the source snippet as `String` before the given `Span`.
pub fn span_to_prev_source(&self, sp: Span) -> Result<String, SpanSnippetError> {
self.span_to_source(sp, |src, start_index, _| src.get(..start_index)
.map(|s| s.to_string())
.ok_or_else(|| SpanSnippetError::IllFormedSpan(sp)))
}
- /// Extend the given `Span` to just after the previous occurrence of `c`. Return the same span
+ /// Extends the given `Span` to just after the previous occurrence of `c`. Return the same span
/// if no character could be found or if an error occurred while retrieving the code snippet.
pub fn span_extend_to_prev_char(&self, sp: Span, c: char) -> Span {
if let Ok(prev_source) = self.span_to_prev_source(sp) {
@@ -622,8 +623,8 @@
sp
}
- /// Extend the given `Span` to just after the previous occurrence of `pat` when surrounded by
- /// whitespace. Return the same span if no character could be found or if an error occurred
+ /// Extends the given `Span` to just after the previous occurrence of `pat` when surrounded by
+ /// whitespace. Returns the same span if no character could be found or if an error occurred
/// while retrieving the code snippet.
pub fn span_extend_to_prev_str(&self, sp: Span, pat: &str, accept_newlines: bool) -> Span {
// assure that the pattern is delimited, to avoid the following
@@ -643,7 +644,8 @@
sp
}
- /// Given a `Span`, try to get a shorter span ending before the first occurrence of `c` `char`
+ /// Given a `Span`, tries to get a shorter span ending before the first occurrence of `char`
+ /// ``c`.
pub fn span_until_char(&self, sp: Span, c: char) -> Span {
match self.span_to_snippet(sp) {
Ok(snippet) => {
@@ -658,7 +660,7 @@
}
}
- /// Given a `Span`, try to get a shorter span ending just after the first occurrence of `char`
+ /// Given a `Span`, tries to get a shorter span ending just after the first occurrence of `char`
/// `c`.
pub fn span_through_char(&self, sp: Span, c: char) -> Span {
if let Ok(snippet) = self.span_to_snippet(sp) {
@@ -669,8 +671,8 @@
sp
}
- /// Given a `Span`, get a new `Span` covering the first token and all its trailing whitespace or
- /// the original `Span`.
+ /// Given a `Span`, gets a new `Span` covering the first token and all its trailing whitespace
+ /// or the original `Span`.
///
/// If `sp` points to `"let mut x"`, then a span pointing at `"let "` will be returned.
pub fn span_until_non_whitespace(&self, sp: Span) -> Span {
@@ -689,15 +691,15 @@
})
}
- /// Given a `Span`, get a new `Span` covering the first token without its trailing whitespace or
- /// the original `Span` in case of error.
+ /// Given a `Span`, gets a new `Span` covering the first token without its trailing whitespace
+ /// or the original `Span` in case of error.
///
/// If `sp` points to `"let mut x"`, then a span pointing at `"let"` will be returned.
pub fn span_until_whitespace(&self, sp: Span) -> Span {
self.span_take_while(sp, |c| !c.is_whitespace())
}
- /// Given a `Span`, get a shorter one until `predicate` yields false.
+ /// Given a `Span`, gets a shorter one until `predicate` yields `false`.
pub fn span_take_while<P>(&self, sp: Span, predicate: P) -> Span
where P: for <'r> FnMut(&'r char) -> bool
{
@@ -717,7 +719,7 @@
self.span_until_char(sp, '{')
}
- /// Returns a new span representing just the start-point of this span
+ /// Returns a new span representing just the start point of this span.
pub fn start_point(&self, sp: Span) -> Span {
let pos = sp.lo().0;
let width = self.find_width_of_character_at_span(sp, false);
@@ -726,7 +728,7 @@
sp.with_hi(end_point)
}
- /// Returns a new span representing just the end-point of this span
+ /// Returns a new span representing just the end point of this span.
pub fn end_point(&self, sp: Span) -> Span {
let pos = sp.hi().0;
@@ -737,7 +739,7 @@
sp.with_lo(end_point)
}
- /// Returns a new span representing the next character after the end-point of this span
+ /// Returns a new span representing the next character after the end-point of this span.
pub fn next_point(&self, sp: Span) -> Span {
let start_of_next_point = sp.hi().0;
@@ -840,7 +842,7 @@
None
}
- /// For a global BytePos compute the local offset within the containing SourceFile
+ /// For a global `BytePos`, computes the local offset within the containing `SourceFile`.
pub fn lookup_byte_offset(&self, bpos: BytePos) -> SourceFileAndBytePos {
let idx = self.lookup_source_file_idx(bpos);
let sf = (*self.files.borrow().source_files)[idx].clone();
@@ -848,22 +850,22 @@
SourceFileAndBytePos {sf, pos: offset}
}
- /// Converts an absolute BytePos to a CharPos relative to the source_file.
+ /// Converts an absolute `BytePos` to a `CharPos` relative to the `SourceFile`.
pub fn bytepos_to_file_charpos(&self, bpos: BytePos) -> CharPos {
let idx = self.lookup_source_file_idx(bpos);
let map = &(*self.files.borrow().source_files)[idx];
- // The number of extra bytes due to multibyte chars in the SourceFile
+ // The number of extra bytes due to multibyte chars in the `SourceFile`.
let mut total_extra_bytes = 0;
for mbc in map.multibyte_chars.iter() {
debug!("{}-byte char at {:?}", mbc.bytes, mbc.pos);
if mbc.pos < bpos {
- // every character is at least one byte, so we only
+ // Every character is at least one byte, so we only
// count the actual extra bytes.
total_extra_bytes += mbc.bytes as u32 - 1;
// We should never see a byte position in the middle of a
- // character
+ // character.
assert!(bpos.to_u32() >= mbc.pos.to_u32() + mbc.bytes as u32);
} else {
break;
@@ -874,13 +876,13 @@
CharPos(bpos.to_usize() - map.start_pos.to_usize() - total_extra_bytes as usize)
}
- // Return the index of the source_file (in self.files) which contains pos.
+ // Returns the index of the `SourceFile` (in `self.files`) that contains `pos`.
pub fn lookup_source_file_idx(&self, pos: BytePos) -> usize {
let files = self.files.borrow();
let files = &files.source_files;
let count = files.len();
- // Binary search for the source_file.
+ // Binary search for the `SourceFile`.
let mut a = 0;
let mut b = count;
while b - a > 1 {
@@ -911,8 +913,8 @@
}).ok()
}
- /// Take the span of a type parameter in a function signature and try to generate a span for the
- /// function name (with generics) and a new snippet for this span with the pointed type
+ /// Takes the span of a type parameter in a function signature and try to generate a span for
+ /// the function name (with generics) and a new snippet for this span with the pointed type
/// parameter as a new local type parameter.
///
/// For instance:
@@ -928,18 +930,18 @@
///
/// Attention: The method used is very fragile since it essentially duplicates the work of the
/// parser. If you need to use this function or something similar, please consider updating the
- /// source_map functions and this function to something more robust.
+ /// `SourceMap` functions and this function to something more robust.
pub fn generate_local_type_param_snippet(&self, span: Span) -> Option<(Span, String)> {
// Try to extend the span to the previous "fn" keyword to retrieve the function
- // signature
+ // signature.
let sugg_span = self.span_extend_to_prev_str(span, "fn", false);
if sugg_span != span {
if let Ok(snippet) = self.span_to_snippet(sugg_span) {
- // Consume the function name
+ // Consume the function name.
let mut offset = snippet.find(|c: char| !c.is_alphanumeric() && c != '_')
.expect("no label after fn");
- // Consume the generics part of the function signature
+ // Consume the generics part of the function signature.
let mut bracket_counter = 0;
let mut last_char = None;
for c in snippet[offset..].chars() {
@@ -953,11 +955,11 @@
last_char = Some(c);
}
- // Adjust the suggestion span to encompass the function name with its generics
+ // Adjust the suggestion span to encompass the function name with its generics.
let sugg_span = sugg_span.with_hi(BytePos(sugg_span.lo().0 + offset as u32));
// Prepare the new suggested snippet to append the type parameter that triggered
- // the error in the generics of the function signature
+ // the error in the generics of the function signature.
let mut new_snippet = if last_char == Some('>') {
format!("{}, ", &snippet[..(offset - '>'.len_utf8())])
} else {
diff --git a/src/libsyntax/source_map/tests.rs b/src/libsyntax/source_map/tests.rs
index c7b8332..1525433 100644
--- a/src/libsyntax/source_map/tests.rs
+++ b/src/libsyntax/source_map/tests.rs
@@ -4,18 +4,24 @@
fn init_source_map() -> SourceMap {
let sm = SourceMap::new(FilePathMapping::empty());
- sm.new_source_file(PathBuf::from("blork.rs").into(),
- "first line.\nsecond line".to_string());
- sm.new_source_file(PathBuf::from("empty.rs").into(),
- String::new());
- sm.new_source_file(PathBuf::from("blork2.rs").into(),
- "first line.\nsecond line".to_string());
+ sm.new_source_file(
+ PathBuf::from("blork.rs").into(),
+ "first line.\nsecond line".to_string(),
+ );
+ sm.new_source_file(
+ PathBuf::from("empty.rs").into(),
+ String::new(),
+ );
+ sm.new_source_file(
+ PathBuf::from("blork2.rs").into(),
+ "first line.\nsecond line".to_string(),
+ );
sm
}
+/// Tests `lookup_byte_offset`.
#[test]
fn t3() {
- // Test lookup_byte_offset
let sm = init_source_map();
let srcfbp1 = sm.lookup_byte_offset(BytePos(23));
@@ -31,9 +37,9 @@
assert_eq!(srcfbp2.pos, BytePos(0));
}
+/// Tests `bytepos_to_file_charpos`.
#[test]
fn t4() {
- // Test bytepos_to_file_charpos
let sm = init_source_map();
let cp1 = sm.bytepos_to_file_charpos(BytePos(22));
@@ -43,9 +49,9 @@
assert_eq!(cp2, CharPos(0));
}
+/// Tests zero-length `SourceFile`s.
#[test]
fn t5() {
- // Test zero-length source_files.
let sm = init_source_map();
let loc1 = sm.lookup_char_pos(BytePos(22));
@@ -61,7 +67,7 @@
fn init_source_map_mbc() -> SourceMap {
let sm = SourceMap::new(FilePathMapping::empty());
- // € is a three byte utf8 char.
+ // "€" is a three-byte UTF8 char.
sm.new_source_file(PathBuf::from("blork.rs").into(),
"fir€st €€€€ line.\nsecond line".to_string());
sm.new_source_file(PathBuf::from("blork2.rs").into(),
@@ -69,9 +75,9 @@
sm
}
+/// Tests `bytepos_to_file_charpos` in the presence of multi-byte chars.
#[test]
fn t6() {
- // Test bytepos_to_file_charpos in the presence of multi-byte chars
let sm = init_source_map_mbc();
let cp1 = sm.bytepos_to_file_charpos(BytePos(3));
@@ -87,9 +93,9 @@
assert_eq!(cp4, CharPos(15));
}
+/// Test `span_to_lines` for a span ending at the end of a `SourceFile`.
#[test]
fn t7() {
- // Test span_to_lines for a span ending at the end of source_file
let sm = init_source_map();
let span = Span::with_root_ctxt(BytePos(12), BytePos(23));
let file_lines = sm.span_to_lines(span).unwrap();
@@ -110,7 +116,7 @@
Span::with_root_ctxt(BytePos(left_index), BytePos(right_index + 1))
}
-/// Tests span_to_snippet and span_to_lines for a span converting 3
+/// Tests `span_to_snippet` and `span_to_lines` for a span converting 3
/// lines in the middle of a file.
#[test]
fn span_to_snippet_and_lines_spanning_multiple_lines() {
@@ -120,10 +126,10 @@
sm.new_source_file(Path::new("blork.rs").to_owned().into(), inputtext.to_string());
let span = span_from_selection(inputtext, selection);
- // check that we are extracting the text we thought we were extracting
+ // Check that we are extracting the text we thought we were extracting.
assert_eq!(&sm.span_to_snippet(span).unwrap(), "BB\nCCC\nDDDDD");
- // check that span_to_lines gives us the complete result with the lines/cols we expected
+ // Check that span_to_lines gives us the complete result with the lines/cols we expected.
let lines = sm.span_to_lines(span).unwrap();
let expected = vec![
LineInfo { line_index: 1, start_col: CharPos(4), end_col: CharPos(6) },
@@ -133,9 +139,9 @@
assert_eq!(lines.lines, expected);
}
+/// Test span_to_snippet for a span ending at the end of a `SourceFile`.
#[test]
fn t8() {
- // Test span_to_snippet for a span ending at the end of source_file
let sm = init_source_map();
let span = Span::with_root_ctxt(BytePos(12), BytePos(23));
let snippet = sm.span_to_snippet(span);
@@ -143,9 +149,9 @@
assert_eq!(snippet, Ok("second line".to_string()));
}
+/// Test `span_to_str` for a span ending at the end of a `SourceFile`.
#[test]
fn t9() {
- // Test span_to_str for a span ending at the end of source_file
let sm = init_source_map();
let span = Span::with_root_ctxt(BytePos(12), BytePos(23));
let sstr = sm.span_to_string(span);
@@ -153,7 +159,7 @@
assert_eq!(sstr, "blork.rs:2:1: 2:12");
}
-/// Tests failing to merge two spans on different lines
+/// Tests failing to merge two spans on different lines.
#[test]
fn span_merging_fail() {
let sm = SourceMap::new(FilePathMapping::empty());
@@ -167,33 +173,37 @@
assert!(sm.merge_spans(span1, span2).is_none());
}
-/// Returns the span corresponding to the `n`th occurrence of
-/// `substring` in `source_text`.
+/// Returns the span corresponding to the `n`th occurrence of `substring` in `source_text`.
trait SourceMapExtension {
- fn span_substr(&self,
- file: &Lrc<SourceFile>,
- source_text: &str,
- substring: &str,
- n: usize)
- -> Span;
+ fn span_substr(
+ &self,
+ file: &Lrc<SourceFile>,
+ source_text: &str,
+ substring: &str,
+ n: usize,
+ ) -> Span;
}
impl SourceMapExtension for SourceMap {
- fn span_substr(&self,
- file: &Lrc<SourceFile>,
- source_text: &str,
- substring: &str,
- n: usize)
- -> Span
- {
- println!("span_substr(file={:?}/{:?}, substring={:?}, n={})",
- file.name, file.start_pos, substring, n);
+ fn span_substr(
+ &self,
+ file: &Lrc<SourceFile>,
+ source_text: &str,
+ substring: &str,
+ n: usize,
+ ) -> Span {
+ println!(
+ "span_substr(file={:?}/{:?}, substring={:?}, n={})",
+ file.name, file.start_pos, substring, n
+ );
let mut i = 0;
let mut hi = 0;
loop {
let offset = source_text[hi..].find(substring).unwrap_or_else(|| {
- panic!("source_text `{}` does not have {} occurrences of `{}`, only {}",
- source_text, n, substring, i);
+ panic!(
+ "source_text `{}` does not have {} occurrences of `{}`, only {}",
+ source_text, n, substring, i
+ );
});
let lo = hi + offset;
hi = lo + substring.len();
@@ -202,8 +212,7 @@
BytePos(lo as u32 + file.start_pos.0),
BytePos(hi as u32 + file.start_pos.0),
);
- assert_eq!(&self.span_to_snippet(span).unwrap()[..],
- substring);
+ assert_eq!(&self.span_to_snippet(span).unwrap()[..], substring);
return span;
}
i += 1;
diff --git a/src/libsyntax/tests.rs b/src/libsyntax/tests.rs
index 9b90b31..540881b 100644
--- a/src/libsyntax/tests.rs
+++ b/src/libsyntax/tests.rs
@@ -18,7 +18,7 @@
use std::str;
use std::sync::{Arc, Mutex};
-/// Map string to parser (via tts)
+/// Map string to parser (via tts).
fn string_to_parser(ps: &ParseSess, source_str: String) -> Parser<'_> {
new_parser_from_source_str(ps, PathBuf::from("bogofile").into(), source_str)
}
@@ -32,7 +32,7 @@
x
}
-/// Map a string to tts, using a made-up filename:
+/// Maps a string to tts, using a made-up filename.
crate fn string_to_stream(source_str: String) -> TokenStream {
let ps = ParseSess::new(FilePathMapping::empty());
source_file_to_stream(
@@ -42,7 +42,7 @@
), None).0
}
-/// Parse a string, return a crate.
+/// Parses a string, returns a crate.
crate fn string_to_crate(source_str : String) -> ast::Crate {
let ps = ParseSess::new(FilePathMapping::empty());
with_error_checking_parse(source_str, &ps, |p| {
@@ -64,7 +64,7 @@
(None, _) => return false,
(Some(&a), None) => {
if rustc_lexer::is_whitespace(a) {
- break // trailing whitespace check is out of loop for borrowck
+ break // Trailing whitespace check is out of loop for borrowck.
} else {
return false
}
@@ -73,11 +73,11 @@
};
if rustc_lexer::is_whitespace(a) && rustc_lexer::is_whitespace(b) {
- // skip whitespace for a and b
+ // Skip whitespace for `a` and `b`.
scan_for_non_ws_or_end(&mut a_iter);
scan_for_non_ws_or_end(&mut b_iter);
} else if rustc_lexer::is_whitespace(a) {
- // skip whitespace for a
+ // Skip whitespace for `a`.
scan_for_non_ws_or_end(&mut a_iter);
} else if a == b {
a_iter.next();
@@ -87,18 +87,18 @@
}
}
- // check if a has *only* trailing whitespace
+ // Check if a has *only* trailing whitespace.
a_iter.all(rustc_lexer::is_whitespace)
}
-/// Advances the given peekable `Iterator` until it reaches a non-whitespace character
+/// Advances the given peekable `Iterator` until it reaches a non-whitespace character.
fn scan_for_non_ws_or_end<I: Iterator<Item = char>>(iter: &mut Peekable<I>) {
while iter.peek().copied().map(|c| rustc_lexer::is_whitespace(c)) == Some(true) {
iter.next();
}
}
-/// Identify a position in the text by the Nth occurrence of a string.
+/// Identifies a position in the text by the n'th occurrence of a string.
struct Position {
string: &'static str,
count: usize,
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs
index 4805535..d702038 100644
--- a/src/libsyntax/tokenstream.rs
+++ b/src/libsyntax/tokenstream.rs
@@ -6,7 +6,7 @@
//!
//! ## Ownership
//!
-//! `TokenStreams` are persistent data structures constructed as ropes with reference
+//! `TokenStream`s are persistent data structures constructed as ropes with reference
//! counted-children. In general, this means that calling an operation on a `TokenStream`
//! (such as `slice`) produces an entirely new `TokenStream` from the borrowed reference to
//! the original. This essentially coerces `TokenStream`s into 'views' of their subparts,
@@ -147,9 +147,8 @@
}
}
-/// # Token Streams
-///
/// A `TokenStream` is an abstract sequence of tokens, organized into `TokenTree`s.
+///
/// The goal is for procedural macros to work with `TokenStream`s and `TokenTree`s
/// instead of a representation of the abstract syntax tree.
/// Today's `TokenTree`s can still contain AST via `token::Interpolated` for back-compat.
@@ -304,7 +303,7 @@
Cursor::new(self)
}
- /// Compares two TokenStreams, checking equality without regarding span information.
+ /// Compares two `TokenStream`s, checking equality without regarding span information.
pub fn eq_unspanned(&self, other: &TokenStream) -> bool {
let mut t1 = self.trees();
let mut t2 = other.trees();
diff --git a/src/libsyntax/util/parser.rs b/src/libsyntax/util/parser.rs
index a501541..fceaed3 100644
--- a/src/libsyntax/util/parser.rs
+++ b/src/libsyntax/util/parser.rs
@@ -69,7 +69,7 @@
impl AssocOp {
/// Creates a new AssocOP from a token
- pub fn from_token(t: &Token) -> Option<AssocOp> {
+ crate fn from_token(t: &Token) -> Option<AssocOp> {
use AssocOp::*;
match t.kind {
token::BinOpEq(k) => Some(AssignOp(k)),
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index 421c327..d7c537b 100644
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -21,13 +21,13 @@
#[derive(Copy, Clone)]
pub enum FnKind<'a> {
- /// fn foo() or extern "Abi" fn foo()
+ /// E.g., `fn foo()` or `extern "Abi" fn foo()`.
ItemFn(Ident, &'a FnHeader, &'a Visibility, &'a Block),
- /// fn foo(&self)
+ /// E.g., `fn foo(&self)`.
Method(Ident, &'a MethodSig, Option<&'a Visibility>, &'a Block),
- /// |x, y| body
+ /// E.g., `|x, y| body`.
Closure(&'a Expr),
}
@@ -41,7 +41,7 @@
}
}
-/// Each method of the Visitor trait is a hook to be potentially
+/// Each method of the `Visitor` trait is a hook to be potentially
/// overridden. Each method's default implementation recursively visits
/// the substructure of the input via the corresponding `walk` method;
/// e.g., the `visit_mod` method by default calls `visit::walk_mod`.
@@ -302,10 +302,12 @@
walk_list!(visitor, visit_attribute, &item.attrs);
}
-pub fn walk_enum_def<'a, V: Visitor<'a>>(visitor: &mut V,
- enum_definition: &'a EnumDef,
- _: &'a Generics,
- _: NodeId) {
+pub fn walk_enum_def<'a, V: Visitor<'a>>(
+ visitor: &mut V,
+ enum_definition: &'a EnumDef,
+ _: &'a Generics,
+ _: NodeId,
+) {
walk_list!(visitor, visit_variant, &enum_definition.variants);
}
@@ -342,7 +344,6 @@
walk_list!(visitor, visit_lifetime, opt_lifetime);
visitor.visit_ty(&mutable_type.ty)
}
- TyKind::Never | TyKind::CVarArgs => {}
TyKind::Tup(ref tuple_element_types) => {
walk_list!(visitor, visit_ty, tuple_element_types);
}
@@ -371,6 +372,8 @@
TyKind::Mac(ref mac) => {
visitor.visit_mac(mac)
}
+ TyKind::Never |
+ TyKind::CVarArgs => {}
}
}
@@ -386,7 +389,7 @@
visitor.visit_path(&use_tree.prefix, id);
match use_tree.kind {
UseTreeKind::Simple(rename, ..) => {
- // the extra IDs are handled during HIR lowering
+ // The extra IDs are handled during HIR lowering.
if let Some(rename) = rename {
visitor.visit_ident(rename);
}
diff --git a/src/libsyntax_ext/cmdline_attrs.rs b/src/libsyntax_ext/cmdline_attrs.rs
new file mode 100644
index 0000000..bb8e3df
--- /dev/null
+++ b/src/libsyntax_ext/cmdline_attrs.rs
@@ -0,0 +1,30 @@
+//! Attributes injected into the crate root from command line using `-Z crate-attr`.
+
+use syntax::ast::{self, AttrStyle};
+use syntax::attr::mk_attr;
+use syntax::panictry;
+use syntax::parse::{self, token, ParseSess};
+use syntax_pos::FileName;
+
+pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -> ast::Crate {
+ for raw_attr in attrs {
+ let mut parser = parse::new_parser_from_source_str(
+ parse_sess,
+ FileName::cli_crate_attr_source_code(&raw_attr),
+ raw_attr.clone(),
+ );
+
+ let start_span = parser.token.span;
+ let (path, tokens) = panictry!(parser.parse_meta_item_unrestricted());
+ let end_span = parser.token.span;
+ if parser.token != token::Eof {
+ parse_sess.span_diagnostic
+ .span_err(start_span.to(end_span), "invalid crate attribute");
+ continue;
+ }
+
+ krate.attrs.push(mk_attr(AttrStyle::Inner, path, tokens, start_span.to(end_span)));
+ }
+
+ krate
+}
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs
index 893d89f..c53fa7d 100644
--- a/src/libsyntax_ext/deriving/generic/mod.rs
+++ b/src/libsyntax_ext/deriving/generic/mod.rs
@@ -1620,6 +1620,7 @@
id: ast::DUMMY_NODE_ID,
span: pat.span.with_ctxt(self.span.ctxt()),
pat,
+ is_placeholder: false
}
})
.collect();
diff --git a/src/libsyntax_ext/error_codes.rs b/src/libsyntax_ext/error_codes.rs
index 5982a4d..2bc9905 100644
--- a/src/libsyntax_ext/error_codes.rs
+++ b/src/libsyntax_ext/error_codes.rs
@@ -1,9 +1,8 @@
-use syntax::register_long_diagnostics;
-
// Error messages for EXXXX errors.
-// Each message should start and end with a new line, and be wrapped to 80 characters.
-// In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use `:set tw=0` to disable.
-register_long_diagnostics! {
+// Each message should start and end with a new line, and be wrapped to 80
+// characters. In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use
+// `:set tw=0` to disable.
+syntax::register_diagnostics! {
E0660: r##"
The argument to the `asm` macro is not well-formed.
diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs
index e29f12c..dec84c8 100644
--- a/src/libsyntax_ext/format.rs
+++ b/src/libsyntax_ext/format.rs
@@ -291,7 +291,7 @@
&format!(
"{} positional argument{} in format string, but {}",
count,
- if count > 1 { "s" } else { "" },
+ if count != 1 { "s" } else { "" },
self.describe_num_args(),
),
);
diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs
index 26ef80b..631ab7a 100644
--- a/src/libsyntax_ext/lib.rs
+++ b/src/libsyntax_ext/lib.rs
@@ -9,7 +9,6 @@
#![feature(nll)]
#![feature(proc_macro_internals)]
#![feature(proc_macro_quote)]
-#![feature(rustc_diagnostic_macros)]
extern crate proc_macro;
@@ -40,6 +39,7 @@
mod test;
mod trace_macros;
+pub mod cmdline_attrs;
pub mod plugin_macro_defs;
pub mod proc_macro_harness;
pub mod standard_library_imports;
diff --git a/src/libsyntax_ext/plugin_macro_defs.rs b/src/libsyntax_ext/plugin_macro_defs.rs
index dbfd8fe..ccdc5bd 100644
--- a/src/libsyntax_ext/plugin_macro_defs.rs
+++ b/src/libsyntax_ext/plugin_macro_defs.rs
@@ -11,7 +11,7 @@
use syntax::symbol::sym;
use syntax::tokenstream::*;
use syntax_pos::{Span, DUMMY_SP};
-use syntax_pos::hygiene::{ExpnData, ExpnKind, MacroKind};
+use syntax_pos::hygiene::{ExpnData, ExpnKind, AstPass};
use std::mem;
@@ -44,7 +44,7 @@
if !named_exts.is_empty() {
let mut extra_items = Vec::new();
let span = DUMMY_SP.fresh_expansion(ExpnData::allow_unstable(
- ExpnKind::Macro(MacroKind::Attr, sym::plugin), DUMMY_SP, edition,
+ ExpnKind::AstPass(AstPass::PluginMacroDefs), DUMMY_SP, edition,
[sym::rustc_attrs][..].into(),
));
for (name, ext) in named_exts {
diff --git a/src/libsyntax_ext/proc_macro_harness.rs b/src/libsyntax_ext/proc_macro_harness.rs
index e772eaf..31d32d2 100644
--- a/src/libsyntax_ext/proc_macro_harness.rs
+++ b/src/libsyntax_ext/proc_macro_harness.rs
@@ -3,8 +3,7 @@
use smallvec::smallvec;
use syntax::ast::{self, Ident};
use syntax::attr;
-use syntax::source_map::{ExpnData, ExpnKind, respan};
-use syntax::ext::base::{ExtCtxt, MacroKind};
+use syntax::ext::base::ExtCtxt;
use syntax::ext::expand::{AstFragment, ExpansionConfig};
use syntax::ext::proc_macro::is_proc_macro_attr;
use syntax::parse::ParseSess;
@@ -12,6 +11,7 @@
use syntax::symbol::{kw, sym};
use syntax::visit::{self, Visitor};
use syntax_pos::{Span, DUMMY_SP};
+use syntax_pos::hygiene::AstPass;
struct ProcMacroDerive {
trait_name: ast::Name,
@@ -308,8 +308,7 @@
// Creates a new module which looks like:
//
-// #[doc(hidden)]
-// mod $gensym {
+// const _: () = {
// extern crate proc_macro;
//
// use proc_macro::bridge::client::ProcMacro;
@@ -327,32 +326,30 @@
custom_attrs: &[ProcMacroDef],
custom_macros: &[ProcMacroDef],
) -> P<ast::Item> {
- let span = DUMMY_SP.fresh_expansion(ExpnData::allow_unstable(
- ExpnKind::Macro(MacroKind::Attr, sym::proc_macro), DUMMY_SP, cx.parse_sess.edition,
- [sym::rustc_attrs, sym::proc_macro_internals][..].into(),
- ));
+ let expn_id = cx.resolver.expansion_for_ast_pass(
+ DUMMY_SP,
+ AstPass::ProcMacroHarness,
+ &[sym::rustc_attrs, sym::proc_macro_internals],
+ None,
+ );
+ let span = DUMMY_SP.with_def_site_ctxt(expn_id);
- let hidden = cx.meta_list_item_word(span, sym::hidden);
- let doc = cx.meta_list(span, sym::doc, vec![hidden]);
- let doc_hidden = cx.attribute(doc);
-
- let proc_macro = Ident::with_dummy_span(sym::proc_macro);
+ let proc_macro = Ident::new(sym::proc_macro, span);
let krate = cx.item(span,
proc_macro,
Vec::new(),
ast::ItemKind::ExternCrate(None));
- let bridge = Ident::from_str("bridge");
- let client = Ident::from_str("client");
- let proc_macro_ty = Ident::from_str("ProcMacro");
- let custom_derive = Ident::from_str("custom_derive");
- let attr = Ident::from_str("attr");
- let bang = Ident::from_str("bang");
- let crate_kw = Ident::with_dummy_span(kw::Crate);
+ let bridge = Ident::from_str_and_span("bridge", span);
+ let client = Ident::from_str_and_span("client", span);
+ let proc_macro_ty = Ident::from_str_and_span("ProcMacro", span);
+ let custom_derive = Ident::from_str_and_span("custom_derive", span);
+ let attr = Ident::from_str_and_span("attr", span);
+ let bang = Ident::from_str_and_span("bang", span);
let decls = {
let local_path = |sp: Span, name| {
- cx.expr_path(cx.path(sp.with_ctxt(span.ctxt()), vec![crate_kw, name]))
+ cx.expr_path(cx.path(sp.with_ctxt(span.ctxt()), vec![name]))
};
let proc_macro_ty_method_path = |method| cx.expr_path(cx.path(span, vec![
proc_macro, bridge, client, proc_macro_ty, method,
@@ -381,7 +378,7 @@
let decls_static = cx.item_static(
span,
- Ident::from_str("_DECLS"),
+ Ident::from_str_and_span("_DECLS", span),
cx.ty_rptr(span,
cx.ty(span, ast::TyKind::Slice(
cx.ty_path(cx.path(span,
@@ -392,22 +389,22 @@
).map(|mut i| {
let attr = cx.meta_word(span, sym::rustc_proc_macro_decls);
i.attrs.push(cx.attribute(attr));
- i.vis = respan(span, ast::VisibilityKind::Public);
i
});
- let module = cx.item_mod(
+ let block = cx.expr_block(cx.block(
span,
- span,
- ast::Ident::from_str("decls").gensym(),
- vec![doc_hidden],
- vec![krate, decls_static],
- ).map(|mut i| {
- i.vis = respan(span, ast::VisibilityKind::Public);
- i
- });
+ vec![cx.stmt_item(span, krate), cx.stmt_item(span, decls_static)],
+ ));
- // Integrate the new module into existing module structures.
- let module = AstFragment::Items(smallvec![module]);
- cx.monotonic_expander().fully_expand_fragment(module).make_items().pop().unwrap()
+ let anon_constant = cx.item_const(
+ span,
+ ast::Ident::new(kw::Underscore, span),
+ cx.ty(span, ast::TyKind::Tup(Vec::new())),
+ block,
+ );
+
+ // Integrate the new item into existing module structures.
+ let items = AstFragment::Items(smallvec![anon_constant]);
+ cx.monotonic_expander().fully_expand_fragment(items).make_items().pop().unwrap()
}
diff --git a/src/libsyntax_ext/standard_library_imports.rs b/src/libsyntax_ext/standard_library_imports.rs
index 8ca3763..c577b1e 100644
--- a/src/libsyntax_ext/standard_library_imports.rs
+++ b/src/libsyntax_ext/standard_library_imports.rs
@@ -1,86 +1,86 @@
use syntax::{ast, attr};
use syntax::edition::Edition;
-use syntax::ext::hygiene::MacroKind;
+use syntax::ext::expand::ExpansionConfig;
+use syntax::ext::hygiene::AstPass;
+use syntax::ext::base::{ExtCtxt, Resolver};
+use syntax::parse::ParseSess;
use syntax::ptr::P;
-use syntax::source_map::{ExpnData, ExpnKind, dummy_spanned, respan};
use syntax::symbol::{Ident, Symbol, kw, sym};
use syntax_pos::DUMMY_SP;
-use std::iter;
-
pub fn inject(
- mut krate: ast::Crate, alt_std_name: Option<&str>, edition: Edition
+ mut krate: ast::Crate,
+ resolver: &mut dyn Resolver,
+ sess: &ParseSess,
+ alt_std_name: Option<Symbol>,
) -> (ast::Crate, Option<Symbol>) {
- let rust_2018 = edition >= Edition::Edition2018;
+ let rust_2018 = sess.edition >= Edition::Edition2018;
// the first name in this list is the crate name of the crate with the prelude
- let names: &[&str] = if attr::contains_name(&krate.attrs, sym::no_core) {
+ let names: &[Symbol] = if attr::contains_name(&krate.attrs, sym::no_core) {
return (krate, None);
} else if attr::contains_name(&krate.attrs, sym::no_std) {
if attr::contains_name(&krate.attrs, sym::compiler_builtins) {
- &["core"]
+ &[sym::core]
} else {
- &["core", "compiler_builtins"]
+ &[sym::core, sym::compiler_builtins]
}
} else {
- &["std"]
+ &[sym::std]
};
+ let expn_id = resolver.expansion_for_ast_pass(
+ DUMMY_SP,
+ AstPass::StdImports,
+ &[sym::prelude_import],
+ None,
+ );
+ let span = DUMMY_SP.with_def_site_ctxt(expn_id);
+ let call_site = DUMMY_SP.with_call_site_ctxt(expn_id);
+
+ let ecfg = ExpansionConfig::default("std_lib_injection".to_string());
+ let cx = ExtCtxt::new(sess, ecfg, resolver);
+
+
// .rev() to preserve ordering above in combination with insert(0, ...)
- let alt_std_name = alt_std_name.map(Symbol::intern);
- for orig_name_str in names.iter().rev() {
- // HACK(eddyb) gensym the injected crates on the Rust 2018 edition,
- // so they don't accidentally interfere with the new import paths.
- let orig_name_sym = Symbol::intern(orig_name_str);
- let orig_name_ident = Ident::with_dummy_span(orig_name_sym);
- let (rename, orig_name) = if rust_2018 {
- (orig_name_ident.gensym(), Some(orig_name_sym))
+ for &name in names.iter().rev() {
+ let ident = if rust_2018 {
+ Ident::new(name, span)
} else {
- (orig_name_ident, None)
+ Ident::new(name, call_site)
};
- krate.module.items.insert(0, P(ast::Item {
- attrs: vec![attr::mk_attr_outer(
- attr::mk_word_item(ast::Ident::with_dummy_span(sym::macro_use))
- )],
- vis: dummy_spanned(ast::VisibilityKind::Inherited),
- node: ast::ItemKind::ExternCrate(alt_std_name.or(orig_name)),
- ident: rename,
- id: ast::DUMMY_NODE_ID,
- span: DUMMY_SP,
- tokens: None,
- }));
+ krate.module.items.insert(0, cx.item(
+ span,
+ ident,
+ vec![cx.attribute(cx.meta_word(span, sym::macro_use))],
+ ast::ItemKind::ExternCrate(alt_std_name),
+ ));
}
- // the crates have been injected, the assumption is that the first one is the one with
- // the prelude.
+ // The crates have been injected, the assumption is that the first one is
+ // the one with the prelude.
let name = names[0];
- let span = DUMMY_SP.fresh_expansion(ExpnData::allow_unstable(
- ExpnKind::Macro(MacroKind::Attr, sym::std_inject), DUMMY_SP, edition,
- [sym::prelude_import][..].into(),
- ));
+ let import_path = if rust_2018 {
+ [name, sym::prelude, sym::v1].iter()
+ .map(|symbol| ast::Ident::new(*symbol, span)).collect()
+ } else {
+ [kw::PathRoot, name, sym::prelude, sym::v1].iter()
+ .map(|symbol| ast::Ident::new(*symbol, span)).collect()
+ };
- krate.module.items.insert(0, P(ast::Item {
- attrs: vec![attr::mk_attr_outer(
- attr::mk_word_item(ast::Ident::new(sym::prelude_import, span)))],
- vis: respan(span.shrink_to_lo(), ast::VisibilityKind::Inherited),
- node: ast::ItemKind::Use(P(ast::UseTree {
- prefix: ast::Path {
- segments: iter::once(ast::Ident::with_dummy_span(kw::PathRoot))
- .chain(
- [name, "prelude", "v1"].iter().cloned()
- .map(ast::Ident::from_str)
- ).map(ast::PathSegment::from_ident).collect(),
- span,
- },
+ let use_item = cx.item(
+ span,
+ ast::Ident::invalid(),
+ vec![cx.attribute(cx.meta_word(span, sym::prelude_import))],
+ ast::ItemKind::Use(P(ast::UseTree {
+ prefix: cx.path(span, import_path),
kind: ast::UseTreeKind::Glob,
span,
})),
- id: ast::DUMMY_NODE_ID,
- ident: ast::Ident::invalid(),
- span,
- tokens: None,
- }));
+ );
- (krate, Some(Symbol::intern(name)))
+ krate.module.items.insert(0, use_item);
+
+ (krate, Some(name))
}
diff --git a/src/libsyntax_ext/test.rs b/src/libsyntax_ext/test.rs
index 5fd87d3..be5aca7 100644
--- a/src/libsyntax_ext/test.rs
+++ b/src/libsyntax_ext/test.rs
@@ -28,11 +28,11 @@
if !ecx.ecfg.should_test { return vec![]; }
- let sp = ecx.with_legacy_ctxt(attr_sp);
+ let sp = ecx.with_def_site_ctxt(attr_sp);
let mut item = anno_item.expect_item();
item = item.map(|mut item| {
item.vis = respan(item.vis.span, ast::VisibilityKind::Public);
- item.ident = item.ident.gensym();
+ item.ident.span = item.ident.span.with_ctxt(sp.ctxt());
item.attrs.push(
ecx.attribute(ecx.meta_word(sp, sym::rustc_test_marker))
);
@@ -92,10 +92,9 @@
return vec![Annotatable::Item(item)];
}
- let (sp, attr_sp) = (cx.with_legacy_ctxt(item.span), cx.with_legacy_ctxt(attr_sp));
+ let (sp, attr_sp) = (cx.with_def_site_ctxt(item.span), cx.with_def_site_ctxt(attr_sp));
- // Gensym "test" so we can extern crate without conflicting with any local names
- let test_id = cx.ident_of("test").gensym();
+ let test_id = ast::Ident::new(sym::test, attr_sp);
// creates test::$name
let test_path = |name| {
@@ -112,7 +111,7 @@
let test_fn = if is_bench {
// A simple ident for a lambda
- let b = cx.ident_of("b");
+ let b = ast::Ident::from_str_and_span("b", attr_sp);
cx.expr_call(sp, cx.expr_path(test_path("StaticBenchFn")), vec![
// |b| self::test::assert_test_result(
@@ -143,7 +142,7 @@
])
};
- let mut test_const = cx.item(sp, ast::Ident::new(item.ident.name, sp).gensym(),
+ let mut test_const = cx.item(sp, ast::Ident::new(item.ident.name, sp),
vec![
// #[cfg(test)]
cx.attribute(cx.meta_list(attr_sp, sym::cfg, vec![
@@ -192,17 +191,17 @@
));
test_const = test_const.map(|mut tc| { tc.vis.node = ast::VisibilityKind::Public; tc});
- // extern crate test as test_gensym
+ // extern crate test
let test_extern = cx.item(sp,
test_id,
vec![],
- ast::ItemKind::ExternCrate(Some(sym::test))
+ ast::ItemKind::ExternCrate(None)
);
log::debug!("synthetic test item:\n{}\n", pprust::item_to_string(&test_const));
vec![
- // Access to libtest under a gensymed name
+ // Access to libtest under a hygienic name
Annotatable::Item(test_extern),
// The generated test case
Annotatable::Item(test_const),
diff --git a/src/libsyntax_ext/test_harness.rs b/src/libsyntax_ext/test_harness.rs
index 4a6ea0e..b93c11f 100644
--- a/src/libsyntax_ext/test_harness.rs
+++ b/src/libsyntax_ext/test_harness.rs
@@ -5,32 +5,30 @@
use syntax::ast::{self, Ident};
use syntax::attr;
use syntax::entry::{self, EntryPointType};
-use syntax::ext::base::{ExtCtxt, MacroKind, Resolver};
+use syntax::ext::base::{ExtCtxt, Resolver};
use syntax::ext::expand::{AstFragment, ExpansionConfig};
use syntax::feature_gate::Features;
use syntax::mut_visit::{*, ExpectOne};
use syntax::parse::ParseSess;
use syntax::ptr::P;
-use syntax::source_map::{ExpnData, ExpnKind, dummy_spanned};
-use syntax::symbol::{kw, sym, Symbol};
+use syntax::source_map::respan;
+use syntax::symbol::{sym, Symbol};
use syntax_pos::{Span, DUMMY_SP};
+use syntax_pos::hygiene::{AstPass, SyntaxContext, Transparency};
use std::{iter, mem};
struct Test {
span: Span,
- path: Vec<Ident>,
+ ident: Ident,
}
struct TestCtxt<'a> {
- span_diagnostic: &'a errors::Handler,
- path: Vec<Ident>,
ext_cx: ExtCtxt<'a>,
+ def_site: Span,
test_cases: Vec<Test>,
reexport_test_harness_main: Option<Symbol>,
test_runner: Option<ast::Path>,
- // top-level re-export submodule, filled out after folding is finished
- toplevel_reexport: Option<Ident>,
}
// Traverse the crate, collecting all the test functions, eliding any
@@ -43,8 +41,8 @@
span_diagnostic: &errors::Handler,
features: &Features,
) {
- // Check for #[reexport_test_harness_main = "some_name"] which
- // creates a `use __test::main as some_name;`. This needs to be
+ // Check for #![reexport_test_harness_main = "some_name"] which gives the
+ // main test function the name `some_name` without hygiene. This needs to be
// unconditional, so that the attribute is still marked as used in
// non-test builds.
let reexport_test_harness_main =
@@ -56,16 +54,13 @@
if should_test {
generate_test_harness(sess, resolver, reexport_test_harness_main,
- krate, span_diagnostic, features, test_runner)
+ krate, features, test_runner)
}
}
struct TestHarnessGenerator<'a> {
cx: TestCtxt<'a>,
- tests: Vec<Ident>,
-
- // submodule name, gensym'd identifier for re-exports
- tested_submods: Vec<(Ident, Ident)>,
+ tests: Vec<Test>,
}
impl<'a> MutVisitor for TestHarnessGenerator<'a> {
@@ -77,49 +72,47 @@
}
fn flat_map_item(&mut self, i: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
- let ident = i.ident;
- if ident.name != kw::Invalid {
- self.cx.path.push(ident);
- }
- debug!("current path: {}", path_name_i(&self.cx.path));
-
let mut item = i.into_inner();
if is_test_case(&item) {
debug!("this is a test item");
let test = Test {
span: item.span,
- path: self.cx.path.clone(),
+ ident: item.ident,
};
- self.cx.test_cases.push(test);
- self.tests.push(item.ident);
+ self.tests.push(test);
}
// We don't want to recurse into anything other than mods, since
// mods or tests inside of functions will break things
if let ast::ItemKind::Mod(mut module) = item.node {
let tests = mem::take(&mut self.tests);
- let tested_submods = mem::take(&mut self.tested_submods);
noop_visit_mod(&mut module, self);
- let tests = mem::replace(&mut self.tests, tests);
- let tested_submods = mem::replace(&mut self.tested_submods, tested_submods);
+ let mut tests = mem::replace(&mut self.tests, tests);
- if !tests.is_empty() || !tested_submods.is_empty() {
- let (it, sym) = mk_reexport_mod(&mut self.cx, item.id, tests, tested_submods);
- module.items.push(it);
-
- if !self.cx.path.is_empty() {
- self.tested_submods.push((self.cx.path[self.cx.path.len()-1], sym));
+ if !tests.is_empty() {
+ let parent = if item.id == ast::DUMMY_NODE_ID {
+ ast::CRATE_NODE_ID
} else {
- debug!("pushing nothing, sym: {:?}", sym);
- self.cx.toplevel_reexport = Some(sym);
+ item.id
+ };
+ // Create an identifier that will hygienically resolve the test
+ // case name, even in another module.
+ let expn_id = self.cx.ext_cx.resolver.expansion_for_ast_pass(
+ module.inner,
+ AstPass::TestHarness,
+ &[],
+ Some(parent),
+ );
+ for test in &mut tests {
+ // See the comment on `mk_main` for why we're using
+ // `apply_mark` directly.
+ test.ident.span = test.ident.span.apply_mark(expn_id, Transparency::Opaque);
}
+ self.cx.test_cases.extend(tests);
}
item.node = ast::ItemKind::Mod(module);
}
- if ident.name != kw::Invalid {
- self.cx.path.pop();
- }
smallvec![P(item)]
}
@@ -133,6 +126,7 @@
struct EntryPointCleaner {
// Current depth in the ast
depth: usize,
+ def_site: Span,
}
impl MutVisitor for EntryPointCleaner {
@@ -149,8 +143,10 @@
EntryPointType::MainAttr |
EntryPointType::Start =>
item.map(|ast::Item {id, ident, attrs, node, vis, span, tokens}| {
- let allow_ident = Ident::with_dummy_span(sym::allow);
- let dc_nested = attr::mk_nested_word_item(Ident::from_str("dead_code"));
+ let allow_ident = Ident::new(sym::allow, self.def_site);
+ let dc_nested = attr::mk_nested_word_item(
+ Ident::from_str_and_span("dead_code", self.def_site),
+ );
let allow_dead_code_item = attr::mk_list_item(allow_ident, vec![dc_nested]);
let allow_dead_code = attr::mk_attr_outer(allow_dead_code_item);
@@ -181,124 +177,99 @@
}
}
-/// Creates an item (specifically a module) that "pub use"s the tests passed in.
-/// Each tested submodule will contain a similar reexport module that we will export
-/// under the name of the original module. That is, `submod::__test_reexports` is
-/// reexported like so `pub use submod::__test_reexports as submod`.
-fn mk_reexport_mod(cx: &mut TestCtxt<'_>,
- parent: ast::NodeId,
- tests: Vec<Ident>,
- tested_submods: Vec<(Ident, Ident)>)
- -> (P<ast::Item>, Ident) {
- let super_ = Ident::with_dummy_span(kw::Super);
-
- let items = tests.into_iter().map(|r| {
- cx.ext_cx.item_use_simple(DUMMY_SP, dummy_spanned(ast::VisibilityKind::Public),
- cx.ext_cx.path(DUMMY_SP, vec![super_, r]))
- }).chain(tested_submods.into_iter().map(|(r, sym)| {
- let path = cx.ext_cx.path(DUMMY_SP, vec![super_, r, sym]);
- cx.ext_cx.item_use_simple_(DUMMY_SP, dummy_spanned(ast::VisibilityKind::Public),
- Some(r), path)
- })).collect();
-
- let reexport_mod = ast::Mod {
- inline: true,
- inner: DUMMY_SP,
- items,
- };
-
- let name = Ident::from_str("__test_reexports").gensym();
- let parent = if parent == ast::DUMMY_NODE_ID { ast::CRATE_NODE_ID } else { parent };
- cx.ext_cx.current_expansion.id = cx.ext_cx.resolver.get_module_scope(parent);
- let module = P(ast::Item {
- ident: name,
- attrs: Vec::new(),
- id: ast::DUMMY_NODE_ID,
- node: ast::ItemKind::Mod(reexport_mod),
- vis: dummy_spanned(ast::VisibilityKind::Public),
- span: DUMMY_SP,
- tokens: None,
- });
-
- // Integrate the new module into existing module structures.
- let module = AstFragment::Items(smallvec![module]);
- let module =
- cx.ext_cx.monotonic_expander().fully_expand_fragment(module).make_items().pop().unwrap();
-
- (module, name)
-}
-
/// Crawl over the crate, inserting test reexports and the test main function
fn generate_test_harness(sess: &ParseSess,
resolver: &mut dyn Resolver,
reexport_test_harness_main: Option<Symbol>,
krate: &mut ast::Crate,
- sd: &errors::Handler,
features: &Features,
test_runner: Option<ast::Path>) {
- // Remove the entry points
- let mut cleaner = EntryPointCleaner { depth: 0 };
- cleaner.visit_crate(krate);
-
let mut econfig = ExpansionConfig::default("test".to_string());
econfig.features = Some(features);
+ let ext_cx = ExtCtxt::new(sess, econfig, resolver);
+
+ let expn_id = ext_cx.resolver.expansion_for_ast_pass(
+ DUMMY_SP,
+ AstPass::TestHarness,
+ &[sym::main, sym::test, sym::rustc_attrs],
+ None,
+ );
+ let def_site = DUMMY_SP.with_def_site_ctxt(expn_id);
+
+ // Remove the entry points
+ let mut cleaner = EntryPointCleaner { depth: 0, def_site };
+ cleaner.visit_crate(krate);
+
let cx = TestCtxt {
- span_diagnostic: sd,
- ext_cx: ExtCtxt::new(sess, econfig, resolver),
- path: Vec::new(),
+ ext_cx,
+ def_site,
test_cases: Vec::new(),
reexport_test_harness_main,
- toplevel_reexport: None,
test_runner
};
TestHarnessGenerator {
cx,
tests: Vec::new(),
- tested_submods: Vec::new(),
}.visit_crate(krate);
}
/// Creates a function item for use as the main function of a test build.
/// This function will call the `test_runner` as specified by the crate attribute
+///
+/// By default this expands to
+///
+/// #[main]
+/// pub fn main() {
+/// extern crate test;
+/// test::test_main_static(&[
+/// &test_const1,
+/// &test_const2,
+/// &test_const3,
+/// ]);
+/// }
+///
+/// Most of the Ident have the usual def-site hygiene for the AST pass. The
+/// exception is the `test_const`s. These have a syntax context that has two
+/// opaque marks: one from the expansion of `test` or `test_case`, and one
+/// generated in `TestHarnessGenerator::flat_map_item`. When resolving this
+/// identifier after failing to find a matching identifier in the root module
+/// we remove the outer mark, and try resolving at its def-site, which will
+/// then resolve to `test_const`.
+///
+/// The expansion here can be controlled by two attributes:
+///
+/// `reexport_test_harness_main` provides a different name for the `main`
+/// function and `test_runner` provides a path that replaces
+/// `test::test_main_static`.
fn mk_main(cx: &mut TestCtxt<'_>) -> P<ast::Item> {
- // Writing this out by hand:
- // pub fn main() {
- // #![main]
- // test::test_main_static(&[..tests]);
- // }
- let sp = DUMMY_SP.fresh_expansion(ExpnData::allow_unstable(
- ExpnKind::Macro(MacroKind::Attr, sym::test_case), DUMMY_SP, cx.ext_cx.parse_sess.edition,
- [sym::main, sym::test, sym::rustc_attrs][..].into(),
- ));
+ let sp = cx.def_site;
let ecx = &cx.ext_cx;
- let test_id = Ident::with_dummy_span(sym::test);
+ let test_id = Ident::new(sym::test, sp);
// test::test_main_static(...)
let mut test_runner = cx.test_runner.clone().unwrap_or(
- ecx.path(sp, vec![
- test_id, ecx.ident_of("test_main_static")
- ]));
+ ecx.path(sp, vec![test_id, Ident::from_str_and_span("test_main_static", sp)]));
test_runner.span = sp;
let test_main_path_expr = ecx.expr_path(test_runner);
let call_test_main = ecx.expr_call(sp, test_main_path_expr,
- vec![mk_tests_slice(cx)]);
+ vec![mk_tests_slice(cx, sp)]);
let call_test_main = ecx.stmt_expr(call_test_main);
- // #![main]
- let main_meta = ecx.meta_word(sp, sym::main);
- let main_attr = ecx.attribute(main_meta);
-
- // extern crate test as test_gensym
+ // extern crate test
let test_extern_stmt = ecx.stmt_item(sp, ecx.item(sp,
test_id,
vec![],
ast::ItemKind::ExternCrate(None)
));
+ // #[main]
+ let main_meta = ecx.meta_word(sp, sym::main);
+ let main_attr = ecx.attribute(main_meta);
+
// pub fn main() { ... }
let main_ret_ty = ecx.ty(sp, ast::TyKind::Tup(vec![]));
@@ -316,8 +287,8 @@
// Honor the reexport_test_harness_main attribute
let main_id = match cx.reexport_test_harness_main {
- Some(sym) => Ident::new(sym, sp),
- None => Ident::from_str_and_span("main", sp).gensym(),
+ Some(sym) => Ident::new(sym, sp.with_ctxt(SyntaxContext::root())),
+ None => Ident::from_str_and_span("main", sp),
};
let main = P(ast::Item {
@@ -325,7 +296,7 @@
attrs: vec![main_attr],
id: ast::DUMMY_NODE_ID,
node: main,
- vis: dummy_spanned(ast::VisibilityKind::Public),
+ vis: respan(sp, ast::VisibilityKind::Public),
span: sp,
tokens: None,
});
@@ -335,44 +306,20 @@
cx.ext_cx.monotonic_expander().fully_expand_fragment(main).make_items().pop().unwrap()
}
-fn path_name_i(idents: &[Ident]) -> String {
- let mut path_name = "".to_string();
- let mut idents_iter = idents.iter().peekable();
- while let Some(ident) = idents_iter.next() {
- path_name.push_str(&ident.as_str());
- if idents_iter.peek().is_some() {
- path_name.push_str("::")
- }
- }
- path_name
-}
-
/// Creates a slice containing every test like so:
-/// &[path::to::test1, path::to::test2]
-fn mk_tests_slice(cx: &TestCtxt<'_>) -> P<ast::Expr> {
+/// &[&test1, &test2]
+fn mk_tests_slice(cx: &TestCtxt<'_>, sp: Span) -> P<ast::Expr> {
debug!("building test vector from {} tests", cx.test_cases.len());
let ref ecx = cx.ext_cx;
- ecx.expr_vec_slice(DUMMY_SP,
+
+ ecx.expr_vec_slice(sp,
cx.test_cases.iter().map(|test| {
ecx.expr_addr_of(test.span,
- ecx.expr_path(ecx.path(test.span, visible_path(cx, &test.path))))
+ ecx.expr_path(ecx.path(test.span, vec![test.ident])))
}).collect())
}
-/// Creates a path from the top-level __test module to the test via __test_reexports
-fn visible_path(cx: &TestCtxt<'_>, path: &[Ident]) -> Vec<Ident>{
- let mut visible_path = vec![];
- match cx.toplevel_reexport {
- Some(id) => visible_path.push(id),
- None => {
- cx.span_diagnostic.bug("expected to find top-level re-export name, but found None");
- }
- }
- visible_path.extend_from_slice(path);
- visible_path
-}
-
fn is_test_case(i: &ast::Item) -> bool {
attr::contains_name(&i.attrs, sym::rustc_test_marker)
}
diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs
index 733f6f0..f0e7344 100644
--- a/src/libsyntax_pos/hygiene.rs
+++ b/src/libsyntax_pos/hygiene.rs
@@ -360,7 +360,7 @@
}
/// Extend a syntax context with a given expansion and transparency.
- pub fn apply_mark(self, expn_id: ExpnId, transparency: Transparency) -> SyntaxContext {
+ crate fn apply_mark(self, expn_id: ExpnId, transparency: Transparency) -> SyntaxContext {
HygieneData::with(|data| data.apply_mark(self, expn_id, transparency))
}
@@ -550,7 +550,7 @@
/// The returned span belongs to the created expansion and has the new properties,
/// but its location is inherited from the current span.
pub fn fresh_expansion(self, expn_data: ExpnData) -> Span {
- self.fresh_expansion_with_transparency(expn_data, Transparency::SemiTransparent)
+ self.fresh_expansion_with_transparency(expn_data, Transparency::Transparent)
}
pub fn fresh_expansion_with_transparency(
@@ -639,8 +639,9 @@
/// No expansion, aka root expansion. Only `ExpnId::root()` has this kind.
Root,
/// Expansion produced by a macro.
- /// FIXME: Some code injected by the compiler before HIR lowering also gets this kind.
Macro(MacroKind, Symbol),
+ /// Transform done by the compiler on the AST.
+ AstPass(AstPass),
/// Desugaring done by the compiler during HIR lowering.
Desugaring(DesugaringKind)
}
@@ -650,6 +651,7 @@
match *self {
ExpnKind::Root => kw::PathRoot,
ExpnKind::Macro(_, descr) => descr,
+ ExpnKind::AstPass(kind) => Symbol::intern(kind.descr()),
ExpnKind::Desugaring(kind) => Symbol::intern(kind.descr()),
}
}
@@ -683,6 +685,26 @@
}
}
+/// The kind of AST transform.
+#[derive(Clone, Copy, PartialEq, Debug, RustcEncodable, RustcDecodable)]
+pub enum AstPass {
+ StdImports,
+ TestHarness,
+ ProcMacroHarness,
+ PluginMacroDefs,
+}
+
+impl AstPass {
+ fn descr(self) -> &'static str {
+ match self {
+ AstPass::StdImports => "standard library imports",
+ AstPass::TestHarness => "test harness",
+ AstPass::ProcMacroHarness => "proc macro harness",
+ AstPass::PluginMacroDefs => "plugin macro definitions",
+ }
+ }
+}
+
/// The kind of compiler desugaring.
#[derive(Clone, Copy, PartialEq, Debug, RustcEncodable, RustcDecodable)]
pub enum DesugaringKind {
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs
index 3d8bfc7..9a296f1 100644
--- a/src/libsyntax_pos/lib.rs
+++ b/src/libsyntax_pos/lib.rs
@@ -442,6 +442,7 @@
let (pre, post) = match expn_data.kind {
ExpnKind::Root => break,
ExpnKind::Desugaring(..) => ("desugaring of ", ""),
+ ExpnKind::AstPass(..) => ("", ""),
ExpnKind::Macro(macro_kind, _) => match macro_kind {
MacroKind::Bang => ("", "!"),
MacroKind::Attr => ("#[", "]"),
@@ -513,6 +514,25 @@
span.ctxt)
}
+ /// Equivalent of `Span::def_site` from the proc macro API,
+ /// except that the location is taken from the `self` span.
+ pub fn with_def_site_ctxt(self, expn_id: ExpnId) -> Span {
+ self.with_ctxt_from_mark(expn_id, Transparency::Opaque)
+ }
+
+ /// Equivalent of `Span::call_site` from the proc macro API,
+ /// except that the location is taken from the `self` span.
+ pub fn with_call_site_ctxt(&self, expn_id: ExpnId) -> Span {
+ self.with_ctxt_from_mark(expn_id, Transparency::Transparent)
+ }
+
+ /// Span with a context reproducing `macro_rules` hygiene (hygienic locals, unhygienic items).
+ /// FIXME: This should be eventually replaced either with `with_def_site_ctxt` (preferably),
+ /// or with `with_call_site_ctxt` (where necessary).
+ pub fn with_legacy_ctxt(&self, expn_id: ExpnId) -> Span {
+ self.with_ctxt_from_mark(expn_id, Transparency::SemiTransparent)
+ }
+
/// Produces a span with the same location as `self` and context produced by a macro with the
/// given ID and transparency, assuming that macro was defined directly and not produced by
/// some other macro (which is the case for built-in and procedural macros).
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index 3a4dc1f..ab32d44 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -626,6 +626,7 @@
size,
slice_patterns,
slicing_syntax,
+ soft,
Some,
specialization,
speed,
@@ -801,21 +802,15 @@
Ident::new(self.name, self.span.modern_and_legacy())
}
- /// Transforms an identifier into one with the same name, but gensymed.
- pub fn gensym(self) -> Ident {
- let name = with_interner(|interner| interner.gensymed(self.name));
- Ident::new(name, self.span)
- }
-
/// Transforms an underscore identifier into one with the same name, but
/// gensymed. Leaves non-underscore identifiers unchanged.
pub fn gensym_if_underscore(self) -> Ident {
- if self.name == kw::Underscore { self.gensym() } else { self }
- }
-
- // WARNING: this function is deprecated and will be removed in the future.
- pub fn is_gensymed(self) -> bool {
- with_interner(|interner| interner.is_gensymed(self.name))
+ if self.name == kw::Underscore {
+ let name = with_interner(|interner| interner.gensymed(self.name));
+ Ident::new(name, self.span)
+ } else {
+ self
+ }
}
/// Convert the name to a `LocalInternedString`. This is a slowish
@@ -892,9 +887,12 @@
///
/// Examples:
/// ```
-/// assert_eq!(Ident::from_str("x"), Ident::from_str("x"))
-/// assert_ne!(Ident::from_str("x").gensym(), Ident::from_str("x"))
-/// assert_ne!(Ident::from_str("x").gensym(), Ident::from_str("x").gensym())
+/// assert_eq!(Ident::from_str("_"), Ident::from_str("_"))
+/// assert_ne!(Ident::from_str("_").gensym_if_underscore(), Ident::from_str("_"))
+/// assert_ne!(
+/// Ident::from_str("_").gensym_if_underscore(),
+/// Ident::from_str("_").gensym_if_underscore(),
+/// )
/// ```
/// Internally, a symbol is implemented as an index, and all operations
/// (including hashing, equality, and ordering) operate on that index. The use
diff --git a/src/llvm-project b/src/llvm-project
index 48818e9..71fe7ec 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 48818e9f5d0f2d5978a9b43ad1a2e8d0b83f6aa0
+Subproject commit 71fe7ec06b85f612fc0e4eb4134c7a7d0f23fac5
diff --git a/src/test/codegen/c-variadic.rs b/src/test/codegen/c-variadic.rs
index bb90a96..2acf95d 100644
--- a/src/test/codegen/c-variadic.rs
+++ b/src/test/codegen/c-variadic.rs
@@ -1,4 +1,5 @@
// compile-flags: -C no-prepopulate-passes
+// ignore-tidy-linelength
#![crate_type = "lib"]
#![feature(c_variadic)]
@@ -14,13 +15,13 @@
#[unwind(aborts)] // FIXME(#58794)
pub unsafe extern "C" fn use_foreign_c_variadic_0() {
// Ensure that we correctly call foreign C-variadic functions.
- // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0)
+ // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM:i32( signext)?]] 0)
foreign_c_variadic_0(0);
- // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42)
+ // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42)
foreign_c_variadic_0(0, 42i32);
- // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42, i32 1024)
+ // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024)
foreign_c_variadic_0(0, 42i32, 1024i32);
- // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42, i32 1024, i32 0)
+ // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024, [[PARAM]] 0)
foreign_c_variadic_0(0, 42i32, 1024i32, 0i32);
}
@@ -34,18 +35,18 @@
#[unwind(aborts)] // FIXME(#58794)
pub unsafe extern "C" fn use_foreign_c_variadic_1_1(ap: VaList) {
- // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 42)
+ // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 42)
foreign_c_variadic_1(ap, 42i32);
}
#[unwind(aborts)] // FIXME(#58794)
pub unsafe extern "C" fn use_foreign_c_variadic_1_2(ap: VaList) {
- // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 2, i32 42)
+ // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 2, [[PARAM]] 42)
foreign_c_variadic_1(ap, 2i32, 42i32);
}
#[unwind(aborts)] // FIXME(#58794)
pub unsafe extern "C" fn use_foreign_c_variadic_1_3(ap: VaList) {
- // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 2, i32 42, i32 0)
+ // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 2, [[PARAM]] 42, [[PARAM]] 0)
foreign_c_variadic_1(ap, 2i32, 42i32, 0i32);
}
@@ -64,12 +65,12 @@
// Ensure that we generate the correct `call` signature when calling a Rust
// defined C-variadic.
pub unsafe fn test_c_variadic_call() {
- // CHECK: call i32 (i32, ...) @c_variadic(i32 0)
+ // CHECK: call [[RET:(signext )?i32]] (i32, ...) @c_variadic([[PARAM]] 0)
c_variadic(0);
- // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42)
+ // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42)
c_variadic(0, 42i32);
- // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42, i32 1024)
+ // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024)
c_variadic(0, 42i32, 1024i32);
- // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42, i32 1024, i32 0)
+ // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024, [[PARAM]] 0)
c_variadic(0, 42i32, 1024i32, 0i32);
}
diff --git a/src/test/codegen/var-names.rs b/src/test/codegen/var-names.rs
new file mode 100644
index 0000000..3140a7c
--- /dev/null
+++ b/src/test/codegen/var-names.rs
@@ -0,0 +1,15 @@
+// compile-flags: -O -C no-prepopulate-passes
+
+#![crate_type = "lib"]
+
+// CHECK-LABEL: define i32 @test(i32 %a, i32 %b)
+#[no_mangle]
+pub fn test(a: u32, b: u32) -> u32 {
+ let c = a + b;
+ // CHECK: %c = add i32 %a, %b
+ let d = c;
+ let e = d * a;
+ // CHECK-NEXT: %e = mul i32 %c, %a
+ e
+ // CHECK-NEXT: ret i32 %e
+}
diff --git a/src/test/debuginfo/boxed-struct.rs b/src/test/debuginfo/boxed-struct.rs
index c0ff90c..8709fb6 100644
--- a/src/test/debuginfo/boxed-struct.rs
+++ b/src/test/debuginfo/boxed-struct.rs
@@ -8,11 +8,11 @@
// gdb-command:run
-// gdb-command:print *unique
+// gdb-command:print *boxed_with_padding
// gdbg-check:$1 = {x = 99, y = 999, z = 9999, w = 99999}
// gdbr-check:$1 = boxed_struct::StructWithSomePadding {x: 99, y: 999, z: 9999, w: 99999}
-// gdb-command:print *unique_dtor
+// gdb-command:print *boxed_with_dtor
// gdbg-check:$2 = {x = 77, y = 777, z = 7777, w = 77777}
// gdbr-check:$2 = boxed_struct::StructWithDestructor {x: 77, y: 777, z: 7777, w: 77777}
@@ -21,13 +21,13 @@
// lldb-command:run
-// lldb-command:print *unique
+// lldb-command:print *boxed_with_padding
// lldbg-check:[...]$0 = StructWithSomePadding { x: 99, y: 999, z: 9999, w: 99999 }
-// lldbr-check:(boxed_struct::StructWithSomePadding) *unique = StructWithSomePadding { x: 99, y: 999, z: 9999, w: 99999 }
+// lldbr-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = StructWithSomePadding { x: 99, y: 999, z: 9999, w: 99999 }
-// lldb-command:print *unique_dtor
+// lldb-command:print *boxed_with_dtor
// lldbg-check:[...]$1 = StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 }
-// lldbr-check:(boxed_struct::StructWithDestructor) *unique_dtor = StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 }
+// lldbr-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 }
#![allow(unused_variables)]
#![feature(box_syntax)]
@@ -54,9 +54,9 @@
fn main() {
- let unique: Box<_> = box StructWithSomePadding { x: 99, y: 999, z: 9999, w: 99999 };
+ let boxed_with_padding: Box<_> = box StructWithSomePadding { x: 99, y: 999, z: 9999, w: 99999 };
- let unique_dtor: Box<_> = box StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 };
+ let boxed_with_dtor: Box<_> = box StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 };
zzz(); // #break
}
diff --git a/src/test/mir-opt/match-arm-scopes.rs b/src/test/mir-opt/match-arm-scopes.rs
index 18e0642..c898d3a 100644
--- a/src/test/mir-opt/match-arm-scopes.rs
+++ b/src/test/mir-opt/match-arm-scopes.rs
@@ -8,8 +8,6 @@
// all of the bindings for that scope.
// * No drop flags are used.
-#![feature(nll, bind_by_move_pattern_guards)]
-
fn complicated_match(cond: bool, items: (bool, bool, String)) -> i32 {
match items {
(false, a, s) | (a, false, s) if if cond { return 3 } else { a } => 1,
diff --git a/src/test/rustdoc-ui/invalid-syntax.rs b/src/test/rustdoc-ui/invalid-syntax.rs
index 3ef66e2..97a0f4a 100644
--- a/src/test/rustdoc-ui/invalid-syntax.rs
+++ b/src/test/rustdoc-ui/invalid-syntax.rs
@@ -74,3 +74,11 @@
///
/// ```
pub fn empty_rust_with_whitespace() {}
+
+/// ```
+/// let x = 1;
+/// ```
+///
+/// \____/
+///
+pub fn indent_after_fenced() {}
diff --git a/src/test/rustdoc-ui/invalid-syntax.stderr b/src/test/rustdoc-ui/invalid-syntax.stderr
index 36209e2..6f50eda 100644
--- a/src/test/rustdoc-ui/invalid-syntax.stderr
+++ b/src/test/rustdoc-ui/invalid-syntax.stderr
@@ -202,6 +202,24 @@
| ^^^^^^^
error: unknown start of token: \
+ --> <doctest>:1:1
+ |
+1 | \____/
+ | ^
+
+warning: could not parse code block as Rust code
+ --> $DIR/invalid-syntax.rs:82:9
+ |
+LL | /// \____/
+ | ^^^^^^
+
+error: unknown start of token: \
+ --> <rustdoc-highlighting>:1:1
+ |
+1 | \____/
+ | ^
+
+error: unknown start of token: \
--> <rustdoc-highlighting>:1:1
|
1 | \_
diff --git a/src/test/ui-fulldeps/pprust-expr-roundtrip.rs b/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
index b4c154e..596f515 100644
--- a/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
+++ b/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
@@ -32,13 +32,15 @@
use syntax::ptr::P;
-fn parse_expr(ps: &ParseSess, src: &str) -> P<Expr> {
+fn parse_expr(ps: &ParseSess, src: &str) -> Option<P<Expr>> {
let src_as_string = src.to_string();
- let mut p = parse::new_parser_from_source_str(ps,
- FileName::Custom(src_as_string.clone()),
- src_as_string);
- p.parse_expr().unwrap()
+ let mut p = parse::new_parser_from_source_str(
+ ps,
+ FileName::Custom(src_as_string.clone()),
+ src_as_string,
+ );
+ p.parse_expr().map_err(|mut e| e.cancel()).ok()
}
@@ -209,22 +211,23 @@
let printed = pprust::expr_to_string(&e);
println!("printed: {}", printed);
- let mut parsed = parse_expr(&ps, &printed);
-
- // We want to know if `parsed` is structurally identical to `e`, ignoring trivial
- // differences like placement of `Paren`s or the exact ranges of node spans.
- // Unfortunately, there is no easy way to make this comparison. Instead, we add `Paren`s
- // everywhere we can, then pretty-print. This should give an unambiguous representation of
- // each `Expr`, and it bypasses nearly all of the parenthesization logic, so we aren't
- // relying on the correctness of the very thing we're testing.
- RemoveParens.visit_expr(&mut e);
- AddParens.visit_expr(&mut e);
- let text1 = pprust::expr_to_string(&e);
- RemoveParens.visit_expr(&mut parsed);
- AddParens.visit_expr(&mut parsed);
- let text2 = pprust::expr_to_string(&parsed);
- assert!(text1 == text2,
- "exprs are not equal:\n e = {:?}\n parsed = {:?}",
- text1, text2);
+ // Ignore expressions with chained comparisons that fail to parse
+ if let Some(mut parsed) = parse_expr(&ps, &printed) {
+ // We want to know if `parsed` is structurally identical to `e`, ignoring trivial
+ // differences like placement of `Paren`s or the exact ranges of node spans.
+ // Unfortunately, there is no easy way to make this comparison. Instead, we add `Paren`s
+ // everywhere we can, then pretty-print. This should give an unambiguous representation
+ // of each `Expr`, and it bypasses nearly all of the parenthesization logic, so we
+ // aren't relying on the correctness of the very thing we're testing.
+ RemoveParens.visit_expr(&mut e);
+ AddParens.visit_expr(&mut e);
+ let text1 = pprust::expr_to_string(&e);
+ RemoveParens.visit_expr(&mut parsed);
+ AddParens.visit_expr(&mut parsed);
+ let text2 = pprust::expr_to_string(&parsed);
+ assert!(text1 == text2,
+ "exprs are not equal:\n e = {:?}\n parsed = {:?}",
+ text1, text2);
+ }
});
}
diff --git a/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs b/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs
index 9db5233..ceca54b 100644
--- a/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs
+++ b/src/test/ui/associated-type-bounds/bounds-on-assoc-in-trait.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![feature(associated_type_bounds)]
diff --git a/src/test/ui/associated-type-bounds/fn-apit.rs b/src/test/ui/associated-type-bounds/fn-apit.rs
index 7e208b4..3c9f511 100644
--- a/src/test/ui/associated-type-bounds/fn-apit.rs
+++ b/src/test/ui/associated-type-bounds/fn-apit.rs
@@ -1,6 +1,7 @@
// run-pass
// aux-build:fn-aux.rs
+#![allow(unused)]
#![feature(associated_type_bounds)]
extern crate fn_aux;
diff --git a/src/test/ui/associated-type-bounds/fn-dyn-apit.rs b/src/test/ui/associated-type-bounds/fn-dyn-apit.rs
index 9ff4a50..c4e8092 100644
--- a/src/test/ui/associated-type-bounds/fn-dyn-apit.rs
+++ b/src/test/ui/associated-type-bounds/fn-dyn-apit.rs
@@ -1,6 +1,7 @@
// run-pass
// aux-build:fn-dyn-aux.rs
+#![allow(unused)]
#![feature(associated_type_bounds)]
extern crate fn_dyn_aux;
diff --git a/src/test/ui/associated-type-bounds/fn-inline.rs b/src/test/ui/associated-type-bounds/fn-inline.rs
index 7b18876..8fa7212 100644
--- a/src/test/ui/associated-type-bounds/fn-inline.rs
+++ b/src/test/ui/associated-type-bounds/fn-inline.rs
@@ -1,6 +1,7 @@
// run-pass
// aux-build:fn-aux.rs
+#![allow(unused)]
#![feature(associated_type_bounds)]
extern crate fn_aux;
diff --git a/src/test/ui/associated-type-bounds/fn-where.rs b/src/test/ui/associated-type-bounds/fn-where.rs
index 60d7149..9c4f82a 100644
--- a/src/test/ui/associated-type-bounds/fn-where.rs
+++ b/src/test/ui/associated-type-bounds/fn-where.rs
@@ -1,6 +1,7 @@
// run-pass
// aux-build:fn-aux.rs
+#![allow(unused)]
#![feature(associated_type_bounds)]
extern crate fn_aux;
diff --git a/src/test/ui/associated-type-bounds/fn-wrap-apit.rs b/src/test/ui/associated-type-bounds/fn-wrap-apit.rs
index 23790d4..96df13e3 100644
--- a/src/test/ui/associated-type-bounds/fn-wrap-apit.rs
+++ b/src/test/ui/associated-type-bounds/fn-wrap-apit.rs
@@ -2,6 +2,7 @@
// aux-build:fn-aux.rs
#![feature(associated_type_bounds)]
+#![allow(dead_code)]
extern crate fn_aux;
diff --git a/src/test/ui/associated-type-bounds/struct-bounds.rs b/src/test/ui/associated-type-bounds/struct-bounds.rs
index 2d189cd..2c1ce1c 100644
--- a/src/test/ui/associated-type-bounds/struct-bounds.rs
+++ b/src/test/ui/associated-type-bounds/struct-bounds.rs
@@ -1,5 +1,6 @@
// run-pass
+#![allow(unused)]
#![feature(associated_type_bounds)]
trait Tr1 { type As1; }
diff --git a/src/test/ui/async-await/argument-patterns.rs b/src/test/ui/async-await/argument-patterns.rs
index 0e42f48..b9fc1a8 100644
--- a/src/test/ui/async-await/argument-patterns.rs
+++ b/src/test/ui/async-await/argument-patterns.rs
@@ -1,7 +1,6 @@
// edition:2018
-// run-pass
+// check-pass
-#![allow(unused_variables)]
#![deny(unused_mut)]
type A = Vec<u32>;
diff --git a/src/test/ui/async-await/async-await.rs b/src/test/ui/async-await/async-await.rs
index bf8bf0b..1dc7315 100644
--- a/src/test/ui/async-await/async-await.rs
+++ b/src/test/ui/async-await/async-await.rs
@@ -1,5 +1,7 @@
// run-pass
+#![allow(unused)]
+
// edition:2018
// aux-build:arc_wake.rs
diff --git a/src/test/ui/async-await/async-fn-nonsend.stderr b/src/test/ui/async-await/async-fn-nonsend.stderr
index fad90b2..d2f92f0 100644
--- a/src/test/ui/async-await/async-fn-nonsend.stderr
+++ b/src/test/ui/async-await/async-fn-nonsend.stderr
@@ -9,9 +9,9 @@
|
= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
= note: required because it appears within the type `impl std::fmt::Debug`
- = note: required because it appears within the type `{impl std::fmt::Debug, impl std::future::Future, ()}`
- = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:21:39: 26:2 {impl std::fmt::Debug, impl std::future::Future, ()}]`
- = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:21:39: 26:2 {impl std::fmt::Debug, impl std::future::Future, ()}]>`
+ = note: required because it appears within the type `{impl std::fmt::Debug, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}`
+ = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:21:39: 26:2 {impl std::fmt::Debug, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]`
+ = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:21:39: 26:2 {impl std::fmt::Debug, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]>`
= note: required because it appears within the type `impl std::future::Future`
= note: required because it appears within the type `impl std::future::Future`
@@ -26,9 +26,9 @@
|
= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
= note: required because it appears within the type `impl std::fmt::Debug`
- = note: required because it appears within the type `{fn(impl std::fmt::Debug) -> std::option::Option<impl std::fmt::Debug> {std::option::Option::<impl std::fmt::Debug>::Some}, fn() -> impl std::fmt::Debug {non_send}, impl std::fmt::Debug, std::option::Option<impl std::fmt::Debug>, impl std::future::Future, ()}`
- = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:28:40: 37:2 {fn(impl std::fmt::Debug) -> std::option::Option<impl std::fmt::Debug> {std::option::Option::<impl std::fmt::Debug>::Some}, fn() -> impl std::fmt::Debug {non_send}, impl std::fmt::Debug, std::option::Option<impl std::fmt::Debug>, impl std::future::Future, ()}]`
- = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:28:40: 37:2 {fn(impl std::fmt::Debug) -> std::option::Option<impl std::fmt::Debug> {std::option::Option::<impl std::fmt::Debug>::Some}, fn() -> impl std::fmt::Debug {non_send}, impl std::fmt::Debug, std::option::Option<impl std::fmt::Debug>, impl std::future::Future, ()}]>`
+ = note: required because it appears within the type `{fn(impl std::fmt::Debug) -> std::option::Option<impl std::fmt::Debug> {std::option::Option::<impl std::fmt::Debug>::Some}, fn() -> impl std::fmt::Debug {non_send}, impl std::fmt::Debug, std::option::Option<impl std::fmt::Debug>, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}`
+ = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:28:40: 37:2 {fn(impl std::fmt::Debug) -> std::option::Option<impl std::fmt::Debug> {std::option::Option::<impl std::fmt::Debug>::Some}, fn() -> impl std::fmt::Debug {non_send}, impl std::fmt::Debug, std::option::Option<impl std::fmt::Debug>, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]`
+ = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:28:40: 37:2 {fn(impl std::fmt::Debug) -> std::option::Option<impl std::fmt::Debug> {std::option::Option::<impl std::fmt::Debug>::Some}, fn() -> impl std::fmt::Debug {non_send}, impl std::fmt::Debug, std::option::Option<impl std::fmt::Debug>, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]>`
= note: required because it appears within the type `impl std::future::Future`
= note: required because it appears within the type `impl std::future::Future`
@@ -45,9 +45,9 @@
= note: required because of the requirements on the impl of `std::marker::Send` for `&mut dyn std::fmt::Write`
= note: required because it appears within the type `std::fmt::Formatter<'_>`
= note: required because of the requirements on the impl of `std::marker::Send` for `&mut std::fmt::Formatter<'_>`
- = note: required because it appears within the type `for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, impl std::future::Future, ()}`
- = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, impl std::future::Future, ()}]`
- = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, impl std::future::Future, ()}]>`
+ = note: required because it appears within the type `for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}`
+ = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]`
+ = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]>`
= note: required because it appears within the type `impl std::future::Future`
= note: required because it appears within the type `impl std::future::Future`
@@ -68,9 +68,9 @@
= note: required because of the requirements on the impl of `std::marker::Send` for `std::slice::Iter<'_, std::fmt::ArgumentV1<'_>>`
= note: required because it appears within the type `std::fmt::Formatter<'_>`
= note: required because of the requirements on the impl of `std::marker::Send` for `&mut std::fmt::Formatter<'_>`
- = note: required because it appears within the type `for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, impl std::future::Future, ()}`
- = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, impl std::future::Future, ()}]`
- = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, impl std::future::Future, ()}]>`
+ = note: required because it appears within the type `for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}`
+ = note: required because it appears within the type `[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]`
+ = note: required because it appears within the type `std::future::GenFuture<[static generator@$DIR/async-fn-nonsend.rs:39:38: 45:2 for<'r, 's> {&'r mut std::fmt::Formatter<'s>, bool, fn() -> impl std::future::Future {fut}, impl std::future::Future, ()}]>`
= note: required because it appears within the type `impl std::future::Future`
= note: required because it appears within the type `impl std::future::Future`
diff --git a/src/test/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs b/src/test/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs
index 5d020c9..15cc9fb 100644
--- a/src/test/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs
+++ b/src/test/ui/async-await/drop-order/drop-order-for-locals-when-cancelled.rs
@@ -3,6 +3,9 @@
// run-pass
#![deny(dead_code)]
+#![allow(unused_variables)]
+#![allow(unused_must_use)]
+#![allow(path_statements)]
// Test that the drop order for locals in a fn and async fn matches up.
extern crate arc_wake;
@@ -10,7 +13,6 @@
use arc_wake::ArcWake;
use std::cell::RefCell;
use std::future::Future;
-use std::marker::PhantomData;
use std::pin::Pin;
use std::rc::Rc;
use std::sync::Arc;
@@ -42,7 +44,7 @@
impl Future for NeverReady {
type Output = ();
- fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+ fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
Poll::Pending
}
}
diff --git a/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs b/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs
index 84fe793..9e83049 100644
--- a/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs
+++ b/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs
@@ -6,6 +6,8 @@
// parameters (used or unused) are not dropped until the async fn is cancelled.
// This file is mostly copy-pasted from drop-order-for-async-fn-parameters.rs
+#![allow(unused_variables)]
+
extern crate arc_wake;
use arc_wake::ArcWake;
@@ -43,7 +45,7 @@
impl Future for NeverReady {
type Output = ();
- fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+ fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
Poll::Pending
}
}
diff --git a/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs b/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs
new file mode 100644
index 0000000..54059b2
--- /dev/null
+++ b/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime-1.rs
@@ -0,0 +1,19 @@
+// check-pass
+// edition:2018
+
+struct Test(String);
+
+impl Test {
+ async fn borrow_async(&self) {}
+
+ fn with(&mut self, s: &str) -> &mut Self {
+ self.0 = s.into();
+ self
+ }
+}
+
+async fn test() {
+ Test("".to_string()).with("123").borrow_async().await;
+}
+
+fn main() { }
diff --git a/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime.rs b/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime.rs
new file mode 100644
index 0000000..c5ea2b8
--- /dev/null
+++ b/src/test/ui/async-await/issue-63832-await-short-temporary-lifetime.rs
@@ -0,0 +1,12 @@
+// check-pass
+// edition:2018
+
+async fn foo(x: &[Vec<u32>]) -> u32 {
+ 0
+}
+
+async fn bar() {
+ foo(&[vec![123]]).await;
+}
+
+fn main() { }
diff --git a/src/test/ui/async-await/issues/issue-54752-async-block.stderr b/src/test/ui/async-await/issues/issue-54752-async-block.stderr
new file mode 100644
index 0000000..c3b3392
--- /dev/null
+++ b/src/test/ui/async-await/issues/issue-54752-async-block.stderr
@@ -0,0 +1,8 @@
+warning: unnecessary parentheses around assigned value
+ --> $DIR/issue-54752-async-block.rs:6:22
+ |
+LL | fn main() { let _a = (async { }); }
+ | ^^^^^^^^^^^^ help: remove these parentheses
+ |
+ = note: `#[warn(unused_parens)]` on by default
+
diff --git a/src/test/ui/async-await/issues/issue-59972.rs b/src/test/ui/async-await/issues/issue-59972.rs
index 154226e..c2e24a9 100644
--- a/src/test/ui/async-await/issues/issue-59972.rs
+++ b/src/test/ui/async-await/issues/issue-59972.rs
@@ -4,7 +4,7 @@
// run-pass
-// compile-flags: --edition=2018
+// compile-flags: --edition=2018 -Aunused
pub enum Uninhabited { }
diff --git a/src/test/ui/async-await/multiple-lifetimes/hrtb.rs b/src/test/ui/async-await/multiple-lifetimes/hrtb.rs
index 31d0736..e788ca5 100644
--- a/src/test/ui/async-await/multiple-lifetimes/hrtb.rs
+++ b/src/test/ui/async-await/multiple-lifetimes/hrtb.rs
@@ -1,5 +1,5 @@
// edition:2018
-// run-pass
+// check-pass
// Test that we can use async fns with multiple arbitrary lifetimes.
diff --git a/src/test/ui/attributes/obsolete-attr.rs b/src/test/ui/attributes/obsolete-attr.rs
index 8759344..cf6dd33 100644
--- a/src/test/ui/attributes/obsolete-attr.rs
+++ b/src/test/ui/attributes/obsolete-attr.rs
@@ -1,4 +1,4 @@
-// Obsolete attributes fall back to feature gated custom attributes.
+// Obsolete attributes fall back to unstable custom attributes.
#[ab_isize="stdcall"] extern {}
//~^ ERROR cannot find attribute macro `ab_isize` in this scope
diff --git a/src/test/ui/attributes/unknown-attr.rs b/src/test/ui/attributes/unknown-attr.rs
index 140a1fc..544a6e2 100644
--- a/src/test/ui/attributes/unknown-attr.rs
+++ b/src/test/ui/attributes/unknown-attr.rs
@@ -1,4 +1,4 @@
-// Unknown attributes fall back to feature gated custom attributes.
+// Unknown attributes fall back to unstable custom attributes.
#![feature(custom_inner_attributes)]
diff --git a/src/test/ui/attrs-resolution-errors.rs b/src/test/ui/attrs-resolution-errors.rs
new file mode 100644
index 0000000..a38b3cf
--- /dev/null
+++ b/src/test/ui/attrs-resolution-errors.rs
@@ -0,0 +1,40 @@
+enum FooEnum {
+ #[test]
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ Bar(i32),
+}
+
+struct FooStruct {
+ #[test]
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ bar: i32,
+}
+
+fn main() {
+ let foo_enum_bar = FooEnum::Bar(1);
+ match foo_enum_bar {
+ FooEnum::Bar(x) => {},
+ _ => {}
+ }
+
+ let foo_struct = FooStruct { bar: 1 };
+ match foo_struct {
+ FooStruct {
+ #[test] bar
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ } => {}
+ }
+
+ match 1 {
+ 0 => {}
+ #[test]
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ _ => {}
+ }
+
+ let _another_foo_strunct = FooStruct {
+ #[test]
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ bar: 1,
+ };
+}
diff --git a/src/test/ui/attrs-resolution-errors.stderr b/src/test/ui/attrs-resolution-errors.stderr
new file mode 100644
index 0000000..31f2a74
--- /dev/null
+++ b/src/test/ui/attrs-resolution-errors.stderr
@@ -0,0 +1,32 @@
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/attrs-resolution-errors.rs:2:5
+ |
+LL | #[test]
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/attrs-resolution-errors.rs:8:5
+ |
+LL | #[test]
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/attrs-resolution-errors.rs:23:13
+ |
+LL | #[test] bar
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/attrs-resolution-errors.rs:30:9
+ |
+LL | #[test]
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/attrs-resolution-errors.rs:36:9
+ |
+LL | #[test]
+ | ^^^^^^^
+
+error: aborting due to 5 previous errors
+
diff --git a/src/test/ui/attrs-resolution.rs b/src/test/ui/attrs-resolution.rs
new file mode 100644
index 0000000..6809773
--- /dev/null
+++ b/src/test/ui/attrs-resolution.rs
@@ -0,0 +1,37 @@
+// check-pass
+
+enum FooEnum {
+ #[rustfmt::skip]
+ Bar(i32),
+}
+
+struct FooStruct {
+ #[rustfmt::skip]
+ bar: i32,
+}
+
+fn main() {
+ let foo_enum_bar = FooEnum::Bar(1);
+ match foo_enum_bar {
+ FooEnum::Bar(x) => {}
+ _ => {}
+ }
+
+ let foo_struct = FooStruct { bar: 1 };
+ match foo_struct {
+ FooStruct {
+ #[rustfmt::skip] bar
+ } => {}
+ }
+
+ match 1 {
+ 0 => {}
+ #[rustfmt::skip]
+ _ => {}
+ }
+
+ let _another_foo_strunct = FooStruct {
+ #[rustfmt::skip]
+ bar: 1,
+ };
+}
diff --git a/src/test/ui/auto-ref-slice-plus-ref.stderr b/src/test/ui/auto-ref-slice-plus-ref.stderr
index f2e0d37..3e36f24 100644
--- a/src/test/ui/auto-ref-slice-plus-ref.stderr
+++ b/src/test/ui/auto-ref-slice-plus-ref.stderr
@@ -12,7 +12,7 @@
--> $DIR/auto-ref-slice-plus-ref.rs:8:7
|
LL | a.test();
- | ^^^^
+ | ^^^^ method not found in `std::vec::Vec<{integer}>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `test`, perhaps you need to implement it:
@@ -22,7 +22,7 @@
--> $DIR/auto-ref-slice-plus-ref.rs:10:11
|
LL | ([1]).test();
- | ^^^^
+ | ^^^^ method not found in `[{integer}; 1]`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `test`, perhaps you need to implement it:
@@ -32,7 +32,7 @@
--> $DIR/auto-ref-slice-plus-ref.rs:11:12
|
LL | (&[1]).test();
- | ^^^^
+ | ^^^^ method not found in `&[{integer}; 1]`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `test`, perhaps you need to implement it:
diff --git a/src/test/ui/bind-by-move/bind-by-move-no-guards.rs b/src/test/ui/bind-by-move/bind-by-move-no-guards.rs
deleted file mode 100644
index bc9b3a8..0000000
--- a/src/test/ui/bind-by-move/bind-by-move-no-guards.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::sync::mpsc::channel;
-
-fn main() {
- let (tx, rx) = channel();
- let x = Some(rx);
- tx.send(false);
- match x {
- Some(z) if z.recv().unwrap() => { panic!() },
- //~^ ERROR cannot bind by-move into a pattern guard
- Some(z) => { assert!(!z.recv().unwrap()); },
- None => panic!()
- }
-}
diff --git a/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr b/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr
deleted file mode 100644
index c5f0256..0000000
--- a/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0008]: cannot bind by-move into a pattern guard
- --> $DIR/bind-by-move-no-guards.rs:8:14
- |
-LL | Some(z) if z.recv().unwrap() => { panic!() },
- | ^ moves value into pattern guard
- |
- = help: add `#![feature(bind_by_move_pattern_guards)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0008`.
diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.rs b/src/test/ui/borrowck/borrowck-migrate-to-nll.rs
index 98fd568..6587dfd 100644
--- a/src/test/ui/borrowck/borrowck-migrate-to-nll.rs
+++ b/src/test/ui/borrowck/borrowck-migrate-to-nll.rs
@@ -17,7 +17,7 @@
// revisions: zflag edition
//[zflag]compile-flags: -Z borrowck=migrate
//[edition]edition:2018
-//[zflag] run-pass
+//[zflag] check-pass
pub struct Block<'a> {
current: &'a u8,
diff --git a/src/test/ui/borrowck/borrowck-mutate-in-guard.rs b/src/test/ui/borrowck/borrowck-mutate-in-guard.rs
index 5b6aa7a..9cbceeb 100644
--- a/src/test/ui/borrowck/borrowck-mutate-in-guard.rs
+++ b/src/test/ui/borrowck/borrowck-mutate-in-guard.rs
@@ -8,12 +8,9 @@
let mut x = Enum::A(&mut n);
match x {
Enum::A(_) if { x = Enum::B(false); false } => 1,
- //~^ ERROR cannot assign in a pattern guard
- //~| ERROR cannot assign `x` in match guard
+ //~^ ERROR cannot assign `x` in match guard
Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1,
- //~^ ERROR cannot mutably borrow in a pattern guard
- //~| ERROR cannot assign in a pattern guard
- //~| ERROR cannot mutably borrow `x` in match guard
+ //~^ ERROR cannot mutably borrow `x` in match guard
Enum::A(p) => *p,
Enum::B(_) => 2,
}
diff --git a/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr b/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr
index 674f137..6d05e97 100644
--- a/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr
+++ b/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr
@@ -1,23 +1,3 @@
-error[E0302]: cannot assign in a pattern guard
- --> $DIR/borrowck-mutate-in-guard.rs:10:25
- |
-LL | Enum::A(_) if { x = Enum::B(false); false } => 1,
- | ^^^^^^^^^^^^^^^^^^ assignment in pattern guard
-
-error[E0301]: cannot mutably borrow in a pattern guard
- --> $DIR/borrowck-mutate-in-guard.rs:13:38
- |
-LL | Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1,
- | ^ borrowed mutably in pattern guard
- |
- = help: add `#![feature(bind_by_move_pattern_guards)]` to the crate attributes to enable
-
-error[E0302]: cannot assign in a pattern guard
- --> $DIR/borrowck-mutate-in-guard.rs:13:41
- |
-LL | Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1,
- | ^^^^^^^^^^^^^^^^^^^ assignment in pattern guard
-
error[E0510]: cannot assign `x` in match guard
--> $DIR/borrowck-mutate-in-guard.rs:10:25
|
@@ -27,7 +7,7 @@
| ^^^^^^^^^^^^^^^^^^ cannot assign
error[E0510]: cannot mutably borrow `x` in match guard
- --> $DIR/borrowck-mutate-in-guard.rs:13:33
+ --> $DIR/borrowck-mutate-in-guard.rs:12:33
|
LL | match x {
| - value is immutable in match guard
@@ -35,7 +15,6 @@
LL | Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1,
| ^^^^^^ cannot mutably borrow
-error: aborting due to 5 previous errors
+error: aborting due to 2 previous errors
-Some errors have detailed explanations: E0301, E0302, E0510.
-For more information about an error, try `rustc --explain E0301`.
+For more information about this error, try `rustc --explain E0510`.
diff --git a/src/test/ui/borrowck/issue-10876.rs b/src/test/ui/borrowck/issue-10876.rs
index 20ab905..22eaa11 100644
--- a/src/test/ui/borrowck/issue-10876.rs
+++ b/src/test/ui/borrowck/issue-10876.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
enum Nat {
S(Box<Nat>),
diff --git a/src/test/ui/borrowck/two-phase-multiple-activations.rs b/src/test/ui/borrowck/two-phase-multiple-activations.rs
index a7fa7fa..599138a 100644
--- a/src/test/ui/borrowck/two-phase-multiple-activations.rs
+++ b/src/test/ui/borrowck/two-phase-multiple-activations.rs
@@ -11,7 +11,7 @@
}
impl FakeRead for Foo {
- fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {
+ fn read_to_end(&mut self, _buf: &mut Vec<u8>) -> Result<usize> {
Ok(4)
}
}
@@ -19,5 +19,5 @@
fn main() {
let mut a = Foo {};
let mut v = Vec::new();
- a.read_to_end(&mut v);
+ a.read_to_end(&mut v).unwrap();
}
diff --git a/src/test/ui/class-cast-to-trait.stderr b/src/test/ui/class-cast-to-trait.stderr
index 39f308c..4cab52e 100644
--- a/src/test/ui/class-cast-to-trait.stderr
+++ b/src/test/ui/class-cast-to-trait.stderr
@@ -2,7 +2,7 @@
--> $DIR/class-cast-to-trait.rs:53:8
|
LL | nyan.eat();
- | ^^^
+ | ^^^ method not found in `std::boxed::Box<dyn Noisy>`
error: aborting due to previous error
diff --git a/src/test/ui/coercion/coercion-slice.rs b/src/test/ui/coercion/coercion-slice.rs
index 312b634..b69edcf 100644
--- a/src/test/ui/coercion/coercion-slice.rs
+++ b/src/test/ui/coercion/coercion-slice.rs
@@ -4,5 +4,5 @@
let _: &[i32] = [0];
//~^ ERROR mismatched types
//~| expected type `&[i32]`
- //~| expected &[i32], found array of 1 elements
+ //~| expected &[i32], found array of 1 element
}
diff --git a/src/test/ui/coercion/coercion-slice.stderr b/src/test/ui/coercion/coercion-slice.stderr
index 6fa7123..ccd776e 100644
--- a/src/test/ui/coercion/coercion-slice.stderr
+++ b/src/test/ui/coercion/coercion-slice.stderr
@@ -4,7 +4,7 @@
LL | let _: &[i32] = [0];
| ^^^
| |
- | expected &[i32], found array of 1 elements
+ | expected &[i32], found array of 1 element
| help: consider borrowing here: `&[0]`
|
= note: expected type `&[i32]`
diff --git a/src/test/ui/coherence/coherence_inherent.old.stderr b/src/test/ui/coherence/coherence_inherent.old.stderr
index fa56445..750d243 100644
--- a/src/test/ui/coherence/coherence_inherent.old.stderr
+++ b/src/test/ui/coherence/coherence_inherent.old.stderr
@@ -2,7 +2,7 @@
--> $DIR/coherence_inherent.rs:35:11
|
LL | s.the_fn();
- | ^^^^^^
+ | ^^^^^^ method not found in `&Lib::TheStruct`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/coherence/coherence_inherent.re.stderr b/src/test/ui/coherence/coherence_inherent.re.stderr
index fa56445..750d243 100644
--- a/src/test/ui/coherence/coherence_inherent.re.stderr
+++ b/src/test/ui/coherence/coherence_inherent.re.stderr
@@ -2,7 +2,7 @@
--> $DIR/coherence_inherent.rs:35:11
|
LL | s.the_fn();
- | ^^^^^^
+ | ^^^^^^ method not found in `&Lib::TheStruct`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/coherence/coherence_inherent_cc.old.stderr b/src/test/ui/coherence/coherence_inherent_cc.old.stderr
index 4d93e69..59166a4 100644
--- a/src/test/ui/coherence/coherence_inherent_cc.old.stderr
+++ b/src/test/ui/coherence/coherence_inherent_cc.old.stderr
@@ -2,7 +2,7 @@
--> $DIR/coherence_inherent_cc.rs:26:11
|
LL | s.the_fn();
- | ^^^^^^
+ | ^^^^^^ method not found in `&coherence_inherent_cc_lib::TheStruct`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/coherence/coherence_inherent_cc.re.stderr b/src/test/ui/coherence/coherence_inherent_cc.re.stderr
index 4d93e69..59166a4 100644
--- a/src/test/ui/coherence/coherence_inherent_cc.re.stderr
+++ b/src/test/ui/coherence/coherence_inherent_cc.re.stderr
@@ -2,7 +2,7 @@
--> $DIR/coherence_inherent_cc.rs:26:11
|
LL | s.the_fn();
- | ^^^^^^
+ | ^^^^^^ method not found in `&coherence_inherent_cc_lib::TheStruct`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/conditional-compilation/cfg-generic-params.rs b/src/test/ui/conditional-compilation/cfg-generic-params.rs
index d80d3ea..faf0195 100644
--- a/src/test/ui/conditional-compilation/cfg-generic-params.rs
+++ b/src/test/ui/conditional-compilation/cfg-generic-params.rs
@@ -16,21 +16,23 @@
//~^ ERROR only lifetime parameters can be used in this context
fn f_lt_no<#[cfg_attr(no, unknown)] 'a>() {} // OK
-fn f_lt_yes<#[cfg_attr(yes, unknown)] 'a>() {} //~ ERROR attribute `unknown` is currently unknown
+fn f_lt_yes<#[cfg_attr(yes, unknown)] 'a>() {}
+//~^ ERROR cannot find attribute macro `unknown` in this scope
fn f_ty_no<#[cfg_attr(no, unknown)] T>() {} // OK
-fn f_ty_yes<#[cfg_attr(yes, unknown)] T>() {} //~ ERROR attribute `unknown` is currently unknown
+fn f_ty_yes<#[cfg_attr(yes, unknown)] T>() {}
+//~^ ERROR cannot find attribute macro `unknown` in this scope
type FnNo = for<#[cfg_attr(no, unknown)] 'a> fn(); // OK
type FnYes = for<#[cfg_attr(yes, unknown)] 'a> fn();
-//~^ ERROR attribute `unknown` is currently unknown
+//~^ ERROR cannot find attribute macro `unknown` in this scope
type PolyNo = dyn for<#[cfg_attr(no, unknown)] 'a> Copy; // OK
type PolyYes = dyn for<#[cfg_attr(yes, unknown)] 'a> Copy;
-//~^ ERROR attribute `unknown` is currently unknown
+//~^ ERROR cannot find attribute macro `unknown` in this scope
struct WhereNo where for<#[cfg_attr(no, unknown)] 'a> u8: Copy; // OK
struct WhereYes where for<#[cfg_attr(yes, unknown)] 'a> u8: Copy;
-//~^ ERROR attribute `unknown` is currently unknown
+//~^ ERROR cannot find attribute macro `unknown` in this scope
fn main() {
f_lt::<'static>();
diff --git a/src/test/ui/conditional-compilation/cfg-generic-params.stderr b/src/test/ui/conditional-compilation/cfg-generic-params.stderr
index 1f9731f..f6e5732 100644
--- a/src/test/ui/conditional-compilation/cfg-generic-params.stderr
+++ b/src/test/ui/conditional-compilation/cfg-generic-params.stderr
@@ -16,51 +16,35 @@
LL | struct WhereBad where for<#[cfg(no)] 'a, #[cfg(yes)] T> u8: Copy;
| ^
-error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future
+error: cannot find attribute macro `unknown` in this scope
+ --> $DIR/cfg-generic-params.rs:34:43
+ |
+LL | struct WhereYes where for<#[cfg_attr(yes, unknown)] 'a> u8: Copy;
+ | ^^^^^^^
+
+error: cannot find attribute macro `unknown` in this scope
+ --> $DIR/cfg-generic-params.rs:30:40
+ |
+LL | type PolyYes = dyn for<#[cfg_attr(yes, unknown)] 'a> Copy;
+ | ^^^^^^^
+
+error: cannot find attribute macro `unknown` in this scope
+ --> $DIR/cfg-generic-params.rs:26:34
+ |
+LL | type FnYes = for<#[cfg_attr(yes, unknown)] 'a> fn();
+ | ^^^^^^^
+
+error: cannot find attribute macro `unknown` in this scope
+ --> $DIR/cfg-generic-params.rs:22:29
+ |
+LL | fn f_ty_yes<#[cfg_attr(yes, unknown)] T>() {}
+ | ^^^^^^^
+
+error: cannot find attribute macro `unknown` in this scope
--> $DIR/cfg-generic-params.rs:19:29
|
LL | fn f_lt_yes<#[cfg_attr(yes, unknown)] 'a>() {}
| ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/cfg-generic-params.rs:21:29
- |
-LL | fn f_ty_yes<#[cfg_attr(yes, unknown)] T>() {}
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/cfg-generic-params.rs:24:34
- |
-LL | type FnYes = for<#[cfg_attr(yes, unknown)] 'a> fn();
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/cfg-generic-params.rs:28:40
- |
-LL | type PolyYes = dyn for<#[cfg_attr(yes, unknown)] 'a> Copy;
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/cfg-generic-params.rs:32:43
- |
-LL | struct WhereYes where for<#[cfg_attr(yes, unknown)] 'a> u8: Copy;
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
error: aborting due to 8 previous errors
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/const-generics/apit-with-const-param.rs b/src/test/ui/const-generics/apit-with-const-param.rs
index 70e718d..7acc508 100644
--- a/src/test/ui/const-generics/apit-with-const-param.rs
+++ b/src/test/ui/const-generics/apit-with-const-param.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![feature(const_generics)]
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
diff --git a/src/test/ui/const-generics/array-wrapper-struct-ctor.rs b/src/test/ui/const-generics/array-wrapper-struct-ctor.rs
index d83846f..2d1a405 100644
--- a/src/test/ui/const-generics/array-wrapper-struct-ctor.rs
+++ b/src/test/ui/const-generics/array-wrapper-struct-ctor.rs
@@ -3,6 +3,8 @@
#![feature(const_generics)]
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
+#![allow(dead_code)]
+
struct ArrayStruct<T, const N: usize> {
data: [T; N],
}
diff --git a/src/test/ui/const-generics/const-types.rs b/src/test/ui/const-generics/const-types.rs
index 11757cd..bc51881 100644
--- a/src/test/ui/const-generics/const-types.rs
+++ b/src/test/ui/const-generics/const-types.rs
@@ -3,7 +3,7 @@
#![feature(const_generics)]
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
-#[allow(dead_code)]
+#![allow(dead_code, unused_variables)]
struct ConstArray<T, const LEN: usize> {
array: [T; LEN],
diff --git a/src/test/ui/const-generics/foreign-item-const-parameter.rs b/src/test/ui/const-generics/foreign-item-const-parameter.rs
new file mode 100644
index 0000000..4673c86
--- /dev/null
+++ b/src/test/ui/const-generics/foreign-item-const-parameter.rs
@@ -0,0 +1,10 @@
+#![feature(const_generics)]
+//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
+
+extern "C" {
+ fn foo<const X: usize>(); //~ ERROR foreign items may not have const parameters
+
+ fn bar<T, const X: usize>(_: T); //~ ERROR foreign items may not have type or const parameters
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/foreign-item-const-parameter.stderr b/src/test/ui/const-generics/foreign-item-const-parameter.stderr
new file mode 100644
index 0000000..999feed
--- /dev/null
+++ b/src/test/ui/const-generics/foreign-item-const-parameter.stderr
@@ -0,0 +1,27 @@
+warning: the feature `const_generics` is incomplete and may cause the compiler to crash
+ --> $DIR/foreign-item-const-parameter.rs:1:12
+ |
+LL | #![feature(const_generics)]
+ | ^^^^^^^^^^^^^^
+ |
+ = note: `#[warn(incomplete_features)]` on by default
+
+error[E0044]: foreign items may not have const parameters
+ --> $DIR/foreign-item-const-parameter.rs:5:5
+ |
+LL | fn foo<const X: usize>();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^ can't have const parameters
+ |
+ = help: replace the const parameters with concrete consts
+
+error[E0044]: foreign items may not have type or const parameters
+ --> $DIR/foreign-item-const-parameter.rs:7:5
+ |
+LL | fn bar<T, const X: usize>(_: T);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't have type or const parameters
+ |
+ = help: replace the type or const parameters with concrete types or consts
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0044`.
diff --git a/src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr b/src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr
index 8f3f916..47b090c 100644
--- a/src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr
+++ b/src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr
@@ -11,7 +11,7 @@
| --------- method `f` not found for this
...
LL | S.f::<0>();
- | ^
+ | ^ method not found in `S`
error[E0107]: wrong number of const arguments: expected 0, found 1
--> $DIR/invalid-const-arg-for-type-param.rs:8:9
diff --git a/src/test/ui/const-generics/issue-61422.rs b/src/test/ui/const-generics/issue-61422.rs
index 68e5a52..45d37b6 100644
--- a/src/test/ui/const-generics/issue-61422.rs
+++ b/src/test/ui/const-generics/issue-61422.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![feature(const_generics)]
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
@@ -8,7 +8,7 @@
fn foo<const SIZE: usize>() {
let arr: [u8; SIZE] = unsafe {
#[allow(deprecated)]
- let mut array: [u8; SIZE] = mem::uninitialized();
+ let array: [u8; SIZE] = mem::uninitialized();
array
};
}
diff --git a/src/test/ui/const-generics/unused-const-param.rs b/src/test/ui/const-generics/unused-const-param.rs
index ee98e5e..8025b3a 100644
--- a/src/test/ui/const-generics/unused-const-param.rs
+++ b/src/test/ui/const-generics/unused-const-param.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![feature(const_generics)]
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
diff --git a/src/test/ui/consts/const-eval/const_transmute.rs b/src/test/ui/consts/const-eval/const_transmute.rs
index 4a7d849..f0e1d82 100644
--- a/src/test/ui/consts/const-eval/const_transmute.rs
+++ b/src/test/ui/consts/const-eval/const_transmute.rs
@@ -1,6 +1,7 @@
// run-pass
#![feature(const_fn_union)]
+#![allow(dead_code)]
#[repr(C)]
union Transmute<T: Copy, U: Copy> {
diff --git a/src/test/ui/consts/const-int-overflowing-rpass.rs b/src/test/ui/consts/const-int-overflowing-rpass.rs
index b619c79..9be87a6 100644
--- a/src/test/ui/consts/const-int-overflowing-rpass.rs
+++ b/src/test/ui/consts/const-int-overflowing-rpass.rs
@@ -18,6 +18,10 @@
const NEG_A: (u32, bool) = 0u32.overflowing_neg();
const NEG_B: (u32, bool) = core::u32::MAX.overflowing_neg();
+const ABS_POS: (i32, bool) = 10i32.overflowing_abs();
+const ABS_NEG: (i32, bool) = (-10i32).overflowing_abs();
+const ABS_MIN: (i32, bool) = i32::min_value().overflowing_abs();
+
fn main() {
assert_eq!(ADD_A, (7, false));
assert_eq!(ADD_B, (0, true));
@@ -36,4 +40,8 @@
assert_eq!(NEG_A, (0, false));
assert_eq!(NEG_B, (1, true));
+
+ assert_eq!(ABS_POS, (10, false));
+ assert_eq!(ABS_NEG, (10, false));
+ assert_eq!(ABS_MIN, (i32::min_value(), true));
}
diff --git a/src/test/ui/consts/const-int-sign-rpass.rs b/src/test/ui/consts/const-int-sign-rpass.rs
index 05726cb..dc46fce 100644
--- a/src/test/ui/consts/const-int-sign-rpass.rs
+++ b/src/test/ui/consts/const-int-sign-rpass.rs
@@ -11,6 +11,9 @@
const SIGNUM_NIL: i32 = 0i32.signum();
const SIGNUM_NEG: i32 = (-42i32).signum();
+const ABS_A: i32 = 10i32.abs();
+const ABS_B: i32 = (-10i32).abs();
+
fn main() {
assert!(NEGATIVE_A);
assert!(!NEGATIVE_B);
@@ -20,4 +23,7 @@
assert_eq!(SIGNUM_POS, 1);
assert_eq!(SIGNUM_NIL, 0);
assert_eq!(SIGNUM_NEG, -1);
+
+ assert_eq!(ABS_A, 10);
+ assert_eq!(ABS_B, 10);
}
diff --git a/src/test/ui/consts/const-int-wrapping-rpass.rs b/src/test/ui/consts/const-int-wrapping-rpass.rs
index 73147d7..2bbad99 100644
--- a/src/test/ui/consts/const-int-wrapping-rpass.rs
+++ b/src/test/ui/consts/const-int-wrapping-rpass.rs
@@ -18,6 +18,10 @@
const NEG_A: u32 = 5u32.wrapping_neg();
const NEG_B: u32 = 1234567890u32.wrapping_neg();
+const ABS_POS: i32 = 10i32.wrapping_abs();
+const ABS_NEG: i32 = (-10i32).wrapping_abs();
+const ABS_MIN: i32 = i32::min_value().wrapping_abs();
+
fn main() {
assert_eq!(ADD_A, 255);
assert_eq!(ADD_B, 199);
@@ -36,4 +40,8 @@
assert_eq!(NEG_A, 4294967291);
assert_eq!(NEG_B, 3060399406);
+
+ assert_eq!(ABS_POS, 10);
+ assert_eq!(ABS_NEG, 10);
+ assert_eq!(ABS_MIN, i32::min_value());
}
diff --git a/src/test/ui/consts/const-labeled-break.rs b/src/test/ui/consts/const-labeled-break.rs
index 36e308a..7cdbb22 100644
--- a/src/test/ui/consts/const-labeled-break.rs
+++ b/src/test/ui/consts/const-labeled-break.rs
@@ -1,4 +1,4 @@
-// run-pass
+// build-pass
// Using labeled break in a while loop has caused an illegal instruction being
// generated, and an ICE later.
diff --git a/src/test/ui/consts/const-match-check.eval1.stderr b/src/test/ui/consts/const-match-check.eval1.stderr
index 3bcb50c..24d2e3c 100644
--- a/src/test/ui/consts/const-match-check.eval1.stderr
+++ b/src/test/ui/consts/const-match-check.eval1.stderr
@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` not covered
+error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
--> $DIR/const-match-check.rs:25:15
|
LL | A = { let 0 = 0; 0 },
- | ^ pattern `std::i32::MIN..=-1i32` not covered
+ | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
error: aborting due to previous error
diff --git a/src/test/ui/consts/const-match-check.eval2.stderr b/src/test/ui/consts/const-match-check.eval2.stderr
index e292e1c..5d59d06 100644
--- a/src/test/ui/consts/const-match-check.eval2.stderr
+++ b/src/test/ui/consts/const-match-check.eval2.stderr
@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` not covered
+error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
--> $DIR/const-match-check.rs:31:24
|
LL | let x: [i32; { let 0 = 0; 0 }] = [];
- | ^ pattern `std::i32::MIN..=-1i32` not covered
+ | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
error: aborting due to previous error
diff --git a/src/test/ui/consts/const-match-check.matchck.stderr b/src/test/ui/consts/const-match-check.matchck.stderr
index 8a9fbde..6d74c26 100644
--- a/src/test/ui/consts/const-match-check.matchck.stderr
+++ b/src/test/ui/consts/const-match-check.matchck.stderr
@@ -1,26 +1,26 @@
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` not covered
+error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
--> $DIR/const-match-check.rs:4:22
|
LL | const X: i32 = { let 0 = 0; 0 };
- | ^ pattern `std::i32::MIN..=-1i32` not covered
+ | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` not covered
+error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
--> $DIR/const-match-check.rs:8:23
|
LL | static Y: i32 = { let 0 = 0; 0 };
- | ^ pattern `std::i32::MIN..=-1i32` not covered
+ | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` not covered
+error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
--> $DIR/const-match-check.rs:13:26
|
LL | const X: i32 = { let 0 = 0; 0 };
- | ^ pattern `std::i32::MIN..=-1i32` not covered
+ | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` not covered
+error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
--> $DIR/const-match-check.rs:19:26
|
LL | const X: i32 = { let 0 = 0; 0 };
- | ^ pattern `std::i32::MIN..=-1i32` not covered
+ | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
error: aborting due to 4 previous errors
diff --git a/src/test/ui/consts/const-pattern-irrefutable.rs b/src/test/ui/consts/const-pattern-irrefutable.rs
index d3f7be1..60e16aa 100644
--- a/src/test/ui/consts/const-pattern-irrefutable.rs
+++ b/src/test/ui/consts/const-pattern-irrefutable.rs
@@ -9,8 +9,8 @@
const a: u8 = 2;
fn main() {
- let a = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` not covered
- let c = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` not covered
- let d = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` not covered
+ let a = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX
+ let c = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX
+ let d = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX
fn f() {} // Check that the `NOTE`s still work with an item here (cf. issue #35115).
}
diff --git a/src/test/ui/consts/const-pattern-irrefutable.stderr b/src/test/ui/consts/const-pattern-irrefutable.stderr
index 48fe24d..06f5e90 100644
--- a/src/test/ui/consts/const-pattern-irrefutable.stderr
+++ b/src/test/ui/consts/const-pattern-irrefutable.stderr
@@ -1,16 +1,16 @@
-error[E0005]: refutable pattern in local binding: `0u8..=1u8` not covered
+error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX` not covered
--> $DIR/const-pattern-irrefutable.rs:12:9
|
LL | let a = 4;
| ^ interpreted as a constant pattern, not new variable
-error[E0005]: refutable pattern in local binding: `0u8..=1u8` not covered
+error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX` not covered
--> $DIR/const-pattern-irrefutable.rs:13:9
|
LL | let c = 4;
| ^ interpreted as a constant pattern, not new variable
-error[E0005]: refutable pattern in local binding: `0u8..=1u8` not covered
+error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX` not covered
--> $DIR/const-pattern-irrefutable.rs:14:9
|
LL | let d = 4;
diff --git a/src/test/ui/consts/const_let_refutable.stderr b/src/test/ui/consts/const_let_refutable.stderr
index 31a3098..7f15f02 100644
--- a/src/test/ui/consts/const_let_refutable.stderr
+++ b/src/test/ui/consts/const_let_refutable.stderr
@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in function argument: `&[]` not covered
+error[E0005]: refutable pattern in function argument: `&[]`, `&[_]` and `&[_, _, _]` not covered
--> $DIR/const_let_refutable.rs:3:16
|
LL | const fn slice([a, b]: &[i32]) -> i32 {
- | ^^^^^^ pattern `&[]` not covered
+ | ^^^^^^ patterns `&[]`, `&[_]` and `&[_, _, _]` not covered
error[E0723]: can only call other `const fn` within a `const fn`, but `const <&i32 as std::ops::Add>::add` is not stable as `const fn`
--> $DIR/const_let_refutable.rs:4:5
diff --git a/src/test/ui/consts/match_ice.stderr b/src/test/ui/consts/match_ice.stderr
index 158581f..bf0bd3a 100644
--- a/src/test/ui/consts/match_ice.stderr
+++ b/src/test/ui/consts/match_ice.stderr
@@ -7,6 +7,9 @@
error[E0004]: non-exhaustive patterns: `&T` not covered
--> $DIR/match_ice.rs:15:11
|
+LL | struct T;
+ | --------- `T` defined here
+...
LL | match K {
| ^ pattern `&T` not covered
|
diff --git a/src/test/ui/consts/packed_pattern.stderr b/src/test/ui/consts/packed_pattern.stderr
new file mode 100644
index 0000000..9b7daf2
--- /dev/null
+++ b/src/test/ui/consts/packed_pattern.stderr
@@ -0,0 +1,8 @@
+warning: unreachable pattern
+ --> $DIR/packed_pattern.rs:16:9
+ |
+LL | FOO => unreachable!(),
+ | ^^^
+ |
+ = note: `#[warn(unreachable_patterns)]` on by default
+
diff --git a/src/test/ui/consts/packed_pattern2.stderr b/src/test/ui/consts/packed_pattern2.stderr
new file mode 100644
index 0000000..6cc0225
--- /dev/null
+++ b/src/test/ui/consts/packed_pattern2.stderr
@@ -0,0 +1,8 @@
+warning: unreachable pattern
+ --> $DIR/packed_pattern2.rs:24:9
+ |
+LL | FOO => unreachable!(),
+ | ^^^
+ |
+ = note: `#[warn(unreachable_patterns)]` on by default
+
diff --git a/src/test/ui/copy-a-resource.stderr b/src/test/ui/copy-a-resource.stderr
index cceb9e3..054bd09 100644
--- a/src/test/ui/copy-a-resource.stderr
+++ b/src/test/ui/copy-a-resource.stderr
@@ -5,7 +5,7 @@
| ---------- method `clone` not found for this
...
LL | let _y = x.clone();
- | ^^^^^
+ | ^^^^^ method not found in `Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `clone`, perhaps you need to implement it:
diff --git a/src/test/ui/deprecation/deprecation-in-future.rs b/src/test/ui/deprecation/deprecation-in-future.rs
index c4f9fdc..464ddcc 100644
--- a/src/test/ui/deprecation/deprecation-in-future.rs
+++ b/src/test/ui/deprecation/deprecation-in-future.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![deny(deprecated_in_future)]
diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.stderr b/src/test/ui/derives/derive-assoc-type-not-impl.stderr
index b9e175e..038de80 100644
--- a/src/test/ui/derives/derive-assoc-type-not-impl.stderr
+++ b/src/test/ui/derives/derive-assoc-type-not-impl.stderr
@@ -5,7 +5,7 @@
| ------------------ method `clone` not found for this
...
LL | Bar::<NotClone> { x: 1 }.clone();
- | ^^^^^
+ | ^^^^^ method not found in `Bar<NotClone>`
|
= note: the method `clone` exists but the following trait bounds were not satisfied:
`Bar<NotClone> : std::clone::Clone`
diff --git a/src/test/ui/did_you_mean/issue-40396.rs b/src/test/ui/did_you_mean/issue-40396.rs
index 63eec50..6902779 100644
--- a/src/test/ui/did_you_mean/issue-40396.rs
+++ b/src/test/ui/did_you_mean/issue-40396.rs
@@ -1,27 +1,16 @@
fn foo() {
(0..13).collect<Vec<i32>>();
//~^ ERROR chained comparison
- //~| ERROR expected value, found struct `Vec`
- //~| ERROR expected value, found builtin type `i32`
- //~| ERROR attempted to take value of method `collect`
}
fn bar() {
Vec<i32>::new();
//~^ ERROR chained comparison
- //~| ERROR expected value, found struct `Vec`
- //~| ERROR expected value, found builtin type `i32`
- //~| ERROR cannot find function `new` in the crate root
}
fn qux() {
(0..13).collect<Vec<i32>();
//~^ ERROR chained comparison
- //~| ERROR chained comparison
- //~| ERROR expected value, found struct `Vec`
- //~| ERROR expected value, found builtin type `i32`
- //~| ERROR attempted to take value of method `collect`
- //~| ERROR mismatched types
}
fn main() {}
diff --git a/src/test/ui/did_you_mean/issue-40396.stderr b/src/test/ui/did_you_mean/issue-40396.stderr
index fe517ee..7a08fda 100644
--- a/src/test/ui/did_you_mean/issue-40396.stderr
+++ b/src/test/ui/did_you_mean/issue-40396.stderr
@@ -8,7 +8,7 @@
= help: or use `(...)` if you meant to specify fn arguments
error: chained comparison operators require parentheses
- --> $DIR/issue-40396.rs:10:8
+ --> $DIR/issue-40396.rs:7:8
|
LL | Vec<i32>::new();
| ^^^^^^^
@@ -17,7 +17,7 @@
= help: or use `(...)` if you meant to specify fn arguments
error: chained comparison operators require parentheses
- --> $DIR/issue-40396.rs:18:20
+ --> $DIR/issue-40396.rs:12:20
|
LL | (0..13).collect<Vec<i32>();
| ^^^^^^^^
@@ -25,79 +25,5 @@
= help: use `::<...>` instead of `<...>` if you meant to specify type arguments
= help: or use `(...)` if you meant to specify fn arguments
-error: chained comparison operators require parentheses
- --> $DIR/issue-40396.rs:18:24
- |
-LL | (0..13).collect<Vec<i32>();
- | ^^^^^^
- |
- = help: use `::<...>` instead of `<...>` if you meant to specify type arguments
- = help: or use `(...)` if you meant to specify fn arguments
+error: aborting due to 3 previous errors
-error[E0423]: expected value, found struct `Vec`
- --> $DIR/issue-40396.rs:2:21
- |
-LL | (0..13).collect<Vec<i32>>();
- | ^^^ did you mean `Vec { /* fields */ }`?
-
-error[E0423]: expected value, found builtin type `i32`
- --> $DIR/issue-40396.rs:2:25
- |
-LL | (0..13).collect<Vec<i32>>();
- | ^^^ not a value
-
-error[E0423]: expected value, found struct `Vec`
- --> $DIR/issue-40396.rs:10:5
- |
-LL | Vec<i32>::new();
- | ^^^ did you mean `Vec { /* fields */ }`?
-
-error[E0423]: expected value, found builtin type `i32`
- --> $DIR/issue-40396.rs:10:9
- |
-LL | Vec<i32>::new();
- | ^^^ not a value
-
-error[E0425]: cannot find function `new` in the crate root
- --> $DIR/issue-40396.rs:10:15
- |
-LL | Vec<i32>::new();
- | ^^^ not found in the crate root
-
-error[E0423]: expected value, found struct `Vec`
- --> $DIR/issue-40396.rs:18:21
- |
-LL | (0..13).collect<Vec<i32>();
- | ^^^ did you mean `Vec { /* fields */ }`?
-
-error[E0423]: expected value, found builtin type `i32`
- --> $DIR/issue-40396.rs:18:25
- |
-LL | (0..13).collect<Vec<i32>();
- | ^^^ not a value
-
-error[E0615]: attempted to take value of method `collect` on type `std::ops::Range<{integer}>`
- --> $DIR/issue-40396.rs:2:13
- |
-LL | (0..13).collect<Vec<i32>>();
- | ^^^^^^^ help: use parentheses to call the method: `collect()`
-
-error[E0615]: attempted to take value of method `collect` on type `std::ops::Range<{integer}>`
- --> $DIR/issue-40396.rs:18:13
- |
-LL | (0..13).collect<Vec<i32>();
- | ^^^^^^^ help: use parentheses to call the method: `collect()`
-
-error[E0308]: mismatched types
- --> $DIR/issue-40396.rs:18:29
- |
-LL | (0..13).collect<Vec<i32>();
- | ^^ expected bool, found ()
- |
- = note: expected type `bool`
- found type `()`
-
-error: aborting due to 14 previous errors
-
-Some errors have detailed explanations: E0308, E0423, E0425, E0615.
-For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/drop/dynamic-drop-async.rs b/src/test/ui/drop/dynamic-drop-async.rs
index 79d09d1..91063ed 100644
--- a/src/test/ui/drop/dynamic-drop-async.rs
+++ b/src/test/ui/drop/dynamic-drop-async.rs
@@ -8,6 +8,7 @@
// ignore-wasm32-bare compiled with panic=abort by default
#![feature(slice_patterns)]
+#![allow(unused)]
use std::{
cell::{Cell, RefCell},
diff --git a/src/test/ui/empty/empty-never-array.stderr b/src/test/ui/empty/empty-never-array.stderr
index a7f7cfa..7d59d55 100644
--- a/src/test/ui/empty/empty-never-array.stderr
+++ b/src/test/ui/empty/empty-never-array.stderr
@@ -3,6 +3,7 @@
|
LL | / enum Helper<T, U> {
LL | | T(T, [!; 0]),
+ | | - not covered
LL | | #[allow(dead_code)]
LL | | U(U),
LL | | }
diff --git a/src/test/ui/error-codes/E0008.rs b/src/test/ui/error-codes/E0008.rs
deleted file mode 100644
index c87ef4c..0000000
--- a/src/test/ui/error-codes/E0008.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn main() {
- match Some("hi".to_string()) {
- Some(s) if s.len() == 0 => {},
- //~^ ERROR E0008
- _ => {},
- }
-}
diff --git a/src/test/ui/error-codes/E0008.stderr b/src/test/ui/error-codes/E0008.stderr
deleted file mode 100644
index 6b45439..0000000
--- a/src/test/ui/error-codes/E0008.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0008]: cannot bind by-move into a pattern guard
- --> $DIR/E0008.rs:3:14
- |
-LL | Some(s) if s.len() == 0 => {},
- | ^ moves value into pattern guard
- |
- = help: add `#![feature(bind_by_move_pattern_guards)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0008`.
diff --git a/src/test/ui/error-codes/E0044.rs b/src/test/ui/error-codes/E0044.rs
index a5265e7..9eee9c3 100644
--- a/src/test/ui/error-codes/E0044.rs
+++ b/src/test/ui/error-codes/E0044.rs
@@ -1,7 +1,7 @@
extern {
fn sqrt<T>(f: T) -> T;
//~^ ERROR foreign items may not have type parameters [E0044]
- //~| HELP use specialization instead of type parameters by replacing them with concrete types
+ //~| HELP replace the type parameters with concrete types
//~| NOTE can't have type parameters
}
diff --git a/src/test/ui/error-codes/E0044.stderr b/src/test/ui/error-codes/E0044.stderr
index 57c2111..e889c16 100644
--- a/src/test/ui/error-codes/E0044.stderr
+++ b/src/test/ui/error-codes/E0044.stderr
@@ -4,7 +4,7 @@
LL | fn sqrt<T>(f: T) -> T;
| ^^^^^^^^^^^^^^^^^^^^^^ can't have type parameters
|
- = help: use specialization instead of type parameters by replacing them with concrete types like `u32`
+ = help: replace the type parameters with concrete types like `u32`
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0301.rs b/src/test/ui/error-codes/E0301.rs
deleted file mode 100644
index 3b45180..0000000
--- a/src/test/ui/error-codes/E0301.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn main() {
- match Some(()) {
- None => { },
- option if option.take().is_none() => {}, //~ ERROR E0301
- Some(_) => { } //~^ ERROR E0596
- }
-}
diff --git a/src/test/ui/error-codes/E0301.stderr b/src/test/ui/error-codes/E0301.stderr
deleted file mode 100644
index 4f12fd3..0000000
--- a/src/test/ui/error-codes/E0301.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error[E0301]: cannot mutably borrow in a pattern guard
- --> $DIR/E0301.rs:4:19
- |
-LL | option if option.take().is_none() => {},
- | ^^^^^^ borrowed mutably in pattern guard
- |
- = help: add `#![feature(bind_by_move_pattern_guards)]` to the crate attributes to enable
-
-error[E0596]: cannot borrow `option` as mutable, as it is immutable for the pattern guard
- --> $DIR/E0301.rs:4:19
- |
-LL | option if option.take().is_none() => {},
- | ^^^^^^ cannot borrow as mutable
- |
- = note: variables bound in patterns are immutable until the end of the pattern guard
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0301, E0596.
-For more information about an error, try `rustc --explain E0301`.
diff --git a/src/test/ui/error-codes/E0302.rs b/src/test/ui/error-codes/E0302.rs
deleted file mode 100644
index 69f5953..0000000
--- a/src/test/ui/error-codes/E0302.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn main() {
- match Some(()) {
- None => { },
- option if { option = None; false } => { }, //~ ERROR E0302
- //~^ ERROR cannot assign to `option`, as it is immutable for the pattern guard
- Some(_) => { }
- }
-}
diff --git a/src/test/ui/error-codes/E0302.stderr b/src/test/ui/error-codes/E0302.stderr
deleted file mode 100644
index a077fca..0000000
--- a/src/test/ui/error-codes/E0302.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0302]: cannot assign in a pattern guard
- --> $DIR/E0302.rs:4:21
- |
-LL | option if { option = None; false } => { },
- | ^^^^^^^^^^^^^ assignment in pattern guard
-
-error[E0594]: cannot assign to `option`, as it is immutable for the pattern guard
- --> $DIR/E0302.rs:4:21
- |
-LL | option if { option = None; false } => { },
- | ^^^^^^^^^^^^^ cannot assign
- |
- = note: variables bound in patterns are immutable until the end of the pattern guard
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0302`.
diff --git a/src/test/ui/error-festival.stderr b/src/test/ui/error-festival.stderr
index 8808e95..73571a3 100644
--- a/src/test/ui/error-festival.stderr
+++ b/src/test/ui/error-festival.stderr
@@ -24,7 +24,7 @@
--> $DIR/error-festival.rs:16:7
|
LL | x.z();
- | ^
+ | ^ method not found in `&str`
error[E0600]: cannot apply unary operator `!` to type `Question`
--> $DIR/error-festival.rs:19:5
diff --git a/src/test/ui/extenv/issue-55897.rs b/src/test/ui/extenv/issue-55897.rs
index c3975f6..64c4107 100644
--- a/src/test/ui/extenv/issue-55897.rs
+++ b/src/test/ui/extenv/issue-55897.rs
@@ -1,7 +1,7 @@
use prelude::*; //~ ERROR unresolved import `prelude`
mod unresolved_env {
- use env;
+ use env; //~ ERROR unresolved import `env`
include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
//~^ ERROR cannot determine resolution for the macro `env`
diff --git a/src/test/ui/extenv/issue-55897.stderr b/src/test/ui/extenv/issue-55897.stderr
index 9d68131..c57a467 100644
--- a/src/test/ui/extenv/issue-55897.stderr
+++ b/src/test/ui/extenv/issue-55897.stderr
@@ -19,6 +19,12 @@
| unresolved import
| help: a similar path exists: `std::prelude`
+error[E0432]: unresolved import `env`
+ --> $DIR/issue-55897.rs:4:9
+ |
+LL | use env;
+ | ^^^ no `env` in the root
+
error: cannot determine resolution for the macro `env`
--> $DIR/issue-55897.rs:6:22
|
@@ -27,6 +33,6 @@
|
= note: import resolution is stuck, try simplifying macro imports
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/feature-gate/allow-features-empty.rs b/src/test/ui/feature-gate/allow-features-empty.rs
index 784a1d2..641e4b8 100644
--- a/src/test/ui/feature-gate/allow-features-empty.rs
+++ b/src/test/ui/feature-gate/allow-features-empty.rs
@@ -1,8 +1,6 @@
// compile-flags: -Z allow_features=
// Note: This test uses rustc internal flags because they will never stabilize.
-#![feature(rustc_diagnostic_macros)] //~ ERROR
-
#![feature(rustc_const_unstable)] //~ ERROR
#![feature(lang_items)] //~ ERROR
diff --git a/src/test/ui/feature-gate/allow-features-empty.stderr b/src/test/ui/feature-gate/allow-features-empty.stderr
index ab41422..a87d105 100644
--- a/src/test/ui/feature-gate/allow-features-empty.stderr
+++ b/src/test/ui/feature-gate/allow-features-empty.stderr
@@ -1,27 +1,21 @@
-error[E0725]: the feature `rustc_diagnostic_macros` is not in the list of allowed features
- --> $DIR/allow-features-empty.rs:4:12
- |
-LL | #![feature(rustc_diagnostic_macros)]
- | ^^^^^^^^^^^^^^^^^^^^^^^
-
error[E0725]: the feature `rustc_const_unstable` is not in the list of allowed features
- --> $DIR/allow-features-empty.rs:6:12
+ --> $DIR/allow-features-empty.rs:4:12
|
LL | #![feature(rustc_const_unstable)]
| ^^^^^^^^^^^^^^^^^^^^
error[E0725]: the feature `lang_items` is not in the list of allowed features
- --> $DIR/allow-features-empty.rs:8:12
+ --> $DIR/allow-features-empty.rs:6:12
|
LL | #![feature(lang_items)]
| ^^^^^^^^^^
error[E0725]: the feature `unknown_stdlib_feature` is not in the list of allowed features
- --> $DIR/allow-features-empty.rs:10:12
+ --> $DIR/allow-features-empty.rs:8:12
|
LL | #![feature(unknown_stdlib_feature)]
| ^^^^^^^^^^^^^^^^^^^^^^
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
For more information about this error, try `rustc --explain E0725`.
diff --git a/src/test/ui/feature-gate/allow-features.rs b/src/test/ui/feature-gate/allow-features.rs
index de3439a..de69e48 100644
--- a/src/test/ui/feature-gate/allow-features.rs
+++ b/src/test/ui/feature-gate/allow-features.rs
@@ -1,8 +1,6 @@
-// compile-flags: -Z allow_features=rustc_diagnostic_macros,lang_items
+// compile-flags: -Z allow_features=lang_items
// Note: This test uses rustc internal flags because they will never stabilize.
-#![feature(rustc_diagnostic_macros)]
-
#![feature(rustc_const_unstable)] //~ ERROR
#![feature(lang_items)]
diff --git a/src/test/ui/feature-gate/allow-features.stderr b/src/test/ui/feature-gate/allow-features.stderr
index 5b39a6f..157dddf 100644
--- a/src/test/ui/feature-gate/allow-features.stderr
+++ b/src/test/ui/feature-gate/allow-features.stderr
@@ -1,11 +1,11 @@
error[E0725]: the feature `rustc_const_unstable` is not in the list of allowed features
- --> $DIR/allow-features.rs:6:12
+ --> $DIR/allow-features.rs:4:12
|
LL | #![feature(rustc_const_unstable)]
| ^^^^^^^^^^^^^^^^^^^^
error[E0725]: the feature `unknown_stdlib_feature` is not in the list of allowed features
- --> $DIR/allow-features.rs:10:12
+ --> $DIR/allow-features.rs:8:12
|
LL | #![feature(unknown_stdlib_feature)]
| ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
index 92844f9..b6c8648 100644
--- a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
+++ b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
@@ -1,4 +1,4 @@
-//~ ERROR kind="static-nobundle" is feature gated
+//~ ERROR kind="static-nobundle" is unstable
// Test the behavior of rustc when non-existent library is statically linked
// compile-flags: -l static-nobundle=nonexistent
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
index 059559d..cfff4c3 100644
--- a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
+++ b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
@@ -1,4 +1,4 @@
-error[E0658]: kind="static-nobundle" is feature gated
+error[E0658]: kind="static-nobundle" is unstable
|
= note: for more information, see https://github.com/rust-lang/rust/issues/37403
= help: add `#![feature(static_nobundle)]` to the crate attributes to enable
diff --git a/src/test/ui/feature-gates/bench.rs b/src/test/ui/feature-gates/bench.rs
new file mode 100644
index 0000000..afe4dc7
--- /dev/null
+++ b/src/test/ui/feature-gates/bench.rs
@@ -0,0 +1,5 @@
+#[bench] //~ ERROR use of unstable library feature 'test'
+ //~| WARN this was previously accepted
+fn bench() {}
+
+fn main() {}
diff --git a/src/test/ui/feature-gates/bench.stderr b/src/test/ui/feature-gates/bench.stderr
new file mode 100644
index 0000000..b9e24e9
--- /dev/null
+++ b/src/test/ui/feature-gates/bench.stderr
@@ -0,0 +1,12 @@
+error: use of unstable library feature 'test': `bench` is a part of custom test frameworks which are unstable
+ --> $DIR/bench.rs:1:3
+ |
+LL | #[bench]
+ | ^^^^^
+ |
+ = note: `#[deny(soft_unstable)]` on by default
+ = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+ = note: for more information, see issue #64266 <https://github.com/rust-lang/rust/issues/64266>
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs
index 8fe11cb..51b5bf5 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs
+++ b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs
@@ -4,54 +4,54 @@
// gate-test-custom_attribute
struct StLt<#[lt_struct] 'a>(&'a u32);
-//~^ ERROR the attribute `lt_struct` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `lt_struct` in this scope
struct StTy<#[ty_struct] I>(I);
-//~^ ERROR the attribute `ty_struct` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `ty_struct` in this scope
enum EnLt<#[lt_enum] 'b> { A(&'b u32), B }
-//~^ ERROR the attribute `lt_enum` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `lt_enum` in this scope
enum EnTy<#[ty_enum] J> { A(J), B }
-//~^ ERROR the attribute `ty_enum` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `ty_enum` in this scope
trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; }
-//~^ ERROR the attribute `lt_trait` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `lt_trait` in this scope
trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); }
-//~^ ERROR the attribute `ty_trait` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `ty_trait` in this scope
type TyLt<#[lt_type] 'd> = &'d u32;
-//~^ ERROR the attribute `lt_type` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `lt_type` in this scope
type TyTy<#[ty_type] L> = (L, );
-//~^ ERROR the attribute `ty_type` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `ty_type` in this scope
impl<#[lt_inherent] 'e> StLt<'e> { }
-//~^ ERROR the attribute `lt_inherent` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `lt_inherent` in this scope
impl<#[ty_inherent] M> StTy<M> { }
-//~^ ERROR the attribute `ty_inherent` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `ty_inherent` in this scope
impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> {
- //~^ ERROR the attribute `lt_impl_for` is currently unknown to the compiler
+ //~^ ERROR cannot find attribute macro `lt_impl_for` in this scope
fn foo(&self, _: &'f [u32]) -> &'f u32 { loop { } }
}
impl<#[ty_impl_for] N> TrTy<N> for StTy<N> {
- //~^ ERROR the attribute `ty_impl_for` is currently unknown to the compiler
+ //~^ ERROR cannot find attribute macro `ty_impl_for` in this scope
fn foo(&self, _: N) { }
}
fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } }
-//~^ ERROR the attribute `lt_fn` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `lt_fn` in this scope
fn f_ty<#[ty_fn] O>(_: O) { }
-//~^ ERROR the attribute `ty_fn` is currently unknown to the compiler
+//~^ ERROR cannot find attribute macro `ty_fn` in this scope
impl<I> StTy<I> {
fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } }
- //~^ ERROR the attribute `lt_meth` is currently unknown to the compiler
+ //~^ ERROR cannot find attribute macro `lt_meth` in this scope
fn m_ty<#[ty_meth] P>(_: P) { }
- //~^ ERROR the attribute `ty_meth` is currently unknown to the compiler
+ //~^ ERROR cannot find attribute macro `ty_meth` in this scope
}
fn hof_lt<Q>(_: Q)
where Q: for <#[lt_hof] 'i> Fn(&'i [u32]) -> &'i u32
- //~^ ERROR the attribute `lt_hof` is currently unknown to the compiler
+ //~^ ERROR cannot find attribute macro `lt_hof` in this scope
{
}
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr
index 15e0c41..9250616 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr
@@ -1,156 +1,104 @@
-error[E0658]: the attribute `lt_struct` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:6:13
- |
-LL | struct StLt<#[lt_struct] 'a>(&'a u32);
- | ^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_struct` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:8:13
- |
-LL | struct StTy<#[ty_struct] I>(I);
- | ^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_enum` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:11:11
- |
-LL | enum EnLt<#[lt_enum] 'b> { A(&'b u32), B }
- | ^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_enum` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:13:11
- |
-LL | enum EnTy<#[ty_enum] J> { A(J), B }
- | ^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_trait` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:16:12
- |
-LL | trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; }
- | ^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_trait` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:18:12
- |
-LL | trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); }
- | ^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_type` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:21:11
- |
-LL | type TyLt<#[lt_type] 'd> = &'d u32;
- | ^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_type` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:23:11
- |
-LL | type TyTy<#[ty_type] L> = (L, );
- | ^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_inherent` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:26:6
- |
-LL | impl<#[lt_inherent] 'e> StLt<'e> { }
- | ^^^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_inherent` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:28:6
- |
-LL | impl<#[ty_inherent] M> StTy<M> { }
- | ^^^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_impl_for` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:31:6
- |
-LL | impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> {
- | ^^^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_impl_for` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:35:6
- |
-LL | impl<#[ty_impl_for] N> TrTy<N> for StTy<N> {
- | ^^^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_fn` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:40:9
- |
-LL | fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } }
- | ^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_fn` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:42:9
- |
-LL | fn f_ty<#[ty_fn] O>(_: O) { }
- | ^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_meth` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:46:13
- |
-LL | fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } }
- | ^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `ty_meth` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:48:13
- |
-LL | fn m_ty<#[ty_meth] P>(_: P) { }
- | ^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `lt_hof` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/feature-gate-custom_attribute2.rs:53:19
+error: cannot find attribute macro `lt_hof` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:53:21
|
LL | where Q: for <#[lt_hof] 'i> Fn(&'i [u32]) -> &'i u32
- | ^^^^^^^^^
+ | ^^^^^^
+
+error: cannot find attribute macro `ty_meth` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:48:15
|
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
+LL | fn m_ty<#[ty_meth] P>(_: P) { }
+ | ^^^^^^^
+
+error: cannot find attribute macro `lt_meth` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:46:15
+ |
+LL | fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } }
+ | ^^^^^^^
+
+error: cannot find attribute macro `ty_fn` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:42:11
+ |
+LL | fn f_ty<#[ty_fn] O>(_: O) { }
+ | ^^^^^
+
+error: cannot find attribute macro `lt_fn` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:40:11
+ |
+LL | fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } }
+ | ^^^^^
+
+error: cannot find attribute macro `ty_impl_for` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:35:8
+ |
+LL | impl<#[ty_impl_for] N> TrTy<N> for StTy<N> {
+ | ^^^^^^^^^^^
+
+error: cannot find attribute macro `lt_impl_for` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:31:8
+ |
+LL | impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> {
+ | ^^^^^^^^^^^
+
+error: cannot find attribute macro `ty_inherent` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:28:8
+ |
+LL | impl<#[ty_inherent] M> StTy<M> { }
+ | ^^^^^^^^^^^
+
+error: cannot find attribute macro `lt_inherent` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:26:8
+ |
+LL | impl<#[lt_inherent] 'e> StLt<'e> { }
+ | ^^^^^^^^^^^
+
+error: cannot find attribute macro `ty_type` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:23:13
+ |
+LL | type TyTy<#[ty_type] L> = (L, );
+ | ^^^^^^^
+
+error: cannot find attribute macro `lt_type` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:21:13
+ |
+LL | type TyLt<#[lt_type] 'd> = &'d u32;
+ | ^^^^^^^
+
+error: cannot find attribute macro `ty_trait` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:18:14
+ |
+LL | trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); }
+ | ^^^^^^^^
+
+error: cannot find attribute macro `lt_trait` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:16:14
+ |
+LL | trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; }
+ | ^^^^^^^^
+
+error: cannot find attribute macro `ty_enum` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:13:13
+ |
+LL | enum EnTy<#[ty_enum] J> { A(J), B }
+ | ^^^^^^^
+
+error: cannot find attribute macro `lt_enum` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:11:13
+ |
+LL | enum EnLt<#[lt_enum] 'b> { A(&'b u32), B }
+ | ^^^^^^^
+
+error: cannot find attribute macro `ty_struct` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:8:15
+ |
+LL | struct StTy<#[ty_struct] I>(I);
+ | ^^^^^^^^^
+
+error: cannot find attribute macro `lt_struct` in this scope
+ --> $DIR/feature-gate-custom_attribute2.rs:6:15
+ |
+LL | struct StLt<#[lt_struct] 'a>(&'a u32);
+ | ^^^^^^^^^
error: aborting due to 17 previous errors
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gates/feature-gate-is_sorted.rs b/src/test/ui/feature-gates/feature-gate-is_sorted.rs
index 078ecc5..359ed83 100644
--- a/src/test/ui/feature-gates/feature-gate-is_sorted.rs
+++ b/src/test/ui/feature-gates/feature-gate-is_sorted.rs
@@ -1,11 +1,11 @@
fn main() {
- // Assert `Iterator` methods are feature gated
+ // Assert `Iterator` methods are unstable
assert!([1, 2, 2, 9].iter().is_sorted());
//~^ ERROR: use of unstable library feature 'is_sorted': new API
assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
//~^ ERROR: use of unstable library feature 'is_sorted': new API
- // Assert `[T]` methods are feature gated
+ // Assert `[T]` methods are unstable
assert!([1, 2, 2, 9].is_sorted());
//~^ ERROR: use of unstable library feature 'is_sorted': new API
assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.rs b/src/test/ui/feature-gates/feature-gate-link_cfg.rs
index 1905346..27ec2e9 100644
--- a/src/test/ui/feature-gates/feature-gate-link_cfg.rs
+++ b/src/test/ui/feature-gates/feature-gate-link_cfg.rs
@@ -1,5 +1,5 @@
#[link(name = "foo", cfg(foo))]
-//~^ ERROR: is feature gated
+//~^ ERROR: is unstable
extern {}
fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
index 58aa4ed..f6c5061 100644
--- a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
+++ b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
@@ -1,4 +1,4 @@
-error[E0658]: is feature gated
+error[E0658]: is unstable
--> $DIR/feature-gate-link_cfg.rs:1:1
|
LL | #[link(name = "foo", cfg(foo))]
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs
deleted file mode 100644
index 63c2c31..0000000
--- a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Test that diagnostic macros are gated by `rustc_diagnostic_macros` feature
-// gate
-
-__register_diagnostic!(E0001);
-//~^ ERROR cannot find macro `__register_diagnostic!` in this scope
-
-fn main() {
- __diagnostic_used!(E0001);
- //~^ ERROR cannot find macro `__diagnostic_used!` in this scope
-}
-
-__build_diagnostic_array!(DIAGNOSTICS);
-//~^ ERROR cannot find macro `__build_diagnostic_array!` in this scope
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr
deleted file mode 100644
index 676b8b9..0000000
--- a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error: cannot find macro `__build_diagnostic_array!` in this scope
- --> $DIR/feature-gate-rustc-diagnostic-macros.rs:12:1
- |
-LL | __build_diagnostic_array!(DIAGNOSTICS);
- | ^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: cannot find macro `__diagnostic_used!` in this scope
- --> $DIR/feature-gate-rustc-diagnostic-macros.rs:8:5
- |
-LL | __diagnostic_used!(E0001);
- | ^^^^^^^^^^^^^^^^^
-
-error: cannot find macro `__register_diagnostic!` in this scope
- --> $DIR/feature-gate-rustc-diagnostic-macros.rs:4:1
- |
-LL | __register_diagnostic!(E0001);
- | ^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 3 previous errors
-
diff --git a/src/test/ui/feature-gates/feature-gate-static-nobundle.rs b/src/test/ui/feature-gates/feature-gate-static-nobundle.rs
index 1ce6c54..644b1f9 100644
--- a/src/test/ui/feature-gates/feature-gate-static-nobundle.rs
+++ b/src/test/ui/feature-gates/feature-gate-static-nobundle.rs
@@ -1,5 +1,5 @@
#[link(name="foo", kind="static-nobundle")]
-//~^ ERROR: kind="static-nobundle" is feature gated
+//~^ ERROR: kind="static-nobundle" is unstable
extern {}
fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
index f2e29cf..cc0d426 100644
--- a/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
+++ b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
@@ -1,4 +1,4 @@
-error[E0658]: kind="static-nobundle" is feature gated
+error[E0658]: kind="static-nobundle" is unstable
--> $DIR/feature-gate-static-nobundle.rs:1:1
|
LL | #[link(name="foo", kind="static-nobundle")]
diff --git a/src/test/ui/feature-gates/feature-gate-type_ascription.rs b/src/test/ui/feature-gates/feature-gate-type_ascription.rs
index e42e340..7a59715 100644
--- a/src/test/ui/feature-gates/feature-gate-type_ascription.rs
+++ b/src/test/ui/feature-gates/feature-gate-type_ascription.rs
@@ -1,4 +1,4 @@
-// Type ascription is feature gated
+// Type ascription is unstable
fn main() {
let a = 10: u8; //~ ERROR type ascription is experimental
diff --git a/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr b/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr
index 0d77fd4..14aea2d 100644
--- a/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr
+++ b/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr
@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in `for` loop binding: `&std::i32::MIN..=0i32` not covered
+error[E0005]: refutable pattern in `for` loop binding: `&std::i32::MIN..=0i32` and `&2i32..=std::i32::MAX` not covered
--> $DIR/for-loop-refutable-pattern-error-message.rs:2:9
|
LL | for &1 in [1].iter() {}
- | ^^ pattern `&std::i32::MIN..=0i32` not covered
+ | ^^ patterns `&std::i32::MIN..=0i32` and `&2i32..=std::i32::MAX` not covered
error: aborting due to previous error
diff --git a/src/test/ui/generic/generic-extern.stderr b/src/test/ui/generic/generic-extern.stderr
index e7625ab..c90215b 100644
--- a/src/test/ui/generic/generic-extern.stderr
+++ b/src/test/ui/generic/generic-extern.stderr
@@ -4,7 +4,7 @@
LL | fn foo<T>();
| ^^^^^^^^^^^^ can't have type parameters
|
- = help: use specialization instead of type parameters by replacing them with concrete types like `u32`
+ = help: replace the type parameters with concrete types like `u32`
error: aborting due to previous error
diff --git a/src/test/ui/hrtb/issue-57639.rs b/src/test/ui/hrtb/issue-57639.rs
index 4bcaef3..392e723 100644
--- a/src/test/ui/hrtb/issue-57639.rs
+++ b/src/test/ui/hrtb/issue-57639.rs
@@ -10,7 +10,7 @@
//
// See [this comment on GitHub][c] for more details.
//
-// run-pass
+// check-pass
//
// [c]: https://github.com/rust-lang/rust/issues/57639#issuecomment-455685861
diff --git a/src/test/ui/hygiene/auxiliary/not-libstd.rs b/src/test/ui/hygiene/auxiliary/not-libstd.rs
new file mode 100644
index 0000000..babba29
--- /dev/null
+++ b/src/test/ui/hygiene/auxiliary/not-libstd.rs
@@ -0,0 +1 @@
+pub fn not_in_lib_std() {}
diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr
index 643f803..8fa55d0 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.stderr
+++ b/src/test/ui/hygiene/no_implicit_prelude.stderr
@@ -22,7 +22,7 @@
| ------------ in this macro invocation
...
LL | ().clone()
- | ^^^^^
+ | ^^^^^ method not found in `()`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/hygiene/prelude-import-hygiene.rs b/src/test/ui/hygiene/prelude-import-hygiene.rs
new file mode 100644
index 0000000..51e7bed
--- /dev/null
+++ b/src/test/ui/hygiene/prelude-import-hygiene.rs
@@ -0,0 +1,29 @@
+// Make sure that attribute used when injecting the prelude are resolved
+// hygienically.
+
+// check-pass
+// aux-build:not-libstd.rs
+
+//revisions: rust2015 rust2018
+//[rust2018] edition:2018
+
+// The prelude import shouldn't see these as candidates for when it's trying to
+// use the built-in macros.
+extern crate core;
+use core::prelude::v1::test as prelude_import;
+use core::prelude::v1::test as macro_use;
+
+// Should not be used for the prelude import - not a concern in the 2015 edition
+// because `std` is already declared in the crate root.
+#[cfg(rust2018)]
+extern crate not_libstd as std;
+
+#[cfg(rust2018)]
+mod x {
+ // The extern crate item should override `std` in the extern prelude.
+ fn f() {
+ std::not_in_lib_std();
+ }
+}
+
+fn main() {}
diff --git a/src/test/ui/hygiene/trait_items.stderr b/src/test/ui/hygiene/trait_items.stderr
index 4192b97..39e3252 100644
--- a/src/test/ui/hygiene/trait_items.stderr
+++ b/src/test/ui/hygiene/trait_items.stderr
@@ -5,7 +5,7 @@
| ------------ in this macro invocation
...
LL | pub macro m() { ().f() }
- | ^
+ | ^ method not found in `()`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/if-ret.stderr b/src/test/ui/if-ret.stderr
new file mode 100644
index 0000000..73402e5
--- /dev/null
+++ b/src/test/ui/if-ret.stderr
@@ -0,0 +1,8 @@
+warning: unreachable block in `if` expression
+ --> $DIR/if-ret.rs:6:24
+ |
+LL | fn foo() { if (return) { } }
+ | ^^^
+ |
+ = note: `#[warn(unreachable_code)]` on by default
+
diff --git a/src/test/ui/impl-trait/bindings-opaque.stderr b/src/test/ui/impl-trait/bindings-opaque.stderr
index ad10817..644d26b 100644
--- a/src/test/ui/impl-trait/bindings-opaque.stderr
+++ b/src/test/ui/impl-trait/bindings-opaque.stderr
@@ -10,19 +10,19 @@
--> $DIR/bindings-opaque.rs:11:17
|
LL | let _ = FOO.count_ones();
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ method not found in `impl std::marker::Copy`
error[E0599]: no method named `count_ones` found for type `impl std::marker::Copy` in the current scope
--> $DIR/bindings-opaque.rs:13:17
|
LL | let _ = BAR.count_ones();
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ method not found in `impl std::marker::Copy`
error[E0599]: no method named `count_ones` found for type `impl std::marker::Copy` in the current scope
--> $DIR/bindings-opaque.rs:15:17
|
LL | let _ = foo.count_ones();
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ method not found in `impl std::marker::Copy`
error: aborting due to 3 previous errors
diff --git a/src/test/ui/impl-trait/closure-calling-parent-fn.rs b/src/test/ui/impl-trait/closure-calling-parent-fn.rs
index 58d7875..9dab334 100644
--- a/src/test/ui/impl-trait/closure-calling-parent-fn.rs
+++ b/src/test/ui/impl-trait/closure-calling-parent-fn.rs
@@ -5,7 +5,7 @@
// `foo` and hence is treated opaquely within the closure body. This
// resulted in a failed subtype relationship.
//
-// run-pass
+// check-pass
fn foo() -> impl Copy { || foo(); }
fn bar() -> impl Copy { || bar(); }
diff --git a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr b/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
index 666418f..441191b 100644
--- a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
+++ b/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
@@ -5,7 +5,7 @@
| ----------- method `foo` not found for this
...
LL | f1.foo(1usize);
- | ^^^
+ | ^^^ method not found in `Bar`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `foo`, perhaps you need to implement it:
diff --git a/src/test/ui/impl-trait/issues/issue-53457.rs b/src/test/ui/impl-trait/issues/issue-53457.rs
index de8c579..3f97502 100644
--- a/src/test/ui/impl-trait/issues/issue-53457.rs
+++ b/src/test/ui/impl-trait/issues/issue-53457.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![feature(type_alias_impl_trait)]
@@ -9,7 +9,7 @@
}
fn foo() -> X {
- bar(|x| ())
+ bar(|_| ())
}
fn main() {}
diff --git a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr b/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
index afb33766..fb870d6 100644
--- a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
+++ b/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr
@@ -5,7 +5,7 @@
| ----------- method `is_empty` not found for this
...
LL | foo(|s| s.is_empty());
- | ^^^^^^^^
+ | ^^^^^^^^ method not found in `Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `is_empty`, perhaps you need to implement it:
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs b/src/test/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs
index 2da3886..3911769 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs
+++ b/src/test/ui/impl-trait/multiple-lifetimes/inverse-bounds.rs
@@ -1,5 +1,5 @@
// edition:2018
-// run-pass
+// check-pass
// revisions: migrate mir
//[mir]compile-flags: -Z borrowck=mir
diff --git a/src/test/ui/impl-trait/needs_least_region_or_bound.rs b/src/test/ui/impl-trait/needs_least_region_or_bound.rs
index 52475f6..3c8682b 100644
--- a/src/test/ui/impl-trait/needs_least_region_or_bound.rs
+++ b/src/test/ui/impl-trait/needs_least_region_or_bound.rs
@@ -1,9 +1,7 @@
-// run-pass
+// check-pass
#![feature(member_constraints)]
-use std::fmt::Debug;
-
trait MultiRegionTrait<'a, 'b> {}
impl<'a, 'b> MultiRegionTrait<'a, 'b> for (&'a u32, &'b u32) {}
diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
index 002b60f..be8f3ab 100644
--- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr
+++ b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
@@ -2,7 +2,7 @@
--> $DIR/no-method-suggested-traits.rs:23:10
|
LL | 1u32.method();
- | ^^^^^^
+ | ^^^^^^ method not found in `u32`
|
= help: items from traits can only be used if the trait is in scope
help: the following traits are implemented but not in scope, perhaps add a `use` for one of them:
@@ -20,7 +20,7 @@
--> $DIR/no-method-suggested-traits.rs:26:44
|
LL | std::rc::Rc::new(&mut Box::new(&1u32)).method();
- | ^^^^^^
+ | ^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&u32>>`
|
= help: items from traits can only be used if the trait is in scope
help: the following traits are implemented but not in scope, perhaps add a `use` for one of them:
@@ -38,7 +38,7 @@
--> $DIR/no-method-suggested-traits.rs:30:9
|
LL | 'a'.method();
- | ^^^^^^
+ | ^^^^^^ method not found in `char`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -58,7 +58,7 @@
| the method is available for `std::rc::Rc<std::rc::Rc<&mut std::boxed::Box<&char>>>` here
...
LL | std::rc::Rc::new(&mut Box::new(&'a')).method();
- | ^^^^^^
+ | ^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&char>>`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -70,7 +70,7 @@
--> $DIR/no-method-suggested-traits.rs:35:10
|
LL | 1i32.method();
- | ^^^^^^
+ | ^^^^^^ method not found in `i32`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -82,7 +82,7 @@
--> $DIR/no-method-suggested-traits.rs:37:44
|
LL | std::rc::Rc::new(&mut Box::new(&1i32)).method();
- | ^^^^^^
+ | ^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&i32>>`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -97,7 +97,7 @@
| ----------- method `method` not found for this
...
LL | Foo.method();
- | ^^^^^^
+ | ^^^^^^ method not found in `Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following traits define an item `method`, perhaps you need to implement one of them:
@@ -110,7 +110,7 @@
--> $DIR/no-method-suggested-traits.rs:42:43
|
LL | std::rc::Rc::new(&mut Box::new(&Foo)).method();
- | ^^^^^^
+ | ^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&Foo>>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following traits define an item `method`, perhaps you need to implement one of them:
@@ -123,7 +123,7 @@
--> $DIR/no-method-suggested-traits.rs:45:10
|
LL | 1u64.method2();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `u64`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -133,7 +133,7 @@
--> $DIR/no-method-suggested-traits.rs:47:44
|
LL | std::rc::Rc::new(&mut Box::new(&1u64)).method2();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&u64>>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -143,7 +143,7 @@
--> $DIR/no-method-suggested-traits.rs:50:37
|
LL | no_method_suggested_traits::Foo.method2();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `no_method_suggested_traits::Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -153,7 +153,7 @@
--> $DIR/no-method-suggested-traits.rs:52:71
|
LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method2();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -163,7 +163,7 @@
--> $DIR/no-method-suggested-traits.rs:54:40
|
LL | no_method_suggested_traits::Bar::X.method2();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `no_method_suggested_traits::Bar`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -173,7 +173,7 @@
--> $DIR/no-method-suggested-traits.rs:56:74
|
LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method2();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -186,7 +186,7 @@
| ----------- method `method3` not found for this
...
LL | Foo.method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method3`, perhaps you need to implement it:
@@ -196,7 +196,7 @@
--> $DIR/no-method-suggested-traits.rs:61:43
|
LL | std::rc::Rc::new(&mut Box::new(&Foo)).method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&Foo>>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method3`, perhaps you need to implement it:
@@ -209,7 +209,7 @@
| -------- method `method3` not found for this
...
LL | Bar::X.method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `Bar`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method3`, perhaps you need to implement it:
@@ -219,7 +219,7 @@
--> $DIR/no-method-suggested-traits.rs:65:46
|
LL | std::rc::Rc::new(&mut Box::new(&Bar::X)).method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&Bar>>`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `method3`, perhaps you need to implement it:
@@ -229,37 +229,37 @@
--> $DIR/no-method-suggested-traits.rs:69:13
|
LL | 1_usize.method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `usize`
error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&usize>>` in the current scope
--> $DIR/no-method-suggested-traits.rs:70:47
|
LL | std::rc::Rc::new(&mut Box::new(&1_usize)).method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&usize>>`
error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Foo` in the current scope
--> $DIR/no-method-suggested-traits.rs:71:37
|
LL | no_method_suggested_traits::Foo.method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `no_method_suggested_traits::Foo`
error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope
--> $DIR/no-method-suggested-traits.rs:72:71
|
LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>`
error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Bar` in the current scope
--> $DIR/no-method-suggested-traits.rs:74:40
|
LL | no_method_suggested_traits::Bar::X.method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `no_method_suggested_traits::Bar`
error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>` in the current scope
--> $DIR/no-method-suggested-traits.rs:75:74
|
LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method3();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>`
error: aborting due to 24 previous errors
diff --git a/src/test/ui/imports/gensymed.rs b/src/test/ui/imports/gensymed.rs
index 613ccc0..7b53f0c 100644
--- a/src/test/ui/imports/gensymed.rs
+++ b/src/test/ui/imports/gensymed.rs
@@ -1,7 +1,9 @@
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
// edition:2018
// aux-build:gensymed.rs
extern crate gensymed;
+use gensymed::*;
+
fn main() {}
diff --git a/src/test/ui/imports/unresolved-imports-used.rs b/src/test/ui/imports/unresolved-imports-used.rs
index d1461e7..75cf880 100644
--- a/src/test/ui/imports/unresolved-imports-used.rs
+++ b/src/test/ui/imports/unresolved-imports-used.rs
@@ -1,12 +1,18 @@
-// There should be *no* unused import errors.
+// There should be *one* unused import error.
#![deny(unused_imports)]
mod qux {
fn quz() {}
+ pub fn quy() {}
}
-use qux::quz; //~ ERROR function `quz` is private
-use qux::bar; //~ ERROR unresolved import `qux::bar`
-use foo::bar; //~ ERROR unresolved import `foo`
+use qux::quz; //~ ERROR function `quz` is private
+use qux::bar; //~ ERROR unresolved import `qux::bar`
+use foo::bar; //~ ERROR unresolved import `foo`
+use baz::*; //~ ERROR unresolved import `baz`
+use qux::bar2; //~ ERROR unresolved import `qux::bar2`
+use foo2::bar2;//~ ERROR unresolved import `foo2`
+use baz2::*; //~ ERROR unresolved import `baz2`
+use qux::quy; //~ ERROR unused import
fn main() {}
diff --git a/src/test/ui/imports/unresolved-imports-used.stderr b/src/test/ui/imports/unresolved-imports-used.stderr
index e8c827a..b341e8e 100644
--- a/src/test/ui/imports/unresolved-imports-used.stderr
+++ b/src/test/ui/imports/unresolved-imports-used.stderr
@@ -1,22 +1,58 @@
error[E0432]: unresolved import `qux::bar`
- --> $DIR/unresolved-imports-used.rs:9:5
+ --> $DIR/unresolved-imports-used.rs:10:5
|
LL | use qux::bar;
| ^^^^^^^^ no `bar` in `qux`
+error[E0432]: unresolved import `qux::bar2`
+ --> $DIR/unresolved-imports-used.rs:13:5
+ |
+LL | use qux::bar2;
+ | ^^^^^^^^^ no `bar2` in `qux`
+
error[E0432]: unresolved import `foo`
- --> $DIR/unresolved-imports-used.rs:10:5
+ --> $DIR/unresolved-imports-used.rs:11:5
|
LL | use foo::bar;
| ^^^ maybe a missing crate `foo`?
+error[E0432]: unresolved import `baz`
+ --> $DIR/unresolved-imports-used.rs:12:5
+ |
+LL | use baz::*;
+ | ^^^ maybe a missing crate `baz`?
+
+error[E0432]: unresolved import `foo2`
+ --> $DIR/unresolved-imports-used.rs:14:5
+ |
+LL | use foo2::bar2;
+ | ^^^^ maybe a missing crate `foo2`?
+
+error[E0432]: unresolved import `baz2`
+ --> $DIR/unresolved-imports-used.rs:15:5
+ |
+LL | use baz2::*;
+ | ^^^^ maybe a missing crate `baz2`?
+
error[E0603]: function `quz` is private
- --> $DIR/unresolved-imports-used.rs:8:10
+ --> $DIR/unresolved-imports-used.rs:9:10
|
LL | use qux::quz;
| ^^^
-error: aborting due to 3 previous errors
+error: unused import: `qux::quy`
+ --> $DIR/unresolved-imports-used.rs:16:5
+ |
+LL | use qux::quy;
+ | ^^^^^^^^
+ |
+note: lint level defined here
+ --> $DIR/unresolved-imports-used.rs:2:9
+ |
+LL | #![deny(unused_imports)]
+ | ^^^^^^^^^^^^^^
+
+error: aborting due to 8 previous errors
Some errors have detailed explanations: E0432, E0603.
For more information about an error, try `rustc --explain E0432`.
diff --git a/src/test/ui/inaccessible-test-modules.rs b/src/test/ui/inaccessible-test-modules.rs
deleted file mode 100644
index 7095ec2..0000000
--- a/src/test/ui/inaccessible-test-modules.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags:--test
-
-// the `--test` harness creates modules with these textual names, but
-// they should be inaccessible from normal code.
-use __test as x; //~ ERROR unresolved import `__test`
-use __test_reexports as y; //~ ERROR unresolved import `__test_reexports`
-
-#[test]
-fn baz() {}
diff --git a/src/test/ui/inaccessible-test-modules.stderr b/src/test/ui/inaccessible-test-modules.stderr
deleted file mode 100644
index b6a817e..0000000
--- a/src/test/ui/inaccessible-test-modules.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0432]: unresolved import `__test`
- --> $DIR/inaccessible-test-modules.rs:5:5
- |
-LL | use __test as x;
- | ------^^^^^
- | |
- | no `__test` in the root
- | help: a similar name exists in the module: `test`
-
-error[E0432]: unresolved import `__test_reexports`
- --> $DIR/inaccessible-test-modules.rs:6:5
- |
-LL | use __test_reexports as y;
- | ----------------^^^^^
- | |
- | no `__test_reexports` in the root
- | help: a similar name exists in the module: `__test_reexports`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/infinite/infinite-autoderef.stderr b/src/test/ui/infinite/infinite-autoderef.stderr
index 3159a4b..a2ad58a7 100644
--- a/src/test/ui/infinite/infinite-autoderef.stderr
+++ b/src/test/ui/infinite/infinite-autoderef.stderr
@@ -44,7 +44,7 @@
| ----------- method `bar` not found for this
...
LL | Foo.bar();
- | ^^^
+ | ^^^ method not found in `Foo`
error: aborting due to 6 previous errors
diff --git a/src/test/ui/issues/issue-10465.stderr b/src/test/ui/issues/issue-10465.stderr
index 6efbd8e..413daa6 100644
--- a/src/test/ui/issues/issue-10465.stderr
+++ b/src/test/ui/issues/issue-10465.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-10465.rs:17:15
|
LL | b.foo();
- | ^^^
+ | ^^^ method not found in `&b::B`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/issues/issue-13853.stderr b/src/test/ui/issues/issue-13853.stderr
index 9026845..c57ca3e 100644
--- a/src/test/ui/issues/issue-13853.stderr
+++ b/src/test/ui/issues/issue-13853.stderr
@@ -14,7 +14,7 @@
--> $DIR/issue-13853.rs:27:23
|
LL | for node in graph.iter() {
- | ^^^^
+ | ^^^^ method not found in `&G`
error[E0308]: mismatched types
--> $DIR/issue-13853.rs:37:13
diff --git a/src/test/ui/issues/issue-14309.rs b/src/test/ui/issues/issue-14309.rs
index d0e532a..328a4c9 100644
--- a/src/test/ui/issues/issue-14309.rs
+++ b/src/test/ui/issues/issue-14309.rs
@@ -27,7 +27,7 @@
}
extern "C" {
- fn foo(x: A); //~ ERROR type `A` which is not FFI-safe
+ fn foo(x: A); //~ ERROR type `A`, which is not FFI-safe
fn bar(x: B); //~ ERROR type `A`
fn baz(x: C);
fn qux(x: A2); //~ ERROR type `A`
diff --git a/src/test/ui/issues/issue-14309.stderr b/src/test/ui/issues/issue-14309.stderr
index e049109..f598e1f 100644
--- a/src/test/ui/issues/issue-14309.stderr
+++ b/src/test/ui/issues/issue-14309.stderr
@@ -1,8 +1,8 @@
-error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:30:15
|
LL | fn foo(x: A);
- | ^
+ | ^ not FFI-safe
|
note: lint level defined here
--> $DIR/issue-14309.rs:1:9
@@ -10,6 +10,7 @@
LL | #![deny(improper_ctypes)]
| ^^^^^^^^^^^^^^^
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/issue-14309.rs:4:1
|
@@ -18,13 +19,14 @@
LL | | }
| |_^
-error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:31:15
|
LL | fn bar(x: B);
- | ^
+ | ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/issue-14309.rs:4:1
|
@@ -33,13 +35,14 @@
LL | | }
| |_^
-error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:33:15
|
LL | fn qux(x: A2);
- | ^^
+ | ^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/issue-14309.rs:4:1
|
@@ -48,13 +51,14 @@
LL | | }
| |_^
-error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:34:16
|
LL | fn quux(x: B2);
- | ^^
+ | ^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/issue-14309.rs:4:1
|
@@ -63,13 +67,14 @@
LL | | }
| |_^
-error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:36:16
|
LL | fn fred(x: D);
- | ^
+ | ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/issue-14309.rs:4:1
|
diff --git a/src/test/ui/issues/issue-15207.stderr b/src/test/ui/issues/issue-15207.stderr
index 2d90eb8..25ce7cb 100644
--- a/src/test/ui/issues/issue-15207.stderr
+++ b/src/test/ui/issues/issue-15207.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-15207.rs:3:15
|
LL | break.push(1)
- | ^^^^
+ | ^^^^ method not found in `!`
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-15381.rs b/src/test/ui/issues/issue-15381.rs
index 4c8e1b4..5307153 100644
--- a/src/test/ui/issues/issue-15381.rs
+++ b/src/test/ui/issues/issue-15381.rs
@@ -2,7 +2,7 @@
let values: Vec<u8> = vec![1,2,3,4,5,6,7,8];
for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
- //~^ ERROR refutable pattern in `for` loop binding: `&[]` not covered
+ //~^ ERROR refutable pattern in `for` loop binding: `&[]`, `&[_]`, `&[_, _]` and 1 more not
println!("y={}", y);
//~^ ERROR borrow of possibly-uninitialized variable: `y`
}
diff --git a/src/test/ui/issues/issue-15381.stderr b/src/test/ui/issues/issue-15381.stderr
index e810605..47a0d51 100644
--- a/src/test/ui/issues/issue-15381.stderr
+++ b/src/test/ui/issues/issue-15381.stderr
@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in `for` loop binding: `&[]` not covered
+error[E0005]: refutable pattern in `for` loop binding: `&[]`, `&[_]`, `&[_, _]` and 1 more not covered
--> $DIR/issue-15381.rs:4:9
|
LL | for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
- | ^^^^^^^^ pattern `&[]` not covered
+ | ^^^^^^^^ patterns `&[]`, `&[_]`, `&[_, _]` and 1 more not covered
error[E0381]: borrow of possibly-uninitialized variable: `y`
--> $DIR/issue-15381.rs:6:26
diff --git a/src/test/ui/issues/issue-15783.rs b/src/test/ui/issues/issue-15783.rs
index 77eae91..5189f55 100644
--- a/src/test/ui/issues/issue-15783.rs
+++ b/src/test/ui/issues/issue-15783.rs
@@ -6,9 +6,9 @@
let name = "Foo";
let x = Some(&[name]);
let msg = foo(x);
-//~^ ERROR mismatched types
-//~| expected type `std::option::Option<&[&str]>`
-//~| found type `std::option::Option<&[&str; 1]>`
-//~| expected slice, found array of 1 elements
+ //~^ ERROR mismatched types
+ //~| expected type `std::option::Option<&[&str]>`
+ //~| found type `std::option::Option<&[&str; 1]>`
+ //~| expected slice, found array of 1 element
assert_eq!(msg, 3);
}
diff --git a/src/test/ui/issues/issue-15783.stderr b/src/test/ui/issues/issue-15783.stderr
index 595fe40..1d54b28 100644
--- a/src/test/ui/issues/issue-15783.stderr
+++ b/src/test/ui/issues/issue-15783.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-15783.rs:8:19
|
LL | let msg = foo(x);
- | ^ expected slice, found array of 1 elements
+ | ^ expected slice, found array of 1 element
|
= note: expected type `std::option::Option<&[&str]>`
found type `std::option::Option<&[&str; 1]>`
diff --git a/src/test/ui/issues/issue-16250.rs b/src/test/ui/issues/issue-16250.rs
index bf01627..a3c6751 100644
--- a/src/test/ui/issues/issue-16250.rs
+++ b/src/test/ui/issues/issue-16250.rs
@@ -3,7 +3,7 @@
pub struct Foo;
extern {
- pub fn foo(x: (Foo)); //~ ERROR unspecified layout
+ pub fn foo(x: (Foo)); //~ ERROR `extern` block uses type `Foo`
}
fn main() {
diff --git a/src/test/ui/issues/issue-16250.stderr b/src/test/ui/issues/issue-16250.stderr
index f3686e8..5686ac3 100644
--- a/src/test/ui/issues/issue-16250.stderr
+++ b/src/test/ui/issues/issue-16250.stderr
@@ -1,8 +1,8 @@
-error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `Foo`, which is not FFI-safe
--> $DIR/issue-16250.rs:6:20
|
LL | pub fn foo(x: (Foo));
- | ^^^
+ | ^^^ not FFI-safe
|
note: lint level defined here
--> $DIR/issue-16250.rs:1:9
@@ -11,6 +11,7 @@
| ^^^^^^^^
= note: `#[deny(improper_ctypes)]` implied by `#[deny(warnings)]`
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/issue-16250.rs:3:1
|
diff --git a/src/test/ui/issues/issue-1871.stderr b/src/test/ui/issues/issue-1871.stderr
index fecd689..b774ca2 100644
--- a/src/test/ui/issues/issue-1871.stderr
+++ b/src/test/ui/issues/issue-1871.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-1871.rs:7:9
|
LL | f.honk()
- | ^^^^
+ | ^^^^ method not found in `{integer}`
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-19521.stderr b/src/test/ui/issues/issue-19521.stderr
index a43368b..c15c539 100644
--- a/src/test/ui/issues/issue-19521.stderr
+++ b/src/test/ui/issues/issue-19521.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-19521.rs:2:8
|
LL | "".homura()();
- | ^^^^^^
+ | ^^^^^^ method not found in `&'static str`
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-19692.stderr b/src/test/ui/issues/issue-19692.stderr
index 5e576f1..fe920c1 100644
--- a/src/test/ui/issues/issue-19692.stderr
+++ b/src/test/ui/issues/issue-19692.stderr
@@ -5,7 +5,7 @@
| -------------- method `kaname` not found for this
...
LL | let Some(ref madoka) = Some(homura.kaname());
- | ^^^^^^
+ | ^^^^^^ method not found in `Homura`
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-2149.stderr b/src/test/ui/issues/issue-2149.stderr
index 1df32aa..8ce2ba0 100644
--- a/src/test/ui/issues/issue-2149.stderr
+++ b/src/test/ui/issues/issue-2149.stderr
@@ -10,7 +10,7 @@
--> $DIR/issue-2149.rs:13:12
|
LL | ["hi"].bind(|x| [x] );
- | ^^^^
+ | ^^^^ method not found in `[&str; 1]`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `bind`, perhaps you need to implement it:
diff --git a/src/test/ui/issues/issue-21596.stderr b/src/test/ui/issues/issue-21596.stderr
index 8e4e09b..4e5cace 100644
--- a/src/test/ui/issues/issue-21596.stderr
+++ b/src/test/ui/issues/issue-21596.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-21596.rs:4:22
|
LL | println!("{}", z.to_string());
- | ^^^^^^^^^
+ | ^^^^^^^^^ method not found in `*const u8`
|
= note: try using `<*const T>::as_ref()` to get a reference to the type behind the pointer: https://doc.rust-lang.org/std/primitive.pointer.html#method.as_ref
= note: using `<*const T>::as_ref()` on a pointer which is unaligned or points to invalid or uninitialized memory is undefined behavior
diff --git a/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
index 48362d0..7253d35 100644
--- a/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
+++ b/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
@@ -5,8 +5,6 @@
// See further discussion on rust-lang/rust#24535,
// rust-lang/rfcs#1006, and rust-lang/rfcs#107
-#![feature(bind_by_move_pattern_guards)]
-
fn main() {
rust_issue_24535();
rfcs_issue_1006_1();
diff --git a/src/test/ui/issues/issue-25385.stderr b/src/test/ui/issues/issue-25385.stderr
index e170a9d..ab4db7e 100644
--- a/src/test/ui/issues/issue-25385.stderr
+++ b/src/test/ui/issues/issue-25385.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-25385.rs:2:23
|
LL | ($e:expr) => { $e.foo() }
- | ^^^
+ | ^^^ method not found in `i32`
...
LL | foo!(a);
| -------- in this macro invocation
@@ -11,7 +11,7 @@
--> $DIR/issue-25385.rs:10:15
|
LL | foo!(1i32.foo());
- | ^^^
+ | ^^^ method not found in `i32`
error: aborting due to 2 previous errors
diff --git a/src/test/ui/issues/issue-26448-2.rs b/src/test/ui/issues/issue-26448-2.rs
index 17e7c1f..c60e06c 100644
--- a/src/test/ui/issues/issue-26448-2.rs
+++ b/src/test/ui/issues/issue-26448-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
pub struct Bar<T> {
items: Vec<&'static str>,
diff --git a/src/test/ui/issues/issue-26448-3.rs b/src/test/ui/issues/issue-26448-3.rs
index e57352e..d48022c 100644
--- a/src/test/ui/issues/issue-26448-3.rs
+++ b/src/test/ui/issues/issue-26448-3.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
pub struct Item {
_inner: &'static str,
diff --git a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs
index 1ffb7f6..82d8b9e 100644
--- a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs
+++ b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs
@@ -5,8 +5,6 @@
// reject it. But I want to make sure that we continue to reject it
// (under NLL) even when that conservaive check goes away.
-#![feature(bind_by_move_pattern_guards)]
-
fn main() {
let mut b = &mut true;
match b {
diff --git a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr
index a8eb78b..f0264b5 100644
--- a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr
+++ b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr
@@ -1,5 +1,5 @@
error[E0596]: cannot borrow `r` as mutable, as it is immutable for the pattern guard
- --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:14:25
+ --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:12:25
|
LL | ref mut r if { (|| { let bar = &mut *r; **bar = false; })();
| ^^ - mutable borrow occurs due to use of `r` in closure
diff --git a/src/test/ui/issues/issue-27697.rs b/src/test/ui/issues/issue-27697.rs
index 8307001..12af8a8 100644
--- a/src/test/ui/issues/issue-27697.rs
+++ b/src/test/ui/issues/issue-27697.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
use std::ops::Deref;
diff --git a/src/test/ui/issues/issue-2823.stderr b/src/test/ui/issues/issue-2823.stderr
index 4c1dfb8..c9ede03 100644
--- a/src/test/ui/issues/issue-2823.stderr
+++ b/src/test/ui/issues/issue-2823.stderr
@@ -5,7 +5,7 @@
| -------- method `clone` not found for this
...
LL | let _d = c.clone();
- | ^^^^^
+ | ^^^^^ method not found in `C`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `clone`, perhaps you need to implement it:
diff --git a/src/test/ui/issues/issue-29124.stderr b/src/test/ui/issues/issue-29124.stderr
index 3beb728..c537c61 100644
--- a/src/test/ui/issues/issue-29124.stderr
+++ b/src/test/ui/issues/issue-29124.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-29124.rs:15:15
|
LL | Obj::func.x();
- | ^
+ | ^ method not found in `fn() -> Ret {Obj::func}`
|
= note: Obj::func is a function, perhaps you wish to call it
@@ -10,7 +10,7 @@
--> $DIR/issue-29124.rs:17:10
|
LL | func.x();
- | ^
+ | ^ method not found in `fn() -> Ret {func}`
|
= note: func is a function, perhaps you wish to call it
diff --git a/src/test/ui/issues/issue-29181.stderr b/src/test/ui/issues/issue-29181.stderr
index 0920142..250b158 100644
--- a/src/test/ui/issues/issue-29181.stderr
+++ b/src/test/ui/issues/issue-29181.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-29181.rs:6:7
|
LL | 0.homura();
- | ^^^^^^
+ | ^^^^^^ method not found in `{integer}`
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr
index 3ca8338..6d03b78 100644
--- a/src/test/ui/issues/issue-31173.stderr
+++ b/src/test/ui/issues/issue-31173.stderr
@@ -11,7 +11,7 @@
--> $DIR/issue-31173.rs:14:10
|
LL | .collect();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>>`
|
= note: the method `collect` exists but the following trait bounds were not satisfied:
`&mut std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>> : std::iter::Iterator`
diff --git a/src/test/ui/issues/issue-31561.rs b/src/test/ui/issues/issue-31561.rs
index 87b19fe5..813b240 100644
--- a/src/test/ui/issues/issue-31561.rs
+++ b/src/test/ui/issues/issue-31561.rs
@@ -6,5 +6,5 @@
fn main() {
let Thing::Foo(y) = Thing::Foo(1);
- //~^ ERROR refutable pattern in local binding: `Bar` not covered
+ //~^ ERROR refutable pattern in local binding: `Bar` and `Baz` not covered
}
diff --git a/src/test/ui/issues/issue-31561.stderr b/src/test/ui/issues/issue-31561.stderr
index 246137a..9ec26b0 100644
--- a/src/test/ui/issues/issue-31561.stderr
+++ b/src/test/ui/issues/issue-31561.stderr
@@ -1,15 +1,17 @@
-error[E0005]: refutable pattern in local binding: `Bar` not covered
+error[E0005]: refutable pattern in local binding: `Bar` and `Baz` not covered
--> $DIR/issue-31561.rs:8:9
|
LL | / enum Thing {
LL | | Foo(u8),
LL | | Bar,
+ | | --- not covered
LL | | Baz
+ | | --- not covered
LL | | }
| |_- `Thing` defined here
...
LL | let Thing::Foo(y) = Thing::Foo(1);
- | ^^^^^^^^^^^^^ pattern `Bar` not covered
+ | ^^^^^^^^^^^^^ patterns `Bar` and `Baz` not covered
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-34334.stderr b/src/test/ui/issues/issue-34334.stderr
index 7f89caf..8d52e08 100644
--- a/src/test/ui/issues/issue-34334.stderr
+++ b/src/test/ui/issues/issue-34334.stderr
@@ -45,7 +45,7 @@
--> $DIR/issue-34334.rs:9:36
|
LL | let sr2: Vec<(u32, _, _)> = sr.iter().map(|(faction, th_sender, th_receiver)| {}).collect();
- | ^^^^
+ | ^^^^ method not found in `()`
error: aborting due to 7 previous errors
diff --git a/src/test/ui/issues/issue-35677.stderr b/src/test/ui/issues/issue-35677.stderr
index 99d99db..b381203 100644
--- a/src/test/ui/issues/issue-35677.stderr
+++ b/src/test/ui/issues/issue-35677.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-35677.rs:4:10
|
LL | this.is_subset(other)
- | ^^^^^^^^^
+ | ^^^^^^^^^ method not found in `&std::collections::HashSet<T>`
|
= note: the method `is_subset` exists but the following trait bounds were not satisfied:
`T : std::cmp::Eq`
diff --git a/src/test/ui/issues/issue-36836.rs b/src/test/ui/issues/issue-36836.rs
new file mode 100644
index 0000000..99c5621
--- /dev/null
+++ b/src/test/ui/issues/issue-36836.rs
@@ -0,0 +1,15 @@
+// Previously, in addition to the real cause of the problem as seen below,
+// the compiler would tell the user:
+//
+// ```
+// error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or
+// predicates
+// ```
+//
+// With this test, we check that only the relevant error is emitted.
+
+trait Foo {}
+
+impl<T> Foo for Bar<T> {} //~ ERROR cannot find type `Bar` in this scope
+
+fn main() {}
diff --git a/src/test/ui/issues/issue-36836.stderr b/src/test/ui/issues/issue-36836.stderr
new file mode 100644
index 0000000..418194f
--- /dev/null
+++ b/src/test/ui/issues/issue-36836.stderr
@@ -0,0 +1,9 @@
+error[E0412]: cannot find type `Bar` in this scope
+ --> $DIR/issue-36836.rs:13:17
+ |
+LL | impl<T> Foo for Bar<T> {}
+ | ^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/issues/issue-38591.rs b/src/test/ui/issues/issue-38591.rs
index 7aa71f8..2f594b4 100644
--- a/src/test/ui/issues/issue-38591.rs
+++ b/src/test/ui/issues/issue-38591.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
struct S<T> {
t : T,
diff --git a/src/test/ui/issues/issue-39175.stderr b/src/test/ui/issues/issue-39175.stderr
index 108c969..66680b9 100644
--- a/src/test/ui/issues/issue-39175.stderr
+++ b/src/test/ui/issues/issue-39175.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-39175.rs:15:39
|
LL | Command::new("echo").arg("hello").exec();
- | ^^^^
+ | ^^^^ method not found in `&mut std::process::Command`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/issues/issue-41880.stderr b/src/test/ui/issues/issue-41880.stderr
index 359a234..0e1d55c 100644
--- a/src/test/ui/issues/issue-41880.stderr
+++ b/src/test/ui/issues/issue-41880.stderr
@@ -5,7 +5,7 @@
| ------------------------ method `iter` not found for this
...
LL | println!("{:?}", a.iter().take(10).collect::<Vec<usize>>());
- | ^^^^
+ | ^^^^ method not found in `Iterate<{integer}, [closure@$DIR/issue-41880.rs:26:24: 26:31]>`
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-43189.stderr b/src/test/ui/issues/issue-43189.stderr
index e364650..33c3f18 100644
--- a/src/test/ui/issues/issue-43189.stderr
+++ b/src/test/ui/issues/issue-43189.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-43189.rs:10:8
|
LL | ().a();
- | ^
+ | ^ method not found in `()`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/issues/issue-43806.rs b/src/test/ui/issues/issue-43806.rs
index cbfbfa3..8c8cccf 100644
--- a/src/test/ui/issues/issue-43806.rs
+++ b/src/test/ui/issues/issue-43806.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
#![deny(unused_results)]
diff --git a/src/test/ui/issues/issue-48132.rs b/src/test/ui/issues/issue-48132.rs
index ea325ea..f564aef 100644
--- a/src/test/ui/issues/issue-48132.rs
+++ b/src/test/ui/issues/issue-48132.rs
@@ -3,6 +3,8 @@
// run-pass
+#![allow(dead_code)]
+
struct Inner<I, V> {
iterator: I,
item: V,
diff --git a/src/test/ui/issues/issue-48179.rs b/src/test/ui/issues/issue-48179.rs
index 90e9858..f81203d 100644
--- a/src/test/ui/issues/issue-48179.rs
+++ b/src/test/ui/issues/issue-48179.rs
@@ -1,7 +1,7 @@
// Regression test for #48132. This was failing due to problems around
// the projection caching and dropck type enumeration.
-// run-pass
+// check-pass
pub struct Container<T: Iterator> {
value: Option<T::Item>,
diff --git a/src/test/ui/issues/issue-49934-errors.rs b/src/test/ui/issues/issue-49934-errors.rs
new file mode 100644
index 0000000..58f64d1
--- /dev/null
+++ b/src/test/ui/issues/issue-49934-errors.rs
@@ -0,0 +1,13 @@
+fn foo<#[derive(Debug)] T>() {
+//~^ ERROR `derive` may only be applied to structs, enums and unions
+//~| ERROR expected an inert attribute, found an attribute macro
+ match 0 {
+ #[derive(Debug)]
+ //~^ ERROR `derive` may only be applied to structs, enums and unions
+ //~| ERROR expected an inert attribute, found an attribute macro
+ _ => (),
+ }
+}
+
+fn main() {
+}
diff --git a/src/test/ui/issues/issue-49934-errors.stderr b/src/test/ui/issues/issue-49934-errors.stderr
new file mode 100644
index 0000000..fce1f65
--- /dev/null
+++ b/src/test/ui/issues/issue-49934-errors.stderr
@@ -0,0 +1,26 @@
+error: `derive` may only be applied to structs, enums and unions
+ --> $DIR/issue-49934-errors.rs:1:8
+ |
+LL | fn foo<#[derive(Debug)] T>() {
+ | ^^^^^^^^^^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/issue-49934-errors.rs:1:17
+ |
+LL | fn foo<#[derive(Debug)] T>() {
+ | ^^^^^
+
+error: `derive` may only be applied to structs, enums and unions
+ --> $DIR/issue-49934-errors.rs:5:9
+ |
+LL | #[derive(Debug)]
+ | ^^^^^^^^^^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/issue-49934-errors.rs:5:18
+ |
+LL | #[derive(Debug)]
+ | ^^^^^
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/issues/issue-49934.rs b/src/test/ui/issues/issue-49934.rs
index e75381a..262f493 100644
--- a/src/test/ui/issues/issue-49934.rs
+++ b/src/test/ui/issues/issue-49934.rs
@@ -1,15 +1,8 @@
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
#![feature(stmt_expr_attributes)]
#![warn(unused_attributes)] //~ NOTE lint level defined here
-fn foo<#[derive(Debug)] T>() { //~ WARN unused attribute
- match 0 {
- #[derive(Debug)] //~ WARN unused attribute
- _ => (),
- }
-}
-
fn main() {
// fold_stmt (Item)
#[allow(dead_code)]
diff --git a/src/test/ui/issues/issue-49934.stderr b/src/test/ui/issues/issue-49934.stderr
index 6ca751a..dbec379e3 100644
--- a/src/test/ui/issues/issue-49934.stderr
+++ b/src/test/ui/issues/issue-49934.stderr
@@ -1,5 +1,5 @@
warning: `#[derive]` does nothing on macro invocations
- --> $DIR/issue-49934.rs:20:5
+ --> $DIR/issue-49934.rs:13:5
|
LL | #[derive(Debug)]
| ^^^^^^^^^^^^^^^^
@@ -7,10 +7,10 @@
= note: this may become a hard error in a future release
warning: unused attribute
- --> $DIR/issue-49934.rs:6:8
+ --> $DIR/issue-49934.rs:19:5
|
-LL | fn foo<#[derive(Debug)] T>() {
- | ^^^^^^^^^^^^^^^^
+LL | #[derive(Debug)]
+ | ^^^^^^^^^^^^^^^^
|
note: lint level defined here
--> $DIR/issue-49934.rs:4:9
@@ -19,31 +19,19 @@
| ^^^^^^^^^^^^^^^^^
warning: unused attribute
- --> $DIR/issue-49934.rs:8:9
- |
-LL | #[derive(Debug)]
- | ^^^^^^^^^^^^^^^^
-
-warning: unused attribute
- --> $DIR/issue-49934.rs:26:5
+ --> $DIR/issue-49934.rs:23:5
|
LL | #[derive(Debug)]
| ^^^^^^^^^^^^^^^^
warning: unused attribute
- --> $DIR/issue-49934.rs:30:5
- |
-LL | #[derive(Debug)]
- | ^^^^^^^^^^^^^^^^
-
-warning: unused attribute
- --> $DIR/issue-49934.rs:34:13
+ --> $DIR/issue-49934.rs:27:13
|
LL | let _ = #[derive(Debug)] "Hello, world!";
| ^^^^^^^^^^^^^^^^
warning: unused attribute
- --> $DIR/issue-49934.rs:39:9
+ --> $DIR/issue-49934.rs:32:9
|
LL | #[derive(Debug)]
| ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
index 2c3a18b..29fd15f 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
@@ -2,7 +2,7 @@
--> $DIR/option-as_deref_mut.rs:4:33
|
LL | let _result = &mut Some(42).as_deref_mut();
- | ^^^^^^^^^^^^
+ | ^^^^^^^^^^^^ method not found in `std::option::Option<{integer}>`
|
= note: the method `as_deref_mut` exists but the following trait bounds were not satisfied:
`{integer} : std::ops::DerefMut`
diff --git a/src/test/ui/issues/issue-5153.stderr b/src/test/ui/issues/issue-5153.stderr
index 97214fb..5034e6d 100644
--- a/src/test/ui/issues/issue-5153.stderr
+++ b/src/test/ui/issues/issue-5153.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-5153.rs:10:27
|
LL | (&5isize as &dyn Foo).foo();
- | ^^^
+ | ^^^ method not found in `&dyn Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `foo`, perhaps you need to implement it:
diff --git a/src/test/ui/issues/issue-54062.stderr b/src/test/ui/issues/issue-54062.stderr
index 082ac91..3830ad4 100644
--- a/src/test/ui/issues/issue-54062.stderr
+++ b/src/test/ui/issues/issue-54062.stderr
@@ -8,7 +8,7 @@
--> $DIR/issue-54062.rs:10:37
|
LL | let _ = test.comps.inner.lock().unwrap();
- | ^^^^^^
+ | ^^^^^^ method not found in `std::sys_common::mutex::MutexGuard<'_>`
error: aborting due to 2 previous errors
diff --git a/src/test/ui/issues/issue-57362-1.stderr b/src/test/ui/issues/issue-57362-1.stderr
index 1d2ff76..c4000c8 100644
--- a/src/test/ui/issues/issue-57362-1.stderr
+++ b/src/test/ui/issues/issue-57362-1.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-57362-1.rs:20:7
|
LL | a.f();
- | ^
+ | ^ method not found in `fn(&u8)`
|
= note: a is a function, perhaps you wish to call it
= help: items from traits can only be used if the trait is implemented and in scope
diff --git a/src/test/ui/issues/issue-61711-once-caused-rustc-inf-loop.rs b/src/test/ui/issues/issue-61711-once-caused-rustc-inf-loop.rs
index 8fc09c8..de7d6a0 100644
--- a/src/test/ui/issues/issue-61711-once-caused-rustc-inf-loop.rs
+++ b/src/test/ui/issues/issue-61711-once-caused-rustc-inf-loop.rs
@@ -5,7 +5,7 @@
// aux-build:xcrate-issue-61711-b.rs
// compile-flags:--extern xcrate_issue_61711_b
-// run-pass
+// build-pass
fn f<F: Fn(xcrate_issue_61711_b::Struct)>(_: F) { }
fn main() { }
diff --git a/src/test/ui/lint/empty-lint-attributes.rs b/src/test/ui/lint/empty-lint-attributes.rs
index 1f0a953..9a0ec25 100644
--- a/src/test/ui/lint/empty-lint-attributes.rs
+++ b/src/test/ui/lint/empty-lint-attributes.rs
@@ -1,6 +1,6 @@
#![feature(lint_reasons)]
-// run-pass
+// check-pass
// Empty (and reason-only) lint attributes are legal—although we may want to
// lint them in the future (Issue #55112).
diff --git a/src/test/ui/lint/lint-ctypes-enum.rs b/src/test/ui/lint/lint-ctypes-enum.rs
index e1f4b0b..3898e67 100644
--- a/src/test/ui/lint/lint-ctypes-enum.rs
+++ b/src/test/ui/lint/lint-ctypes-enum.rs
@@ -36,36 +36,37 @@
extern {
fn zf(x: Z);
- fn uf(x: U); //~ ERROR enum has no representation hint
- fn bf(x: B); //~ ERROR enum has no representation hint
- fn tf(x: T); //~ ERROR enum has no representation hint
+ fn uf(x: U); //~ ERROR `extern` block uses type `U`
+ fn bf(x: B); //~ ERROR `extern` block uses type `B`
+ fn tf(x: T); //~ ERROR `extern` block uses type `T`
fn repr_c(x: ReprC);
fn repr_u8(x: U8);
fn repr_isize(x: Isize);
fn option_ref(x: Option<&'static u8>);
fn option_fn(x: Option<extern "C" fn()>);
fn nonnull(x: Option<std::ptr::NonNull<u8>>);
- fn unique(x: Option<std::ptr::Unique<u8>>); //~ ERROR enum has no representation hint
+ fn unique(x: Option<std::ptr::Unique<u8>>);
+ //~^ ERROR `extern` block uses type `std::option::Option<std::ptr::Unique<u8>>`
fn nonzero_u8(x: Option<num::NonZeroU8>);
fn nonzero_u16(x: Option<num::NonZeroU16>);
fn nonzero_u32(x: Option<num::NonZeroU32>);
fn nonzero_u64(x: Option<num::NonZeroU64>);
fn nonzero_u128(x: Option<num::NonZeroU128>);
- //~^ ERROR 128-bit integers don't currently have a known stable ABI
+ //~^ ERROR `extern` block uses type `u128`
fn nonzero_usize(x: Option<num::NonZeroUsize>);
fn nonzero_i8(x: Option<num::NonZeroI8>);
fn nonzero_i16(x: Option<num::NonZeroI16>);
fn nonzero_i32(x: Option<num::NonZeroI32>);
fn nonzero_i64(x: Option<num::NonZeroI64>);
fn nonzero_i128(x: Option<num::NonZeroI128>);
- //~^ ERROR 128-bit integers don't currently have a known stable ABI
+ //~^ ERROR `extern` block uses type `i128`
fn nonzero_isize(x: Option<num::NonZeroIsize>);
fn transparent_struct(x: Option<TransparentStruct<num::NonZeroU8>>);
fn transparent_enum(x: Option<TransparentEnum<num::NonZeroU8>>);
fn transparent_union(x: Option<TransparentUnion<num::NonZeroU8>>);
- //~^ ERROR enum has no representation hint
- fn repr_rust(x: Option<Rust<num::NonZeroU8>>); //~ ERROR enum has no representation hint
- fn no_result(x: Result<(), num::NonZeroI32>); //~ ERROR enum has no representation hint
+ //~^ ERROR `extern` block uses type
+ fn repr_rust(x: Option<Rust<num::NonZeroU8>>); //~ ERROR `extern` block uses type
+ fn no_result(x: Result<(), num::NonZeroI32>); //~ ERROR `extern` block uses type
}
-pub fn main() { }
+pub fn main() {}
diff --git a/src/test/ui/lint/lint-ctypes-enum.stderr b/src/test/ui/lint/lint-ctypes-enum.stderr
index 20e4386..81939e6 100644
--- a/src/test/ui/lint/lint-ctypes-enum.stderr
+++ b/src/test/ui/lint/lint-ctypes-enum.stderr
@@ -1,8 +1,8 @@
-error: `extern` block uses type `U` which is not FFI-safe: enum has no representation hint
+error: `extern` block uses type `U`, which is not FFI-safe
--> $DIR/lint-ctypes-enum.rs:39:13
|
LL | fn uf(x: U);
- | ^
+ | ^ not FFI-safe
|
note: lint level defined here
--> $DIR/lint-ctypes-enum.rs:3:9
@@ -10,81 +10,92 @@
LL | #![deny(improper_ctypes)]
| ^^^^^^^^^^^^^^^
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
note: type defined here
--> $DIR/lint-ctypes-enum.rs:9:1
|
LL | enum U { A }
| ^^^^^^^^^^^^
-error: `extern` block uses type `B` which is not FFI-safe: enum has no representation hint
+error: `extern` block uses type `B`, which is not FFI-safe
--> $DIR/lint-ctypes-enum.rs:40:13
|
LL | fn bf(x: B);
- | ^
+ | ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
note: type defined here
--> $DIR/lint-ctypes-enum.rs:10:1
|
LL | enum B { C, D }
| ^^^^^^^^^^^^^^^
-error: `extern` block uses type `T` which is not FFI-safe: enum has no representation hint
+error: `extern` block uses type `T`, which is not FFI-safe
--> $DIR/lint-ctypes-enum.rs:41:13
|
LL | fn tf(x: T);
- | ^
+ | ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
note: type defined here
--> $DIR/lint-ctypes-enum.rs:11:1
|
LL | enum T { E, F, G }
| ^^^^^^^^^^^^^^^^^^
-error: `extern` block uses type `std::option::Option<std::ptr::Unique<u8>>` which is not FFI-safe: enum has no representation hint
+error: `extern` block uses type `std::option::Option<std::ptr::Unique<u8>>`, which is not FFI-safe
--> $DIR/lint-ctypes-enum.rs:48:17
|
LL | fn unique(x: Option<std::ptr::Unique<u8>>);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
-error: `extern` block uses type `u128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI
- --> $DIR/lint-ctypes-enum.rs:53:23
+error: `extern` block uses type `u128`, which is not FFI-safe
+ --> $DIR/lint-ctypes-enum.rs:54:23
|
LL | fn nonzero_u128(x: Option<num::NonZeroU128>);
- | ^^^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
+ |
+ = note: 128-bit integers don't currently have a known stable ABI
-error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI
- --> $DIR/lint-ctypes-enum.rs:60:23
+error: `extern` block uses type `i128`, which is not FFI-safe
+ --> $DIR/lint-ctypes-enum.rs:61:23
|
LL | fn nonzero_i128(x: Option<num::NonZeroI128>);
- | ^^^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
+ |
+ = note: 128-bit integers don't currently have a known stable ABI
-error: `extern` block uses type `std::option::Option<TransparentUnion<std::num::NonZeroU8>>` which is not FFI-safe: enum has no representation hint
- --> $DIR/lint-ctypes-enum.rs:65:28
+error: `extern` block uses type `std::option::Option<TransparentUnion<std::num::NonZeroU8>>`, which is not FFI-safe
+ --> $DIR/lint-ctypes-enum.rs:66:28
|
LL | fn transparent_union(x: Option<TransparentUnion<num::NonZeroU8>>);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
-error: `extern` block uses type `std::option::Option<Rust<std::num::NonZeroU8>>` which is not FFI-safe: enum has no representation hint
- --> $DIR/lint-ctypes-enum.rs:67:20
- |
-LL | fn repr_rust(x: Option<Rust<num::NonZeroU8>>);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- |
- = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
-
-error: `extern` block uses type `std::result::Result<(), std::num::NonZeroI32>` which is not FFI-safe: enum has no representation hint
+error: `extern` block uses type `std::option::Option<Rust<std::num::NonZeroU8>>`, which is not FFI-safe
--> $DIR/lint-ctypes-enum.rs:68:20
|
-LL | fn no_result(x: Result<(), num::NonZeroI32>);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | fn repr_rust(x: Option<Rust<num::NonZeroU8>>);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
+
+error: `extern` block uses type `std::result::Result<(), std::num::NonZeroI32>`, which is not FFI-safe
+ --> $DIR/lint-ctypes-enum.rs:69:20
+ |
+LL | fn no_result(x: Result<(), num::NonZeroI32>);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
+ |
+ = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
+ = note: enum has no representation hint
error: aborting due to 9 previous errors
diff --git a/src/test/ui/lint/lint-ctypes.rs b/src/test/ui/lint/lint-ctypes.rs
index a3d9b6f..e20503a 100644
--- a/src/test/ui/lint/lint-ctypes.rs
+++ b/src/test/ui/lint/lint-ctypes.rs
@@ -1,7 +1,7 @@
-#![deny(improper_ctypes)]
#![feature(rustc_private)]
#![allow(private_in_public)]
+#![deny(improper_ctypes)]
extern crate libc;
@@ -54,12 +54,13 @@
pub fn trait_type(p: &dyn Clone); //~ ERROR uses type `dyn std::clone::Clone`
pub fn tuple_type(p: (i32, i32)); //~ ERROR uses type `(i32, i32)`
pub fn tuple_type2(p: I32Pair); //~ ERROR uses type `(i32, i32)`
- pub fn zero_size(p: ZeroSize); //~ ERROR struct has no fields
- pub fn zero_size_phantom(p: ZeroSizeWithPhantomData); //~ ERROR composed only of PhantomData
+ pub fn zero_size(p: ZeroSize); //~ ERROR uses type `ZeroSize`
+ pub fn zero_size_phantom(p: ZeroSizeWithPhantomData);
+ //~^ ERROR uses type `ZeroSizeWithPhantomData`
pub fn zero_size_phantom_toplevel()
- -> ::std::marker::PhantomData<bool>; //~ ERROR: composed only of PhantomData
- pub fn fn_type(p: RustFn); //~ ERROR function pointer has Rust-specific
- pub fn fn_type2(p: fn()); //~ ERROR function pointer has Rust-specific
+ -> ::std::marker::PhantomData<bool>; //~ ERROR uses type `std::marker::PhantomData<bool>`
+ pub fn fn_type(p: RustFn); //~ ERROR uses type `fn()`
+ pub fn fn_type2(p: fn()); //~ ERROR uses type `fn()`
pub fn fn_contained(p: RustBadRet); //~ ERROR: uses type `std::boxed::Box<u32>`
pub fn transparent_i128(p: TransparentI128); //~ ERROR: uses type `i128`
pub fn transparent_str(p: TransparentStr); //~ ERROR: uses type `str`
diff --git a/src/test/ui/lint/lint-ctypes.stderr b/src/test/ui/lint/lint-ctypes.stderr
index c78463b..e533a76 100644
--- a/src/test/ui/lint/lint-ctypes.stderr
+++ b/src/test/ui/lint/lint-ctypes.stderr
@@ -1,170 +1,201 @@
-error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `Foo`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:46:28
|
LL | pub fn ptr_type1(size: *const Foo);
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ not FFI-safe
|
note: lint level defined here
- --> $DIR/lint-ctypes.rs:1:9
+ --> $DIR/lint-ctypes.rs:4:9
|
LL | #![deny(improper_ctypes)]
| ^^^^^^^^^^^^^^^
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/lint-ctypes.rs:24:1
|
LL | pub struct Foo;
| ^^^^^^^^^^^^^^^
-error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `Foo`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:47:28
|
LL | pub fn ptr_type2(size: *const Foo);
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
note: type defined here
--> $DIR/lint-ctypes.rs:24:1
|
LL | pub struct Foo;
| ^^^^^^^^^^^^^^^
-error: `extern` block uses type `[u32]` which is not FFI-safe: slices have no C equivalent
+error: `extern` block uses type `[u32]`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:48:26
|
LL | pub fn slice_type(p: &[u32]);
- | ^^^^^^
+ | ^^^^^^ not FFI-safe
|
= help: consider using a raw pointer instead
+ = note: slices have no C equivalent
-error: `extern` block uses type `str` which is not FFI-safe: string slices have no C equivalent
+error: `extern` block uses type `str`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:49:24
|
LL | pub fn str_type(p: &str);
- | ^^^^
+ | ^^^^ not FFI-safe
|
= help: consider using `*const u8` and a length instead
+ = note: string slices have no C equivalent
-error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: this struct has unspecified layout
+error: `extern` block uses type `std::boxed::Box<u32>`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:50:24
|
LL | pub fn box_type(p: Box<u32>);
- | ^^^^^^^^
+ | ^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
-error: `extern` block uses type `char` which is not FFI-safe: the `char` type has no C equivalent
+error: `extern` block uses type `char`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:51:25
|
LL | pub fn char_type(p: char);
- | ^^^^
+ | ^^^^ not FFI-safe
|
= help: consider using `u32` or `libc::wchar_t` instead
+ = note: the `char` type has no C equivalent
-error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI
+error: `extern` block uses type `i128`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:52:25
|
LL | pub fn i128_type(p: i128);
- | ^^^^
+ | ^^^^ not FFI-safe
+ |
+ = note: 128-bit integers don't currently have a known stable ABI
-error: `extern` block uses type `u128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI
+error: `extern` block uses type `u128`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:53:25
|
LL | pub fn u128_type(p: u128);
- | ^^^^
+ | ^^^^ not FFI-safe
+ |
+ = note: 128-bit integers don't currently have a known stable ABI
-error: `extern` block uses type `dyn std::clone::Clone` which is not FFI-safe: trait objects have no C equivalent
+error: `extern` block uses type `dyn std::clone::Clone`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:54:26
|
LL | pub fn trait_type(p: &dyn Clone);
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ not FFI-safe
+ |
+ = note: trait objects have no C equivalent
-error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have unspecified layout
+error: `extern` block uses type `(i32, i32)`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:55:26
|
LL | pub fn tuple_type(p: (i32, i32));
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ not FFI-safe
|
= help: consider using a struct instead
+ = note: tuples have unspecified layout
-error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have unspecified layout
+error: `extern` block uses type `(i32, i32)`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:56:27
|
LL | pub fn tuple_type2(p: I32Pair);
- | ^^^^^^^
+ | ^^^^^^^ not FFI-safe
|
= help: consider using a struct instead
+ = note: tuples have unspecified layout
-error: `extern` block uses type `ZeroSize` which is not FFI-safe: this struct has no fields
+error: `extern` block uses type `ZeroSize`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:57:25
|
LL | pub fn zero_size(p: ZeroSize);
- | ^^^^^^^^
+ | ^^^^^^^^ not FFI-safe
|
= help: consider adding a member to this struct
+ = note: this struct has no fields
note: type defined here
--> $DIR/lint-ctypes.rs:20:1
|
LL | pub struct ZeroSize;
| ^^^^^^^^^^^^^^^^^^^^
-error: `extern` block uses type `ZeroSizeWithPhantomData` which is not FFI-safe: composed only of PhantomData
+error: `extern` block uses type `ZeroSizeWithPhantomData`, which is not FFI-safe
--> $DIR/lint-ctypes.rs:58:33
|
LL | pub fn zero_size_phantom(p: ZeroSizeWithPhantomData);
- | ^^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
+ |
+ = note: composed only of `PhantomData`
+note: type defined here
+ --> $DIR/lint-ctypes.rs:43:1
+ |
+LL | pub struct ZeroSizeWithPhantomData(::std::marker::PhantomData<i32>);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: `extern` block uses type `std::marker::PhantomData<bool>` which is not FFI-safe: composed only of PhantomData
- --> $DIR/lint-ctypes.rs:60:12
+error: `extern` block uses type `std::marker::PhantomData<bool>`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:61:12
|
LL | -> ::std::marker::PhantomData<bool>;
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
+ |
+ = note: composed only of `PhantomData`
-error: `extern` block uses type `fn()` which is not FFI-safe: this function pointer has Rust-specific calling convention
- --> $DIR/lint-ctypes.rs:61:23
+error: `extern` block uses type `fn()`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:62:23
|
LL | pub fn fn_type(p: RustFn);
- | ^^^^^^
+ | ^^^^^^ not FFI-safe
|
= help: consider using an `extern fn(...) -> ...` function pointer instead
+ = note: this function pointer has Rust-specific calling convention
-error: `extern` block uses type `fn()` which is not FFI-safe: this function pointer has Rust-specific calling convention
- --> $DIR/lint-ctypes.rs:62:24
+error: `extern` block uses type `fn()`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:63:24
|
LL | pub fn fn_type2(p: fn());
- | ^^^^
+ | ^^^^ not FFI-safe
|
= help: consider using an `extern fn(...) -> ...` function pointer instead
+ = note: this function pointer has Rust-specific calling convention
-error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: this struct has unspecified layout
- --> $DIR/lint-ctypes.rs:63:28
+error: `extern` block uses type `std::boxed::Box<u32>`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:64:28
|
LL | pub fn fn_contained(p: RustBadRet);
- | ^^^^^^^^^^
+ | ^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
-error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI
- --> $DIR/lint-ctypes.rs:64:32
+error: `extern` block uses type `i128`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:65:32
|
LL | pub fn transparent_i128(p: TransparentI128);
- | ^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^ not FFI-safe
+ |
+ = note: 128-bit integers don't currently have a known stable ABI
-error: `extern` block uses type `str` which is not FFI-safe: string slices have no C equivalent
- --> $DIR/lint-ctypes.rs:65:31
+error: `extern` block uses type `str`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:66:31
|
LL | pub fn transparent_str(p: TransparentStr);
- | ^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider using `*const u8` and a length instead
+ = note: string slices have no C equivalent
-error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: this struct has unspecified layout
- --> $DIR/lint-ctypes.rs:66:30
+error: `extern` block uses type `std::boxed::Box<u32>`, which is not FFI-safe
+ --> $DIR/lint-ctypes.rs:67:30
|
LL | pub fn transparent_fn(p: TransparentBadFn);
- | ^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
+ = note: this struct has unspecified layout
error: aborting due to 20 previous errors
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.rs b/src/test/ui/lint/opaque-ty-ffi-unsafe.rs
new file mode 100644
index 0000000..25d5f8e
--- /dev/null
+++ b/src/test/ui/lint/opaque-ty-ffi-unsafe.rs
@@ -0,0 +1,16 @@
+#![feature(type_alias_impl_trait)]
+
+#![deny(improper_ctypes)]
+
+type A = impl Fn();
+
+pub fn ret_closure() -> A {
+ || {}
+}
+
+extern "C" {
+ pub fn a(_: A);
+ //~^ ERROR `extern` block uses type `A`, which is not FFI-safe
+}
+
+fn main() {}
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr b/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
new file mode 100644
index 0000000..136d564
--- /dev/null
+++ b/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
@@ -0,0 +1,15 @@
+error: `extern` block uses type `A`, which is not FFI-safe
+ --> $DIR/opaque-ty-ffi-unsafe.rs:12:17
+ |
+LL | pub fn a(_: A);
+ | ^ not FFI-safe
+ |
+note: lint level defined here
+ --> $DIR/opaque-ty-ffi-unsafe.rs:3:9
+ |
+LL | #![deny(improper_ctypes)]
+ | ^^^^^^^^^^^^^^^
+ = note: opaque types have no C equivalent
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
index 015e05e..96054de 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
+++ b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
@@ -2,7 +2,7 @@
--> $DIR/macro-backtrace-invalid-internals.rs:5:13
|
LL | 1.fake()
- | ^^^^
+ | ^^^^ method not found in `{integer}`
...
LL | fake_method_stmt!();
| -------------------- in this macro invocation
@@ -42,7 +42,7 @@
--> $DIR/macro-backtrace-invalid-internals.rs:23:13
|
LL | 1.fake()
- | ^^^^
+ | ^^^^ method not found in `{integer}`
...
LL | let _ = fake_method_expr!();
| ------------------- in this macro invocation
diff --git a/src/test/ui/match/match-ref-mut-stability.rs b/src/test/ui/match/match-ref-mut-stability.rs
index 49e0dfa..5212036 100644
--- a/src/test/ui/match/match-ref-mut-stability.rs
+++ b/src/test/ui/match/match-ref-mut-stability.rs
@@ -3,8 +3,6 @@
// run-pass
-#![feature(bind_by_move_pattern_guards)]
-
// Test that z always point to the same temporary.
fn referent_stability() {
let p;
diff --git a/src/test/ui/match/match-vec-mismatch.stderr b/src/test/ui/match/match-vec-mismatch.stderr
index 2f1bbb7..a3523bb 100644
--- a/src/test/ui/match/match-vec-mismatch.stderr
+++ b/src/test/ui/match/match-vec-mismatch.stderr
@@ -10,7 +10,7 @@
LL | ['f', 'o', ..] => {}
| ^^^^^^^^^^^^^^ pattern cannot match with input type `std::string::String`
-error[E0527]: pattern requires 1 elements but array has 3
+error[E0527]: pattern requires 1 element but array has 3
--> $DIR/match-vec-mismatch.rs:20:9
|
LL | [0] => {},
diff --git a/src/test/ui/match/non-exhaustive-defined-here.rs b/src/test/ui/match/non-exhaustive-defined-here.rs
new file mode 100644
index 0000000..6f009ac
--- /dev/null
+++ b/src/test/ui/match/non-exhaustive-defined-here.rs
@@ -0,0 +1,72 @@
+// Test the "defined here" and "not covered" diagnostic hints.
+// We also make sure that references are peeled off from the scrutinee type
+// so that the diagnostics work better with default binding modes.
+
+#[derive(Clone)]
+enum E {
+//~^ `E` defined here
+//~| `E` defined here
+//~| `E` defined here
+//~| `E` defined here
+//~| `E` defined here
+//~| `E` defined here
+ A,
+ B,
+ //~^ not covered
+ //~| not covered
+ //~| not covered
+ //~| not covered
+ //~| not covered
+ //~| not covered
+ C
+ //~^ not covered
+ //~| not covered
+ //~| not covered
+ //~| not covered
+ //~| not covered
+ //~| not covered
+}
+
+fn by_val(e: E) {
+ let e1 = e.clone();
+ match e1 { //~ ERROR non-exhaustive patterns: `B` and `C` not covered
+ E::A => {}
+ }
+
+ let E::A = e; //~ ERROR refutable pattern in local binding: `B` and `C` not covered
+}
+
+fn by_ref_once(e: &E) {
+ match e { //~ ERROR non-exhaustive patterns: `&B` and `&C` not covered
+ E::A => {}
+ }
+
+ let E::A = e; //~ ERROR refutable pattern in local binding: `&B` and `&C` not covered
+}
+
+fn by_ref_thrice(e: & &mut &E) {
+ match e { //~ ERROR non-exhaustive patterns: `&&mut &B` and `&&mut &C` not covered
+ E::A => {}
+ }
+
+ let E::A = e;
+ //~^ ERROR refutable pattern in local binding: `&&mut &B` and `&&mut &C` not covered
+}
+
+enum Opt {
+//~^ `Opt` defined here
+//~| `Opt` defined here
+ Some(u8),
+ None,
+ //~^ not covered
+}
+
+fn ref_pat(e: Opt) {
+ match e {//~ ERROR non-exhaustive patterns: `None` not covered
+ Opt::Some(ref _x) => {}
+ }
+
+ let Opt::Some(ref _x) = e; //~ ERROR refutable pattern in local binding: `None` not covered
+}
+
+fn main() {}
diff --git a/src/test/ui/match/non-exhaustive-defined-here.stderr b/src/test/ui/match/non-exhaustive-defined-here.stderr
new file mode 100644
index 0000000..25b8bbd
--- /dev/null
+++ b/src/test/ui/match/non-exhaustive-defined-here.stderr
@@ -0,0 +1,170 @@
+error[E0004]: non-exhaustive patterns: `B` and `C` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:32:11
+ |
+LL | / enum E {
+LL | |
+LL | |
+LL | |
+... |
+LL | | B,
+ | | - not covered
+... |
+LL | | C
+ | | - not covered
+... |
+LL | |
+LL | | }
+ | |_- `E` defined here
+...
+LL | match e1 {
+ | ^^ patterns `B` and `C` not covered
+ |
+ = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
+
+error[E0005]: refutable pattern in local binding: `B` and `C` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:36:9
+ |
+LL | / enum E {
+LL | |
+LL | |
+LL | |
+... |
+LL | | B,
+ | | - not covered
+... |
+LL | | C
+ | | - not covered
+... |
+LL | |
+LL | | }
+ | |_- `E` defined here
+...
+LL | let E::A = e;
+ | ^^^^ patterns `B` and `C` not covered
+
+error[E0004]: non-exhaustive patterns: `&B` and `&C` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:40:11
+ |
+LL | / enum E {
+LL | |
+LL | |
+LL | |
+... |
+LL | | B,
+ | | - not covered
+... |
+LL | | C
+ | | - not covered
+... |
+LL | |
+LL | | }
+ | |_- `E` defined here
+...
+LL | match e {
+ | ^ patterns `&B` and `&C` not covered
+ |
+ = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
+
+error[E0005]: refutable pattern in local binding: `&B` and `&C` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:44:9
+ |
+LL | / enum E {
+LL | |
+LL | |
+LL | |
+... |
+LL | | B,
+ | | - not covered
+... |
+LL | | C
+ | | - not covered
+... |
+LL | |
+LL | | }
+ | |_- `E` defined here
+...
+LL | let E::A = e;
+ | ^^^^ patterns `&B` and `&C` not covered
+
+error[E0004]: non-exhaustive patterns: `&&mut &B` and `&&mut &C` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:48:11
+ |
+LL | / enum E {
+LL | |
+LL | |
+LL | |
+... |
+LL | | B,
+ | | - not covered
+... |
+LL | | C
+ | | - not covered
+... |
+LL | |
+LL | | }
+ | |_- `E` defined here
+...
+LL | match e {
+ | ^ patterns `&&mut &B` and `&&mut &C` not covered
+ |
+ = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
+
+error[E0005]: refutable pattern in local binding: `&&mut &B` and `&&mut &C` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:52:9
+ |
+LL | / enum E {
+LL | |
+LL | |
+LL | |
+... |
+LL | | B,
+ | | - not covered
+... |
+LL | | C
+ | | - not covered
+... |
+LL | |
+LL | | }
+ | |_- `E` defined here
+...
+LL | let E::A = e;
+ | ^^^^ patterns `&&mut &B` and `&&mut &C` not covered
+
+error[E0004]: non-exhaustive patterns: `None` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:65:11
+ |
+LL | / enum Opt {
+LL | |
+LL | |
+LL | | Some(u8),
+LL | | None,
+ | | ---- not covered
+LL | |
+LL | | }
+ | |_- `Opt` defined here
+...
+LL | match e {
+ | ^ pattern `None` not covered
+ |
+ = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
+
+error[E0005]: refutable pattern in local binding: `None` not covered
+ --> $DIR/non-exhaustive-defined-here.rs:69:9
+ |
+LL | / enum Opt {
+LL | |
+LL | |
+LL | | Some(u8),
+LL | | None,
+ | | ---- not covered
+LL | |
+LL | | }
+ | |_- `Opt` defined here
+...
+LL | let Opt::Some(ref _x) = e;
+ | ^^^^^^^^^^^^^^^^^ pattern `None` not covered
+
+error: aborting due to 8 previous errors
+
+Some errors have detailed explanations: E0004, E0005.
+For more information about an error, try `rustc --explain E0004`.
diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/src/test/ui/methods/method-call-err-msg.stderr
index b8ae4c3..94c27b7 100644
--- a/src/test/ui/methods/method-call-err-msg.stderr
+++ b/src/test/ui/methods/method-call-err-msg.stderr
@@ -32,7 +32,7 @@
| --------------- method `take` not found for this
...
LL | .take()
- | ^^^^
+ | ^^^^ method not found in `Foo`
|
= note: the method `take` exists but the following trait bounds were not satisfied:
`&mut Foo : std::iter::Iterator`
diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/src/test/ui/mismatched_types/issue-36053-2.stderr
index 3f87ef7..89c7b09 100644
--- a/src/test/ui/mismatched_types/issue-36053-2.stderr
+++ b/src/test/ui/mismatched_types/issue-36053-2.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-36053-2.rs:7:55
|
LL | once::<&str>("str").fuse().filter(|a: &str| true).count();
- | ^^^^^
+ | ^^^^^ method not found in `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]>`
|
= note: the method `count` exists but the following trait bounds were not satisfied:
`&mut std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]> : std::iter::Iterator`
diff --git a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
index 9721dc8..865092e 100644
--- a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
+++ b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
@@ -2,7 +2,7 @@
--> $DIR/method-help-unsatisfied-bound.rs:5:7
|
LL | a.unwrap();
- | ^^^^^^
+ | ^^^^^^ method not found in `std::result::Result<(), Foo>`
|
= note: the method `unwrap` exists but the following trait bounds were not satisfied:
`Foo : std::fmt::Debug`
diff --git a/src/test/ui/never-assign-dead-code.stderr b/src/test/ui/never-assign-dead-code.stderr
index 779780a..b1b5bf0 100644
--- a/src/test/ui/never-assign-dead-code.stderr
+++ b/src/test/ui/never-assign-dead-code.stderr
@@ -11,11 +11,11 @@
| ^^^^^^
= note: `#[warn(unreachable_code)]` implied by `#[warn(unused)]`
-warning: unreachable expression
+warning: unreachable call
--> $DIR/never-assign-dead-code.rs:10:5
|
LL | drop(x);
- | ^^^^^^^
+ | ^^^^
warning: unused variable: `x`
--> $DIR/never-assign-dead-code.rs:9:9
diff --git a/src/test/ui/nll/issue-55288.rs b/src/test/ui/nll/issue-55288.rs
index c7b6ac5..aab2dc2 100644
--- a/src/test/ui/nll/issue-55288.rs
+++ b/src/test/ui/nll/issue-55288.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
struct Slice(&'static [&'static [u8]]);
diff --git a/src/test/ui/nll/issue-57960.rs b/src/test/ui/nll/issue-57960.rs
index 1399694..32e4518 100644
--- a/src/test/ui/nll/issue-57960.rs
+++ b/src/test/ui/nll/issue-57960.rs
@@ -30,7 +30,6 @@
OneDigit::FIRST..=OneDigit::LAST => 1,
TwoDigits::FIRST..=TwoDigits::LAST => 2,
ThreeDigits::FIRST..=ThreeDigits::LAST => 3,
- _ => unreachable!(),
}
}
diff --git a/src/test/ui/nll/match-cfg-fake-edges.rs b/src/test/ui/nll/match-cfg-fake-edges.rs
index 5fc9966..2e6d675 100644
--- a/src/test/ui/nll/match-cfg-fake-edges.rs
+++ b/src/test/ui/nll/match-cfg-fake-edges.rs
@@ -1,8 +1,6 @@
// Test that we have enough false edges to avoid exposing the exact matching
// algorithm in borrow checking.
-#![feature(bind_by_move_pattern_guards)]
-
fn guard_always_precedes_arm(y: i32) {
let mut x;
// x should always be initialized, as the only way to reach the arm is
diff --git a/src/test/ui/nll/match-cfg-fake-edges.stderr b/src/test/ui/nll/match-cfg-fake-edges.stderr
index 3d9037b..06fe564 100644
--- a/src/test/ui/nll/match-cfg-fake-edges.stderr
+++ b/src/test/ui/nll/match-cfg-fake-edges.stderr
@@ -1,11 +1,11 @@
error[E0381]: use of possibly-uninitialized variable: `x`
- --> $DIR/match-cfg-fake-edges.rs:23:13
+ --> $DIR/match-cfg-fake-edges.rs:21:13
|
LL | x;
| ^ use of possibly-uninitialized `x`
error[E0382]: use of moved value: `x`
- --> $DIR/match-cfg-fake-edges.rs:37:13
+ --> $DIR/match-cfg-fake-edges.rs:35:13
|
LL | let x = String::new();
| - move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait
diff --git a/src/test/ui/nll/match-guards-partially-borrow.rs b/src/test/ui/nll/match-guards-partially-borrow.rs
index 601c46f..81ae19e 100644
--- a/src/test/ui/nll/match-guards-partially-borrow.rs
+++ b/src/test/ui/nll/match-guards-partially-borrow.rs
@@ -5,8 +5,6 @@
// Test that we don't allow mutating the value being matched on in a way that
// changes which patterns it matches, until we have chosen an arm.
-#![feature(bind_by_move_pattern_guards)]
-
fn ok_mutation_in_guard(mut q: i32) {
match q {
// OK, mutation doesn't change which patterns g matches
diff --git a/src/test/ui/nll/match-guards-partially-borrow.stderr b/src/test/ui/nll/match-guards-partially-borrow.stderr
index b2951fd..48e3a7c 100644
--- a/src/test/ui/nll/match-guards-partially-borrow.stderr
+++ b/src/test/ui/nll/match-guards-partially-borrow.stderr
@@ -1,5 +1,5 @@
error[E0510]: cannot assign `q` in match guard
- --> $DIR/match-guards-partially-borrow.rs:57:13
+ --> $DIR/match-guards-partially-borrow.rs:55:13
|
LL | match q {
| - value is immutable in match guard
@@ -8,7 +8,7 @@
| ^^^^^^^^ cannot assign
error[E0510]: cannot assign `r` in match guard
- --> $DIR/match-guards-partially-borrow.rs:69:13
+ --> $DIR/match-guards-partially-borrow.rs:67:13
|
LL | match r {
| - value is immutable in match guard
@@ -17,7 +17,7 @@
| ^^^^^^^^ cannot assign
error[E0510]: cannot assign `t` in match guard
- --> $DIR/match-guards-partially-borrow.rs:93:13
+ --> $DIR/match-guards-partially-borrow.rs:91:13
|
LL | match t {
| - value is immutable in match guard
@@ -26,7 +26,7 @@
| ^^^^^^^^ cannot assign
error[E0510]: cannot mutably borrow `x.0` in match guard
- --> $DIR/match-guards-partially-borrow.rs:107:22
+ --> $DIR/match-guards-partially-borrow.rs:105:22
|
LL | match x {
| - value is immutable in match guard
@@ -35,7 +35,7 @@
| ^^^^^^^^^ cannot mutably borrow
error[E0506]: cannot assign to `t` because it is borrowed
- --> $DIR/match-guards-partially-borrow.rs:119:13
+ --> $DIR/match-guards-partially-borrow.rs:117:13
|
LL | s if {
| - borrow of `t` occurs here
@@ -46,7 +46,7 @@
| - borrow later used here
error[E0510]: cannot assign `y` in match guard
- --> $DIR/match-guards-partially-borrow.rs:130:13
+ --> $DIR/match-guards-partially-borrow.rs:128:13
|
LL | match *y {
| -- value is immutable in match guard
@@ -55,7 +55,7 @@
| ^^^^^^^^^ cannot assign
error[E0510]: cannot assign `z` in match guard
- --> $DIR/match-guards-partially-borrow.rs:141:13
+ --> $DIR/match-guards-partially-borrow.rs:139:13
|
LL | match z {
| - value is immutable in match guard
@@ -64,7 +64,7 @@
| ^^^^^^^^^ cannot assign
error[E0510]: cannot assign `a` in match guard
- --> $DIR/match-guards-partially-borrow.rs:153:13
+ --> $DIR/match-guards-partially-borrow.rs:151:13
|
LL | match a {
| - value is immutable in match guard
@@ -73,7 +73,7 @@
| ^^^^^^^^^ cannot assign
error[E0510]: cannot assign `b` in match guard
- --> $DIR/match-guards-partially-borrow.rs:164:13
+ --> $DIR/match-guards-partially-borrow.rs:162:13
|
LL | match b {
| - value is immutable in match guard
diff --git a/src/test/ui/nll/normalization-bounds.rs b/src/test/ui/nll/normalization-bounds.rs
index 5d2825e..bb6d981 100644
--- a/src/test/ui/nll/normalization-bounds.rs
+++ b/src/test/ui/nll/normalization-bounds.rs
@@ -1,6 +1,6 @@
// Check that lifetime bounds get checked the right way around with NLL enabled.
-//run-pass
+// check-pass
trait Visitor<'d> {
type Value;
diff --git a/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs b/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs
index 6d5bdfa..3b06b0d 100644
--- a/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs
+++ b/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs
@@ -1,11 +1,11 @@
// Check that mutable promoted length zero arrays don't check for conflicting
// access
-// run-pass
+// check-pass
pub fn main() {
let mut x: Vec<&[i32; 0]> = Vec::new();
- for i in 0..10 {
+ for _ in 0..10 {
x.push(&[]);
}
}
diff --git a/src/test/ui/nll/user-annotations/issue-55219.rs b/src/test/ui/nll/user-annotations/issue-55219.rs
index 4d18e96..1474136 100644
--- a/src/test/ui/nll/user-annotations/issue-55219.rs
+++ b/src/test/ui/nll/user-annotations/issue-55219.rs
@@ -3,7 +3,7 @@
// The `Self::HASH_LEN` here expands to a "self-type" where `T` is not
// known. This unbound inference variable was causing an ICE.
//
-// run-pass
+// check-pass
pub struct Foo<T>(T);
diff --git a/src/test/ui/nll/user-annotations/normalize-self-ty.rs b/src/test/ui/nll/user-annotations/normalize-self-ty.rs
index a06229a..df905c8 100644
--- a/src/test/ui/nll/user-annotations/normalize-self-ty.rs
+++ b/src/test/ui/nll/user-annotations/normalize-self-ty.rs
@@ -2,7 +2,7 @@
// the inherent impl requires normalization to be equal to the
// user-provided type.
//
-// run-pass
+// check-pass
trait Mirror {
type Me;
@@ -15,7 +15,7 @@
struct Foo<A, B>(A, B);
impl<A> Foo<A, <A as Mirror>::Me> {
- fn m(b: A) { }
+ fn m(_: A) { }
}
fn main() {
diff --git a/src/test/ui/non-copyable-void.stderr b/src/test/ui/non-copyable-void.stderr
index 4041e19..b05c29c 100644
--- a/src/test/ui/non-copyable-void.stderr
+++ b/src/test/ui/non-copyable-void.stderr
@@ -2,7 +2,7 @@
--> $DIR/non-copyable-void.rs:11:23
|
LL | let _z = (*y).clone();
- | ^^^^^
+ | ^^^^^ method not found in `libc::c_void`
error: aborting due to previous error
diff --git a/src/test/ui/noncopyable-class.stderr b/src/test/ui/noncopyable-class.stderr
index eb47a33..c1c5021 100644
--- a/src/test/ui/noncopyable-class.stderr
+++ b/src/test/ui/noncopyable-class.stderr
@@ -5,7 +5,7 @@
| ---------- method `clone` not found for this
...
LL | let _y = x.clone();
- | ^^^^^
+ | ^^^^^ method not found in `Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `clone`, perhaps you need to implement it:
diff --git a/src/test/ui/object-pointer-types.stderr b/src/test/ui/object-pointer-types.stderr
index 0c7e4e9..2df628e 100644
--- a/src/test/ui/object-pointer-types.stderr
+++ b/src/test/ui/object-pointer-types.stderr
@@ -2,7 +2,7 @@
--> $DIR/object-pointer-types.rs:11:7
|
LL | x.owned();
- | ^^^^^
+ | ^^^^^ method not found in `&dyn Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `owned`, perhaps you need to implement it:
@@ -12,7 +12,7 @@
--> $DIR/object-pointer-types.rs:17:7
|
LL | x.owned();
- | ^^^^^
+ | ^^^^^ method not found in `&mut dyn Foo`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `owned`, perhaps you need to implement it:
@@ -22,7 +22,7 @@
--> $DIR/object-pointer-types.rs:23:7
|
LL | x.managed();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `std::boxed::Box<(dyn Foo + 'static)>`
error: aborting due to 3 previous errors
diff --git a/src/test/ui/parser/require-parens-for-chained-comparison.rs b/src/test/ui/parser/require-parens-for-chained-comparison.rs
index 525be5d..3dcc0c8 100644
--- a/src/test/ui/parser/require-parens-for-chained-comparison.rs
+++ b/src/test/ui/parser/require-parens-for-chained-comparison.rs
@@ -11,8 +11,7 @@
//~| ERROR: mismatched types
f<X>();
- //~^ ERROR: chained comparison operators require parentheses
- //~| ERROR: binary operation `<` cannot be applied to type `fn() {f::<_>}`
+ //~^ ERROR chained comparison operators require parentheses
//~| HELP: use `::<...>` instead of `<...>`
//~| HELP: or use `(...)`
}
diff --git a/src/test/ui/parser/require-parens-for-chained-comparison.stderr b/src/test/ui/parser/require-parens-for-chained-comparison.stderr
index 76e548d..e927f4c 100644
--- a/src/test/ui/parser/require-parens-for-chained-comparison.stderr
+++ b/src/test/ui/parser/require-parens-for-chained-comparison.stderr
@@ -37,17 +37,6 @@
= note: expected type `bool`
found type `{integer}`
-error[E0369]: binary operation `<` cannot be applied to type `fn() {f::<_>}`
- --> $DIR/require-parens-for-chained-comparison.rs:13:6
- |
-LL | f<X>();
- | -^- X
- | |
- | fn() {f::<_>}
- |
- = note: an implementation of `std::cmp::PartialOrd` might be missing for `fn() {f::<_>}`
+error: aborting due to 5 previous errors
-error: aborting due to 6 previous errors
-
-Some errors have detailed explanations: E0308, E0369.
-For more information about an error, try `rustc --explain E0308`.
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/trait-object-lifetime-parens.rs b/src/test/ui/parser/trait-object-lifetime-parens.rs
index 5bbda42..c8b0eb6 100644
--- a/src/test/ui/parser/trait-object-lifetime-parens.rs
+++ b/src/test/ui/parser/trait-object-lifetime-parens.rs
@@ -9,7 +9,6 @@
let _: Box<('a) + Trait>;
//~^ ERROR expected type, found `'a`
//~| ERROR expected `:`, found `)`
- //~| ERROR chained comparison operators require parentheses
}
fn main() {}
diff --git a/src/test/ui/parser/trait-object-lifetime-parens.stderr b/src/test/ui/parser/trait-object-lifetime-parens.stderr
index 7ffc26e..319a308 100644
--- a/src/test/ui/parser/trait-object-lifetime-parens.stderr
+++ b/src/test/ui/parser/trait-object-lifetime-parens.stderr
@@ -16,15 +16,6 @@
LL | let _: Box<('a) + Trait>;
| ^ expected `:`
-error: chained comparison operators require parentheses
- --> $DIR/trait-object-lifetime-parens.rs:9:15
- |
-LL | let _: Box<('a) + Trait>;
- | ^^^^^^^^^^^^^^^
- |
- = help: use `::<...>` instead of `<...>` if you meant to specify type arguments
- = help: or use `(...)` if you meant to specify fn arguments
-
error: expected type, found `'a`
--> $DIR/trait-object-lifetime-parens.rs:9:17
|
@@ -33,5 +24,5 @@
| |
| while parsing the type for `_`
-error: aborting due to 5 previous errors
+error: aborting due to 4 previous errors
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout b/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout
index 0fe02a9..ea06f6c 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout
+++ b/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout
@@ -2,40 +2,40 @@
PRINT-BANG INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "M",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
]
PRINT-ATTR INPUT (DISPLAY): struct A(crate::S);
@@ -43,39 +43,39 @@
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "A",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
]
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-62325.stdout b/src/test/ui/proc-macro/dollar-crate-issue-62325.stdout
index a499e13..7ee8078 100644
--- a/src/test/ui/proc-macro/dollar-crate-issue-62325.stdout
+++ b/src/test/ui/proc-macro/dollar-crate-issue-62325.stdout
@@ -3,55 +3,55 @@
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "A",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "identity",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: '!',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
]
PRINT-ATTR INPUT (DISPLAY): struct B(identity!(::dollar_crate_external :: S));
@@ -59,54 +59,54 @@
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Ident {
ident: "B",
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "identity",
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Punct {
ch: '!',
spacing: Alone,
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
],
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
],
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #7 bytes(LO..HI),
+ span: #8 bytes(LO..HI),
},
]
diff --git a/src/test/ui/proc-macro/dollar-crate.stdout b/src/test/ui/proc-macro/dollar-crate.stdout
index da1d754..4f7e000 100644
--- a/src/test/ui/proc-macro/dollar-crate.stdout
+++ b/src/test/ui/proc-macro/dollar-crate.stdout
@@ -2,40 +2,40 @@
PRINT-BANG INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "M",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
]
PRINT-ATTR INPUT (DISPLAY): struct A(crate::S);
@@ -43,40 +43,40 @@
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "A",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
]
PRINT-DERIVE INPUT (DISPLAY): struct D(crate::S);
@@ -84,80 +84,80 @@
PRINT-DERIVE INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "D",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
],
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #2 bytes(LO..HI),
+ span: #3 bytes(LO..HI),
},
]
PRINT-BANG INPUT (DISPLAY): struct M ($crate :: S) ;
PRINT-BANG INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Ident {
ident: "M",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
],
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
]
PRINT-ATTR INPUT (DISPLAY): struct A(::dollar_crate_external::S);
@@ -165,40 +165,40 @@
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Ident {
ident: "A",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
],
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
]
PRINT-DERIVE INPUT (DISPLAY): struct D(::dollar_crate_external::S);
@@ -206,39 +206,39 @@
PRINT-DERIVE INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Ident {
ident: "D",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Ident {
ident: "S",
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
],
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
- span: #9 bytes(LO..HI),
+ span: #10 bytes(LO..HI),
},
]
diff --git a/src/test/ui/proc-macro/proc-macro-gates2.rs b/src/test/ui/proc-macro/proc-macro-gates2.rs
index 35d7fc8..2fd5efd 100644
--- a/src/test/ui/proc-macro/proc-macro-gates2.rs
+++ b/src/test/ui/proc-macro/proc-macro-gates2.rs
@@ -10,11 +10,11 @@
// should either require a feature gate or not be allowed on stable.
fn _test6<#[empty_attr] T>() {}
-//~^ ERROR: unknown to the compiler
+//~^ ERROR: expected an inert attribute, found an attribute macro
fn _test7() {
match 1 {
- #[empty_attr] //~ ERROR: unknown to the compiler
+ #[empty_attr] //~ ERROR: expected an inert attribute, found an attribute macro
0 => {}
_ => {}
}
diff --git a/src/test/ui/proc-macro/proc-macro-gates2.stderr b/src/test/ui/proc-macro/proc-macro-gates2.stderr
index a7f6f8b..fd271da 100644
--- a/src/test/ui/proc-macro/proc-macro-gates2.stderr
+++ b/src/test/ui/proc-macro/proc-macro-gates2.stderr
@@ -1,21 +1,14 @@
-error[E0658]: the attribute `empty_attr` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-gates2.rs:12:11
|
LL | fn _test6<#[empty_attr] T>() {}
| ^^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `empty_attr` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-gates2.rs:17:9
|
LL | #[empty_attr]
| ^^^^^^^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
error: aborting due to 2 previous errors
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/proc-macro/resolve-error.rs b/src/test/ui/proc-macro/resolve-error.rs
index 0a7861a..088f39c 100644
--- a/src/test/ui/proc-macro/resolve-error.rs
+++ b/src/test/ui/proc-macro/resolve-error.rs
@@ -23,11 +23,11 @@
//~^ ERROR cannot find
struct Foo;
-// Interpreted as a feature gated custom attribute
+// Interpreted as an unstable custom attribute
#[attr_proc_macra] //~ ERROR cannot find attribute macro `attr_proc_macra` in this scope
struct Bar;
-// Interpreted as a feature gated custom attribute
+// Interpreted as an unstable custom attribute
#[FooWithLongNan] //~ ERROR cannot find attribute macro `FooWithLongNan` in this scope
struct Asdf;
diff --git a/src/test/ui/reachable/expr_call.stderr b/src/test/ui/reachable/expr_call.stderr
index df5cff1..f2db17e4 100644
--- a/src/test/ui/reachable/expr_call.stderr
+++ b/src/test/ui/reachable/expr_call.stderr
@@ -10,11 +10,11 @@
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
-error: unreachable expression
+error: unreachable call
--> $DIR/expr_call.rs:18:5
|
LL | bar(return);
- | ^^^^^^^^^^^
+ | ^^^
error: aborting due to 2 previous errors
diff --git a/src/test/ui/reachable/expr_method.stderr b/src/test/ui/reachable/expr_method.stderr
index bbfa2ef..947ea0f 100644
--- a/src/test/ui/reachable/expr_method.stderr
+++ b/src/test/ui/reachable/expr_method.stderr
@@ -10,11 +10,11 @@
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
-error: unreachable expression
- --> $DIR/expr_method.rs:21:5
+error: unreachable call
+ --> $DIR/expr_method.rs:21:9
|
LL | Foo.bar(return);
- | ^^^^^^^^^^^^^^^
+ | ^^^
error: aborting due to 2 previous errors
diff --git a/src/test/ui/refutable-pattern-errors.rs b/src/test/ui/refutable-pattern-errors.rs
index aa5fa76..d4afe17 100644
--- a/src/test/ui/refutable-pattern-errors.rs
+++ b/src/test/ui/refutable-pattern-errors.rs
@@ -1,7 +1,9 @@
+// ignore-tidy-linelength
+
fn func((1, (Some(1), 2..=3)): (isize, (Option<isize>, isize))) { }
//~^ ERROR refutable pattern in function argument: `(_, _)` not covered
fn main() {
let (1, (Some(1), 2..=3)) = (1, (None, 2));
- //~^ ERROR refutable pattern in local binding: `(std::i32::MIN..=0i32, _)` not covered
+ //~^ ERROR refutable pattern in local binding: `(std::i32::MIN..=0i32, _)` and `(2i32..=std::i32::MAX, _)` not covered
}
diff --git a/src/test/ui/refutable-pattern-errors.stderr b/src/test/ui/refutable-pattern-errors.stderr
index c67ae7c..3b13e25 100644
--- a/src/test/ui/refutable-pattern-errors.stderr
+++ b/src/test/ui/refutable-pattern-errors.stderr
@@ -1,14 +1,14 @@
error[E0005]: refutable pattern in function argument: `(_, _)` not covered
- --> $DIR/refutable-pattern-errors.rs:1:9
+ --> $DIR/refutable-pattern-errors.rs:3:9
|
LL | fn func((1, (Some(1), 2..=3)): (isize, (Option<isize>, isize))) { }
| ^^^^^^^^^^^^^^^^^^^^^ pattern `(_, _)` not covered
-error[E0005]: refutable pattern in local binding: `(std::i32::MIN..=0i32, _)` not covered
- --> $DIR/refutable-pattern-errors.rs:5:9
+error[E0005]: refutable pattern in local binding: `(std::i32::MIN..=0i32, _)` and `(2i32..=std::i32::MAX, _)` not covered
+ --> $DIR/refutable-pattern-errors.rs:7:9
|
LL | let (1, (Some(1), 2..=3)) = (1, (None, 2));
- | ^^^^^^^^^^^^^^^^^^^^^ pattern `(std::i32::MIN..=0i32, _)` not covered
+ | ^^^^^^^^^^^^^^^^^^^^^ patterns `(std::i32::MIN..=0i32, _)` and `(2i32..=std::i32::MAX, _)` not covered
error: aborting due to 2 previous errors
diff --git a/src/test/ui/resolve/block-with-trait-parent.rs b/src/test/ui/resolve/block-with-trait-parent.rs
new file mode 100644
index 0000000..bc86f94
--- /dev/null
+++ b/src/test/ui/resolve/block-with-trait-parent.rs
@@ -0,0 +1,14 @@
+// check-pass
+
+trait Trait {
+ fn method(&self) {
+ // Items inside a block turn it into a module internally.
+ struct S;
+ impl Trait for S {}
+
+ // OK, `Trait` is in scope here from method resolution point of view.
+ S.method();
+ }
+}
+
+fn main() {}
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
index e43c8541e6..1e08616 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
@@ -4,15 +4,13 @@
// run-pass
-#![feature(bind_by_move_pattern_guards)]
-
use std::sync::mpsc::channel;
fn main() {
let (tx, rx) = channel();
let x = Some(rx);
- tx.send(false);
- tx.send(false);
+ tx.send(false).unwrap();
+ tx.send(false).unwrap();
match x {
Some(z) if z.recv().unwrap() => { panic!() },
Some(z) => { assert!(!z.recv().unwrap()); },
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_2015.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_2015.stderr
deleted file mode 100644
index fe1f699..0000000
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_2015.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: compilation successful
- --> $DIR/feature-gate.rs:36:1
- |
-LL | / fn main() {
-LL | | foo(107)
-LL | | }
- | |_^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_2018.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_2018.stderr
deleted file mode 100644
index fe1f699..0000000
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_2018.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: compilation successful
- --> $DIR/feature-gate.rs:36:1
- |
-LL | / fn main() {
-LL | | foo(107)
-LL | | }
- | |_^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_feature_nll.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_feature_nll.stderr
deleted file mode 100644
index 34e8b0e..0000000
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_feature_nll.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: compilation successful
- --> $DIR/feature-gate.rs:41:1
- |
-LL | / fn main() {
-LL | | foo(107)
-LL | | }
- | |_^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_znll.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_znll.stderr
deleted file mode 100644
index 34e8b0e..0000000
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.gate_and_znll.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: compilation successful
- --> $DIR/feature-gate.rs:41:1
- |
-LL | / fn main() {
-LL | | foo(107)
-LL | | }
- | |_^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.no_gate.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.no_gate.stderr
deleted file mode 100644
index 7a7b1c2..0000000
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.no_gate.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0008]: cannot bind by-move into a pattern guard
- --> $DIR/feature-gate.rs:28:16
- |
-LL | A { a: v } if *v == 42 => v,
- | ^ moves value into pattern guard
- |
- = help: add `#![feature(bind_by_move_pattern_guards)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0008`.
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.rs b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.rs
deleted file mode 100644
index 69fce0b..0000000
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/feature-gate.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Check that pattern-guards with move-bound variables is only allowed
-// with the appropriate set of feature gates. (Note that we require
-// the code to opt into MIR-borrowck in *some* way before the feature
-// will work; we use the revision system here to enumerate a number of
-// ways that opt-in could occur.)
-
-// gate-test-bind_by_move_pattern_guards
-
-// revisions: no_gate gate_and_2015 gate_and_2018
-
-// (We're already testing NLL behavior quite explicitly, no need for compare-mode=nll.)
-// ignore-compare-mode-nll
-
-#![feature(rustc_attrs)]
-
-#![cfg_attr(gate_and_2015, feature(bind_by_move_pattern_guards))]
-#![cfg_attr(gate_and_2018, feature(bind_by_move_pattern_guards))]
-
-//[gate_and_2015] edition:2015
-//[gate_and_2018] edition:2018
-
-struct A { a: Box<i32> }
-
-fn foo(n: i32) {
- let x = A { a: Box::new(n) };
- let _y = match x {
-
- A { a: v } if *v == 42 => v,
- //[no_gate]~^ ERROR cannot bind by-move into a pattern guard
-
- _ => Box::new(0)
- };
-}
-
-#[rustc_error]
-fn main() {
- foo(107)
-}
-//[gate_and_2015]~^^^ ERROR compilation successful
-//[gate_and_2018]~^^^^ ERROR compilation successful
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
new file mode 100644
index 0000000..3161d6f
--- /dev/null
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
@@ -0,0 +1,11 @@
+// This test used to emit E0008 but now passed since `bind_by_move_pattern_guards`
+// have been stabilized.
+
+// check-pass
+
+fn main() {
+ match Some("hi".to_string()) {
+ Some(s) if s.len() == 0 => {},
+ _ => {},
+ }
+}
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
index eccb4e41..b716fc8 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
@@ -1,5 +1,3 @@
-#![feature(bind_by_move_pattern_guards)]
-
// run-pass
struct A { a: Box<i32> }
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
index 602a8e1..d1f685f 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
@@ -1,5 +1,3 @@
-#![feature(bind_by_move_pattern_guards)]
-
enum VecWrapper { A(Vec<i32>) }
fn foo(x: VecWrapper) -> usize {
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
index c9e8fc8..7becd01 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
@@ -1,5 +1,5 @@
error[E0507]: cannot move out of `v` in pattern guard
- --> $DIR/rfc-reject-double-move-across-arms.rs:7:36
+ --> $DIR/rfc-reject-double-move-across-arms.rs:5:36
|
LL | VecWrapper::A(v) if { drop(v); false } => 1,
| ^ move occurs because `v` has type `std::vec::Vec<i32>`, which does not implement the `Copy` trait
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
index 77252a1..571f51c 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
@@ -1,5 +1,3 @@
-#![feature(bind_by_move_pattern_guards)]
-
struct A { a: Box<i32> }
fn foo(n: i32) {
diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
index a345022..b93e721 100644
--- a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
+++ b/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
@@ -1,5 +1,5 @@
error[E0507]: cannot move out of `v` in pattern guard
- --> $DIR/rfc-reject-double-move-in-first-arm.rs:8:30
+ --> $DIR/rfc-reject-double-move-in-first-arm.rs:6:30
|
LL | A { a: v } if { drop(v); true } => v,
| ^ move occurs because `v` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
index 470a5ea..fe7df44 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
@@ -10,11 +10,11 @@
fn main() {
let variant_tuple = NonExhaustiveVariants::Tuple(340);
- let variant_struct = NonExhaustiveVariants::Struct { field: 340 };
+ let _variant_struct = NonExhaustiveVariants::Struct { field: 340 };
match variant_tuple {
NonExhaustiveVariants::Unit => "",
- NonExhaustiveVariants::Tuple(fe_tpl) => "",
- NonExhaustiveVariants::Struct { field } => ""
+ NonExhaustiveVariants::Tuple(_fe_tpl) => "",
+ NonExhaustiveVariants::Struct { field: _ } => ""
};
}
diff --git a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs b/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs
index 1de4e5b..b95105b 100644
--- a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs
+++ b/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs
@@ -2,8 +2,6 @@
#![allow(irrefutable_let_patterns)]
-use std::ops::Range;
-
fn main() {
let x: bool;
// This should associate as: `(x = (true && false));`.
diff --git a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr b/src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr
new file mode 100644
index 0000000..be7ef65
--- /dev/null
+++ b/src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr
@@ -0,0 +1,8 @@
+warning: unreachable block in `if` expression
+ --> $DIR/protect-precedences.rs:13:41
+ |
+LL | if let _ = return true && false {};
+ | ^^
+ |
+ = note: `#[warn(unreachable_code)]` on by default
+
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
index b957c67..a8fe5d6 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
+++ b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
@@ -5,7 +5,7 @@
/// Foo
//~^ ERROR documentation comments cannot be applied to function
#[test] a: i32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -21,7 +21,7 @@
/// Foo
//~^ ERROR documentation comments cannot be applied to function
#[test] a: u32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -36,7 +36,7 @@
/// Foo
//~^ ERROR documentation comments cannot be applied to function
#[test] a: u32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -56,7 +56,7 @@
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[test] a: i32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Baz
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -77,7 +77,7 @@
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[test] a: i32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Baz
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -96,7 +96,7 @@
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[test] a: i32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Baz
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -115,7 +115,7 @@
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[test] a: i32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Baz
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
@@ -132,7 +132,7 @@
/// Foo
//~^ ERROR documentation comments cannot be applied to function
#[test] a: u32,
- //~^ ERROR the attribute `test` is currently unknown to the compiler and may have
+ //~^ ERROR expected an inert attribute, found an attribute macro
/// Bar
//~^ ERROR documentation comments cannot be applied to function
#[must_use]
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
index a57572a..8ab3fc3 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
+++ b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
@@ -1,3 +1,51 @@
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:7:9
+ |
+LL | #[test] a: i32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:23:5
+ |
+LL | #[test] a: u32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:38:5
+ |
+LL | #[test] a: u32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:58:9
+ |
+LL | #[test] a: i32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:79:9
+ |
+LL | #[test] a: i32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:98:9
+ |
+LL | #[test] a: i32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:117:9
+ |
+LL | #[test] a: i32,
+ | ^^^^^^^
+
+error: expected an inert attribute, found an attribute macro
+ --> $DIR/param-attrs-builtin-attrs.rs:134:9
+ |
+LL | #[test] a: u32,
+ | ^^^^^^^
+
error: documentation comments cannot be applied to function parameters
--> $DIR/param-attrs-builtin-attrs.rs:5:9
|
@@ -262,78 +310,5 @@
LL | #[no_mangle] b: i32
| ^^^^^^^^^^^^
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:7:9
- |
-LL | #[test] a: i32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:23:5
- |
-LL | #[test] a: u32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:38:5
- |
-LL | #[test] a: u32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:58:9
- |
-LL | #[test] a: i32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:79:9
- |
-LL | #[test] a: i32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:98:9
- |
-LL | #[test] a: i32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:117:9
- |
-LL | #[test] a: i32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
-error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future
- --> $DIR/param-attrs-builtin-attrs.rs:134:9
- |
-LL | #[test] a: u32,
- | ^^^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-
error: aborting due to 52 previous errors
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs b/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
index 8defa26..7f00308 100644
--- a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
+++ b/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
@@ -9,52 +9,52 @@
struct W(u8);
extern "C" { fn ffi(#[id] arg1: i32, #[id] ...); }
-//~^ ERROR the attribute `id` is currently unknown to the compiler
-//~| ERROR the attribute `id` is currently unknown to the compiler
+//~^ ERROR expected an inert attribute, found an attribute macro
+//~| ERROR expected an inert attribute, found an attribute macro
unsafe extern "C" fn cvar(arg1: i32, #[id] mut args: ...) {}
-//~^ ERROR the attribute `id` is currently unknown to the compiler
+//~^ ERROR expected an inert attribute, found an attribute macro
type Alias = extern "C" fn(#[id] u8, #[id] ...);
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn free(#[id] arg1: u8) {
- //~^ ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
let lam = |#[id] W(x), #[id] y| ();
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
}
impl W {
fn inherent1(#[id] self, #[id] arg1: u8) {}
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn inherent2(#[id] &self, #[id] arg1: u8) {}
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn inherent3<'a>(#[id] &'a mut self, #[id] arg1: u8) {}
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn inherent4<'a>(#[id] self: Box<Self>, #[id] arg1: u8) {}
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
}
trait A {
fn trait1(#[id] self, #[id] arg1: u8);
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn trait2(#[id] &self, #[id] arg1: u8);
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn trait3<'a>(#[id] &'a mut self, #[id] arg1: u8);
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
fn trait4<'a>(#[id] self: Box<Self>, #[id] arg1: u8, #[id] Vec<u8>);
- //~^ ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
- //~| ERROR the attribute `id` is currently unknown to the compiler
+ //~^ ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
+ //~| ERROR expected an inert attribute, found an attribute macro
}
fn main() {}
diff --git a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr b/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
index 69b9a46..3b72e8a 100644
--- a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
+++ b/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
@@ -1,228 +1,152 @@
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:11:21
|
LL | extern "C" { fn ffi(#[id] arg1: i32, #[id] ...); }
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:11:38
|
LL | extern "C" { fn ffi(#[id] arg1: i32, #[id] ...); }
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:15:38
|
LL | unsafe extern "C" fn cvar(arg1: i32, #[id] mut args: ...) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:18:28
|
LL | type Alias = extern "C" fn(#[id] u8, #[id] ...);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:18:38
|
LL | type Alias = extern "C" fn(#[id] u8, #[id] ...);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:22:9
|
LL | fn free(#[id] arg1: u8) {
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:24:16
|
LL | let lam = |#[id] W(x), #[id] y| ();
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:24:28
|
LL | let lam = |#[id] W(x), #[id] y| ();
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:30:18
|
LL | fn inherent1(#[id] self, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:30:30
|
LL | fn inherent1(#[id] self, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:33:18
|
LL | fn inherent2(#[id] &self, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:33:31
|
LL | fn inherent2(#[id] &self, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:36:22
|
LL | fn inherent3<'a>(#[id] &'a mut self, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:36:42
|
LL | fn inherent3<'a>(#[id] &'a mut self, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:39:22
|
LL | fn inherent4<'a>(#[id] self: Box<Self>, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:39:45
|
LL | fn inherent4<'a>(#[id] self: Box<Self>, #[id] arg1: u8) {}
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:45:15
|
LL | fn trait1(#[id] self, #[id] arg1: u8);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:45:27
|
LL | fn trait1(#[id] self, #[id] arg1: u8);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:48:15
|
LL | fn trait2(#[id] &self, #[id] arg1: u8);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:48:28
|
LL | fn trait2(#[id] &self, #[id] arg1: u8);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:51:19
|
LL | fn trait3<'a>(#[id] &'a mut self, #[id] arg1: u8);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:51:39
|
LL | fn trait3<'a>(#[id] &'a mut self, #[id] arg1: u8);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:54:19
|
LL | fn trait4<'a>(#[id] self: Box<Self>, #[id] arg1: u8, #[id] Vec<u8>);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:54:42
|
LL | fn trait4<'a>(#[id] self: Box<Self>, #[id] arg1: u8, #[id] Vec<u8>);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
-error[E0658]: the attribute `id` is currently unknown to the compiler and may have meaning added to it in the future
+error: expected an inert attribute, found an attribute macro
--> $DIR/proc-macro-cannot-be-used.rs:54:58
|
LL | fn trait4<'a>(#[id] self: Box<Self>, #[id] arg1: u8, #[id] Vec<u8>);
| ^^^^^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/29642
- = help: add `#![feature(custom_attribute)]` to the crate attributes to enable
error: aborting due to 25 previous errors
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/rust-2018/trait-import-suggestions.stderr b/src/test/ui/rust-2018/trait-import-suggestions.stderr
index a811812..19f758f 100644
--- a/src/test/ui/rust-2018/trait-import-suggestions.stderr
+++ b/src/test/ui/rust-2018/trait-import-suggestions.stderr
@@ -2,7 +2,7 @@
--> $DIR/trait-import-suggestions.rs:22:11
|
LL | x.foobar();
- | ^^^^^^
+ | ^^^^^^ method not found in `u32`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -12,7 +12,7 @@
--> $DIR/trait-import-suggestions.rs:28:7
|
LL | x.bar();
- | ^^^
+ | ^^^ method not found in `u32`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -24,7 +24,7 @@
--> $DIR/trait-import-suggestions.rs:29:7
|
LL | x.baz();
- | ^^^
+ | ^^^ method not found in `u32`
error[E0599]: no function or associated item named `from_str` found for type `u32` in the current scope
--> $DIR/trait-import-suggestions.rs:30:18
diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.rs b/src/test/ui/rust-2018/uniform-paths/deadlock.rs
index 3228d79..83ed70a 100644
--- a/src/test/ui/rust-2018/uniform-paths/deadlock.rs
+++ b/src/test/ui/rust-2018/uniform-paths/deadlock.rs
@@ -1,7 +1,7 @@
// edition:2018
// compile-flags:--extern foo --extern bar
-use foo::bar; //~ ERROR unresolved import
+use foo::bar; //~ ERROR can't find crate for `foo`
use bar::foo;
fn main() {}
diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr b/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
index b4ac15c..9336e90 100644
--- a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
+++ b/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
@@ -1,9 +1,9 @@
-error[E0432]: unresolved import
+error[E0463]: can't find crate for `foo`
--> $DIR/deadlock.rs:4:5
|
LL | use foo::bar;
- | ^^^^^^^^
+ | ^^^ can't find crate
error: aborting due to previous error
-For more information about this error, try `rustc --explain E0432`.
+For more information about this error, try `rustc --explain E0463`.
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-method.stderr b/src/test/ui/self/point-at-arbitrary-self-type-method.stderr
index 06dad7c..dec5809 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-method.stderr
+++ b/src/test/ui/self/point-at-arbitrary-self-type-method.stderr
@@ -8,7 +8,7 @@
| --- the method is available for `std::boxed::Box<A>` here
...
LL | A.foo();
- | ^^^
+ | ^^^ method not found in `A`
error: aborting due to previous error
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr b/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
index 90cd3b8..e93c4da 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
+++ b/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
@@ -7,7 +7,7 @@
| --------- method `foo` not found for this
...
LL | A.foo()
- | ^^^
+ | ^^^ method not found in `A`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `foo`, perhaps you need to implement it:
diff --git a/src/test/ui/shadowed/shadowed-trait-methods.stderr b/src/test/ui/shadowed/shadowed-trait-methods.stderr
index e05da17..190159e 100644
--- a/src/test/ui/shadowed/shadowed-trait-methods.stderr
+++ b/src/test/ui/shadowed/shadowed-trait-methods.stderr
@@ -2,7 +2,7 @@
--> $DIR/shadowed-trait-methods.rs:13:8
|
LL | ().f()
- | ^
+ | ^ method not found in `()`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
index c14fc04..bbfe4c3 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
+++ b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
@@ -5,7 +5,7 @@
| ---------------- method `foo_one` not found for this
...
LL | println!("{}", MyStruct.foo_one());
- | ^^^^^^^
+ | ^^^^^^^ method not found in `MyStruct`
|
= note: the method `foo_one` exists but the following trait bounds were not satisfied:
`MyStruct : Foo`
diff --git a/src/test/ui/std-backtrace.rs b/src/test/ui/std-backtrace.rs
new file mode 100644
index 0000000..d84c493d
--- /dev/null
+++ b/src/test/ui/std-backtrace.rs
@@ -0,0 +1,75 @@
+// run-pass
+// ignore-android FIXME #17520
+// ignore-cloudabi spawning processes is not supported
+// ignore-emscripten spawning processes is not supported
+// ignore-openbsd no support for libbacktrace without filename
+// ignore-sgx no processes
+// ignore-msvc see #62897 and `backtrace-debuginfo.rs` test
+// compile-flags:-g
+
+#![feature(backtrace)]
+
+use std::env;
+use std::process::Command;
+use std::str;
+
+fn main() {
+ let args: Vec<String> = env::args().collect();
+ if args.len() >= 2 && args[1] == "force" {
+ println!("{}", std::backtrace::Backtrace::force_capture());
+ } else if args.len() >= 2 {
+ println!("{}", std::backtrace::Backtrace::capture());
+ } else {
+ runtest(&args[0]);
+ println!("test ok");
+ }
+}
+
+fn runtest(me: &str) {
+ env::remove_var("RUST_BACKTRACE");
+ env::remove_var("RUST_LIB_BACKTRACE");
+
+ let p = Command::new(me).arg("a").env("RUST_BACKTRACE", "1").output().unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
+ assert!(String::from_utf8_lossy(&p.stdout).contains("backtrace::main"));
+
+ let p = Command::new(me).arg("a").env("RUST_BACKTRACE", "0").output().unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("disabled backtrace\n"));
+
+ let p = Command::new(me).arg("a").output().unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("disabled backtrace\n"));
+
+ let p = Command::new(me)
+ .arg("a")
+ .env("RUST_LIB_BACKTRACE", "1")
+ .env("RUST_BACKTRACE", "1")
+ .output()
+ .unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
+
+ let p = Command::new(me)
+ .arg("a")
+ .env("RUST_LIB_BACKTRACE", "0")
+ .env("RUST_BACKTRACE", "1")
+ .output()
+ .unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("disabled backtrace\n"));
+
+ let p = Command::new(me)
+ .arg("force")
+ .env("RUST_LIB_BACKTRACE", "0")
+ .env("RUST_BACKTRACE", "0")
+ .output()
+ .unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
+
+ let p = Command::new(me).arg("force").output().unwrap();
+ assert!(p.status.success());
+ assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
+}
diff --git a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr b/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr
index 48c2503..4aec720 100644
--- a/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr
+++ b/src/test/ui/suggestions/impl-trait-with-missing-trait-bounds-in-arg.stderr
@@ -2,7 +2,7 @@
--> $DIR/impl-trait-with-missing-trait-bounds-in-arg.rs:15:9
|
LL | foo.hello();
- | ^^^^^
+ | ^^^^^ method not found in `impl Foo`
|
= help: items from traits can only be used if the type parameter is bounded by the trait
help: the following trait defines an item `hello`, perhaps you need to restrict type parameter `impl Foo` with it:
diff --git a/src/test/ui/suggestions/issue-21673.stderr b/src/test/ui/suggestions/issue-21673.stderr
index 6cf71c8..f2496f6 100644
--- a/src/test/ui/suggestions/issue-21673.stderr
+++ b/src/test/ui/suggestions/issue-21673.stderr
@@ -2,7 +2,7 @@
--> $DIR/issue-21673.rs:6:7
|
LL | x.method()
- | ^^^^^^
+ | ^^^^^^ method not found in `&T`
|
= help: items from traits can only be used if the type parameter is bounded by the trait
help: the following trait defines an item `method`, perhaps you need to restrict type parameter `T` with it:
@@ -14,7 +14,7 @@
--> $DIR/issue-21673.rs:10:7
|
LL | x.method()
- | ^^^^^^
+ | ^^^^^^ method not found in `T`
|
= help: items from traits can only be used if the type parameter is bounded by the trait
help: the following trait defines an item `method`, perhaps you need to restrict type parameter `T` with it:
diff --git a/src/test/ui/suggestions/suggest-methods.stderr b/src/test/ui/suggestions/suggest-methods.stderr
index ad4a4de..4678410 100644
--- a/src/test/ui/suggestions/suggest-methods.stderr
+++ b/src/test/ui/suggestions/suggest-methods.stderr
@@ -23,7 +23,7 @@
--> $DIR/suggest-methods.rs:28:19
|
LL | let _ = 63u32.count_o();
- | ^^^^^^^
+ | ^^^^^^^ method not found in `u32`
error: aborting due to 4 previous errors
diff --git a/src/test/ui/test-shadowing/auxiliary/test_macro.rs b/src/test/ui/test-attrs/auxiliary/test_macro.rs
similarity index 100%
rename from src/test/ui/test-shadowing/auxiliary/test_macro.rs
rename to src/test/ui/test-attrs/auxiliary/test_macro.rs
diff --git a/src/test/ui/test-attrs/decl-macro-test.rs b/src/test/ui/test-attrs/decl-macro-test.rs
new file mode 100644
index 0000000..fcbe9f4
--- /dev/null
+++ b/src/test/ui/test-attrs/decl-macro-test.rs
@@ -0,0 +1,22 @@
+// Check that declarative macros can declare tests
+
+// check-pass
+// compile-flags: --test
+
+#![feature(decl_macro)]
+
+macro create_test() {
+ #[test]
+ fn test() {}
+}
+
+macro create_module_test() {
+ mod x {
+ #[test]
+ fn test() {}
+ }
+}
+
+create_test!();
+create_test!();
+create_module_test!();
diff --git a/src/test/ui/test-attrs/inaccessible-test-modules.rs b/src/test/ui/test-attrs/inaccessible-test-modules.rs
new file mode 100644
index 0000000..f5b3479
--- /dev/null
+++ b/src/test/ui/test-attrs/inaccessible-test-modules.rs
@@ -0,0 +1,9 @@
+// compile-flags:--test
+
+// the `--test` harness creates modules with these textual names, but
+// they should be inaccessible from normal code.
+use main as x; //~ ERROR unresolved import `main`
+use test as y; //~ ERROR unresolved import `test`
+
+#[test]
+fn baz() {}
diff --git a/src/test/ui/test-attrs/inaccessible-test-modules.stderr b/src/test/ui/test-attrs/inaccessible-test-modules.stderr
new file mode 100644
index 0000000..a94ea1e
--- /dev/null
+++ b/src/test/ui/test-attrs/inaccessible-test-modules.stderr
@@ -0,0 +1,21 @@
+error[E0432]: unresolved import `main`
+ --> $DIR/inaccessible-test-modules.rs:5:5
+ |
+LL | use main as x;
+ | ----^^^^^
+ | |
+ | no `main` in the root
+ | help: a similar name exists in the module: `main`
+
+error[E0432]: unresolved import `test`
+ --> $DIR/inaccessible-test-modules.rs:6:5
+ |
+LL | use test as y;
+ | ----^^^^^
+ | |
+ | no `test` in the root
+ | help: a similar name exists in the module: `test`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/test-allow-fail-attr.rs b/src/test/ui/test-attrs/test-allow-fail-attr.rs
similarity index 100%
rename from src/test/ui/test-allow-fail-attr.rs
rename to src/test/ui/test-attrs/test-allow-fail-attr.rs
diff --git a/src/test/ui/test-attr-non-associated-functions.rs b/src/test/ui/test-attrs/test-attr-non-associated-functions.rs
similarity index 100%
rename from src/test/ui/test-attr-non-associated-functions.rs
rename to src/test/ui/test-attrs/test-attr-non-associated-functions.rs
diff --git a/src/test/ui/test-attr-non-associated-functions.stderr b/src/test/ui/test-attrs/test-attr-non-associated-functions.stderr
similarity index 100%
rename from src/test/ui/test-attr-non-associated-functions.stderr
rename to src/test/ui/test-attrs/test-attr-non-associated-functions.stderr
diff --git a/src/test/ui/test-shadowing/test-cant-be-shadowed.rs b/src/test/ui/test-attrs/test-cant-be-shadowed.rs
similarity index 100%
rename from src/test/ui/test-shadowing/test-cant-be-shadowed.rs
rename to src/test/ui/test-attrs/test-cant-be-shadowed.rs
diff --git a/src/test/ui/test-fn-signature-verification-for-explicit-return-type.rs b/src/test/ui/test-attrs/test-fn-signature-verification-for-explicit-return-type.rs
similarity index 100%
rename from src/test/ui/test-fn-signature-verification-for-explicit-return-type.rs
rename to src/test/ui/test-attrs/test-fn-signature-verification-for-explicit-return-type.rs
diff --git a/src/test/ui/test-main-not-dead-attr.rs b/src/test/ui/test-attrs/test-main-not-dead-attr.rs
similarity index 100%
rename from src/test/ui/test-main-not-dead-attr.rs
rename to src/test/ui/test-attrs/test-main-not-dead-attr.rs
diff --git a/src/test/ui/test-main-not-dead.rs b/src/test/ui/test-attrs/test-main-not-dead.rs
similarity index 100%
rename from src/test/ui/test-main-not-dead.rs
rename to src/test/ui/test-attrs/test-main-not-dead.rs
diff --git a/src/test/ui/test-on-macro.rs b/src/test/ui/test-attrs/test-on-macro.rs
similarity index 100%
rename from src/test/ui/test-on-macro.rs
rename to src/test/ui/test-attrs/test-on-macro.rs
diff --git a/src/test/ui/test-on-macro.stderr b/src/test/ui/test-attrs/test-on-macro.stderr
similarity index 100%
rename from src/test/ui/test-on-macro.stderr
rename to src/test/ui/test-attrs/test-on-macro.stderr
diff --git a/src/test/ui/test-runner-hides-buried-main.rs b/src/test/ui/test-attrs/test-runner-hides-buried-main.rs
similarity index 100%
rename from src/test/ui/test-runner-hides-buried-main.rs
rename to src/test/ui/test-attrs/test-runner-hides-buried-main.rs
diff --git a/src/test/ui/test-runner-hides-main.rs b/src/test/ui/test-attrs/test-runner-hides-main.rs
similarity index 100%
rename from src/test/ui/test-runner-hides-main.rs
rename to src/test/ui/test-attrs/test-runner-hides-main.rs
diff --git a/src/test/ui/test-runner-hides-start.rs b/src/test/ui/test-attrs/test-runner-hides-start.rs
similarity index 100%
rename from src/test/ui/test-runner-hides-start.rs
rename to src/test/ui/test-attrs/test-runner-hides-start.rs
diff --git a/src/test/ui/test-should-fail-good-message.rs b/src/test/ui/test-attrs/test-should-fail-good-message.rs
similarity index 100%
rename from src/test/ui/test-should-fail-good-message.rs
rename to src/test/ui/test-attrs/test-should-fail-good-message.rs
diff --git a/src/test/ui/test-should-panic-attr.rs b/src/test/ui/test-attrs/test-should-panic-attr.rs
similarity index 100%
rename from src/test/ui/test-should-panic-attr.rs
rename to src/test/ui/test-attrs/test-should-panic-attr.rs
diff --git a/src/test/ui/test-should-panic-attr.stderr b/src/test/ui/test-attrs/test-should-panic-attr.stderr
similarity index 100%
rename from src/test/ui/test-should-panic-attr.stderr
rename to src/test/ui/test-attrs/test-should-panic-attr.stderr
diff --git a/src/test/ui/test-vs-cfg-test.rs b/src/test/ui/test-attrs/test-vs-cfg-test.rs
similarity index 100%
rename from src/test/ui/test-vs-cfg-test.rs
rename to src/test/ui/test-attrs/test-vs-cfg-test.rs
diff --git a/src/test/ui/test-warns-dead-code.rs b/src/test/ui/test-attrs/test-warns-dead-code.rs
similarity index 100%
rename from src/test/ui/test-warns-dead-code.rs
rename to src/test/ui/test-attrs/test-warns-dead-code.rs
diff --git a/src/test/ui/test-warns-dead-code.stderr b/src/test/ui/test-attrs/test-warns-dead-code.stderr
similarity index 100%
rename from src/test/ui/test-warns-dead-code.stderr
rename to src/test/ui/test-attrs/test-warns-dead-code.stderr
diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs
index 8c62b34..c07da43 100644
--- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs
+++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs
@@ -4,7 +4,7 @@
#[derive(rustfmt)] //~ ERROR cannot find derive macro `rustfmt` in this scope
struct S;
-// Interpreted as a feature gated custom attribute
+// Interpreted as an unstable custom attribute
#[rustfmt] //~ ERROR cannot find attribute macro `rustfmt` in this scope
fn check() {}
diff --git a/src/test/ui/traits/trait-alias/trait-alias-object-wf.rs b/src/test/ui/traits/trait-alias/trait-alias-object-wf.rs
index fb26b7e..1440f02 100644
--- a/src/test/ui/traits/trait-alias/trait-alias-object-wf.rs
+++ b/src/test/ui/traits/trait-alias/trait-alias-object-wf.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
// This test checks that trait objects involving trait aliases are well-formed.
diff --git a/src/test/ui/traits/trait-impl-1.stderr b/src/test/ui/traits/trait-impl-1.stderr
index 71d5cc2..0d61c3e 100644
--- a/src/test/ui/traits/trait-impl-1.stderr
+++ b/src/test/ui/traits/trait-impl-1.stderr
@@ -2,7 +2,7 @@
--> $DIR/trait-impl-1.rs:15:7
|
LL | x.foo();
- | ^^^
+ | ^^^ method not found in `&i32`
error: aborting due to previous error
diff --git a/src/test/ui/traits/trait-item-privacy.stderr b/src/test/ui/traits/trait-item-privacy.stderr
index 16ea7bd..39cc66d 100644
--- a/src/test/ui/traits/trait-item-privacy.stderr
+++ b/src/test/ui/traits/trait-item-privacy.stderr
@@ -5,7 +5,7 @@
| --------- method `a` not found for this
...
LL | S.a();
- | ^
+ | ^ method not found in `S`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `a`, perhaps you need to implement it:
@@ -25,7 +25,7 @@
| the method is available for `std::rc::Rc<S>` here
...
LL | S.b();
- | ^
+ | ^ method not found in `S`
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
index f0f0481..d172d5e 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
@@ -12,7 +12,7 @@
--> $DIR/trivial-bounds-leak.rs:24:10
|
LL | 3i32.test();
- | ^^^^
+ | ^^^^ method not found in `i32`
|
= help: items from traits can only be used if the trait is implemented and in scope
= note: the following trait defines an item `test`, perhaps you need to implement it:
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
index 0c21209..19fcc78 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
@@ -9,13 +9,13 @@
#![allow(irrefutable_let_patterns)]
-enum Enum<T> { TSVariant(T), SVariant { v: T }, UVariant }
+enum Enum<T> { TSVariant(T), SVariant { _v: T }, UVariant }
type Alias<T> = Enum<T>;
type AliasFixed = Enum<()>;
macro_rules! is_variant {
(TSVariant, $expr:expr) => (is_variant!(@check TSVariant, (_), $expr));
- (SVariant, $expr:expr) => (is_variant!(@check SVariant, { v: _ }, $expr));
+ (SVariant, $expr:expr) => (is_variant!(@check SVariant, { _v: _ }, $expr));
(UVariant, $expr:expr) => (is_variant!(@check UVariant, {}, $expr));
(@check $variant:ident, $matcher:tt, $expr:expr) => (
assert!(if let Enum::$variant::<()> $matcher = $expr { true } else { false },
@@ -37,14 +37,14 @@
// Struct variant
- is_variant!(SVariant, Enum::SVariant { v: () });
- is_variant!(SVariant, Enum::SVariant::<()> { v: () });
- is_variant!(SVariant, Enum::<()>::SVariant { v: () });
+ is_variant!(SVariant, Enum::SVariant { _v: () });
+ is_variant!(SVariant, Enum::SVariant::<()> { _v: () });
+ is_variant!(SVariant, Enum::<()>::SVariant { _v: () });
- is_variant!(SVariant, Alias::SVariant { v: () });
- is_variant!(SVariant, Alias::<()>::SVariant { v: () });
+ is_variant!(SVariant, Alias::SVariant { _v: () });
+ is_variant!(SVariant, Alias::<()>::SVariant { _v: () });
- is_variant!(SVariant, AliasFixed::SVariant { v: () });
+ is_variant!(SVariant, AliasFixed::SVariant { _v: () });
// Unit variant
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr
index 2e18458..18276d5 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr
@@ -2,7 +2,7 @@
--> $DIR/unboxed-closures-static-call-wrong-trait.rs:7:10
|
LL | mut_.call((0, ));
- | ^^^^
+ | ^^^^ method not found in `[closure@$DIR/unboxed-closures-static-call-wrong-trait.rs:6:26: 6:31]`
|
= note: mut_ is a function, perhaps you wish to call it
diff --git a/src/test/ui/underscore-imports/shadow.stderr b/src/test/ui/underscore-imports/shadow.stderr
index 92adca2..63262d0 100644
--- a/src/test/ui/underscore-imports/shadow.stderr
+++ b/src/test/ui/underscore-imports/shadow.stderr
@@ -2,7 +2,7 @@
--> $DIR/shadow.rs:19:11
|
LL | x.deref();
- | ^^^^^
+ | ^^^^^ method not found in `&()`
|
= help: items from traits can only be used if the trait is in scope
= note: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/uninhabited/uninhabited-irrefutable.stderr b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr
index 45976f8..29ff1dc 100644
--- a/src/test/ui/uninhabited/uninhabited-irrefutable.stderr
+++ b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr
@@ -3,6 +3,7 @@
|
LL | / enum Foo {
LL | | A(foo::SecretlyEmpty),
+ | | - not covered
LL | | B(foo::NotSoSecretlyEmpty),
LL | | C(NotSoSecretlyEmpty),
LL | | D(u32),
diff --git a/src/test/ui/union/union-derive-clone.stderr b/src/test/ui/union/union-derive-clone.stderr
index 37a0093..4f4c779 100644
--- a/src/test/ui/union/union-derive-clone.stderr
+++ b/src/test/ui/union/union-derive-clone.stderr
@@ -13,7 +13,7 @@
| ----------- method `clone` not found for this
...
LL | let w = u.clone();
- | ^^^^^
+ | ^^^^^ method not found in `U4<CloneNoCopy>`
|
= note: the method `clone` exists but the following trait bounds were not satisfied:
`U4<CloneNoCopy> : std::clone::Clone`
diff --git a/src/test/ui/union/union-repr-c.rs b/src/test/ui/union/union-repr-c.rs
index 658452d..1367835 100644
--- a/src/test/ui/union/union-repr-c.rs
+++ b/src/test/ui/union/union-repr-c.rs
@@ -12,7 +12,7 @@
extern "C" {
static FOREIGN1: U; // OK
- static FOREIGN2: W; //~ ERROR union has unspecified layout
+ static FOREIGN2: W; //~ ERROR `extern` block uses type `W`
}
fn main() {}
diff --git a/src/test/ui/union/union-repr-c.stderr b/src/test/ui/union/union-repr-c.stderr
index c60817a..c8bc038 100644
--- a/src/test/ui/union/union-repr-c.stderr
+++ b/src/test/ui/union/union-repr-c.stderr
@@ -1,8 +1,8 @@
-error: `extern` block uses type `W` which is not FFI-safe: this union has unspecified layout
+error: `extern` block uses type `W`, which is not FFI-safe
--> $DIR/union-repr-c.rs:15:22
|
LL | static FOREIGN2: W;
- | ^
+ | ^ not FFI-safe
|
note: lint level defined here
--> $DIR/union-repr-c.rs:2:9
@@ -10,6 +10,7 @@
LL | #![deny(improper_ctypes)]
| ^^^^^^^^^^^^^^^
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this union
+ = note: this union has unspecified layout
note: type defined here
--> $DIR/union-repr-c.rs:9:1
|
diff --git a/src/test/ui/unique-object-noncopyable.stderr b/src/test/ui/unique-object-noncopyable.stderr
index 407905f..cd46878 100644
--- a/src/test/ui/unique-object-noncopyable.stderr
+++ b/src/test/ui/unique-object-noncopyable.stderr
@@ -2,7 +2,7 @@
--> $DIR/unique-object-noncopyable.rs:24:16
|
LL | let _z = y.clone();
- | ^^^^^
+ | ^^^^^ method not found in `std::boxed::Box<dyn Foo>`
|
= note: the method `clone` exists but the following trait bounds were not satisfied:
`std::boxed::Box<dyn Foo> : std::clone::Clone`
diff --git a/src/test/ui/unique-pinned-nocopy.stderr b/src/test/ui/unique-pinned-nocopy.stderr
index 0f6ba90..19ef2b2 100644
--- a/src/test/ui/unique-pinned-nocopy.stderr
+++ b/src/test/ui/unique-pinned-nocopy.stderr
@@ -2,7 +2,7 @@
--> $DIR/unique-pinned-nocopy.rs:12:16
|
LL | let _j = i.clone();
- | ^^^^^
+ | ^^^^^ method not found in `std::boxed::Box<R>`
|
= note: the method `clone` exists but the following trait bounds were not satisfied:
`std::boxed::Box<R> : std::clone::Clone`
diff --git a/src/test/ui/unreachable/unreachable-in-call.rs b/src/test/ui/unreachable/unreachable-in-call.rs
index 25f849d..dd94e79 100644
--- a/src/test/ui/unreachable/unreachable-in-call.rs
+++ b/src/test/ui/unreachable/unreachable-in-call.rs
@@ -14,7 +14,7 @@
get_u8()); //~ ERROR unreachable expression
}
fn diverge_second() {
- call( //~ ERROR unreachable expression
+ call( //~ ERROR unreachable call
get_u8(),
diverge());
}
diff --git a/src/test/ui/unreachable/unreachable-in-call.stderr b/src/test/ui/unreachable/unreachable-in-call.stderr
index f8dd545..c740011 100644
--- a/src/test/ui/unreachable/unreachable-in-call.stderr
+++ b/src/test/ui/unreachable/unreachable-in-call.stderr
@@ -10,13 +10,11 @@
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
-error: unreachable expression
+error: unreachable call
--> $DIR/unreachable-in-call.rs:17:5
|
-LL | / call(
-LL | | get_u8(),
-LL | | diverge());
- | |__________________^
+LL | call(
+ | ^^^^
error: aborting due to 2 previous errors
diff --git a/src/test/ui/while-let.rs b/src/test/ui/while-let.rs
index 69f9de9..53babef 100644
--- a/src/test/ui/while-let.rs
+++ b/src/test/ui/while-let.rs
@@ -1,5 +1,6 @@
// run-pass
+#[allow(dead_code)]
fn macros() {
macro_rules! foo{
($p:pat, $e:expr, $b:block) => {{
@@ -12,16 +13,16 @@
}}
}
- foo!(a, 1, { //~ WARN irrefutable while-let
+ foo!(_a, 1, { //~ WARN irrefutable while-let
println!("irrefutable pattern");
});
- bar!(a, 1, { //~ WARN irrefutable while-let
+ bar!(_a, 1, { //~ WARN irrefutable while-let
println!("irrefutable pattern");
});
}
pub fn main() {
- while let a = 1 { //~ WARN irrefutable while-let
+ while let _a = 1 { //~ WARN irrefutable while-let
println!("irrefutable pattern");
break;
}
diff --git a/src/test/ui/while-let.stderr b/src/test/ui/while-let.stderr
index 348925a..30307ec 100644
--- a/src/test/ui/while-let.stderr
+++ b/src/test/ui/while-let.stderr
@@ -1,10 +1,10 @@
warning: irrefutable while-let pattern
- --> $DIR/while-let.rs:6:13
+ --> $DIR/while-let.rs:7:13
|
LL | while let $p = $e $b
| ^^^^^
...
-LL | / foo!(a, 1, {
+LL | / foo!(_a, 1, {
LL | | println!("irrefutable pattern");
LL | | });
| |_______- in this macro invocation
@@ -12,20 +12,20 @@
= note: `#[warn(irrefutable_let_patterns)]` on by default
warning: irrefutable while-let pattern
- --> $DIR/while-let.rs:6:13
+ --> $DIR/while-let.rs:7:13
|
LL | while let $p = $e $b
| ^^^^^
...
-LL | / bar!(a, 1, {
+LL | / bar!(_a, 1, {
LL | | println!("irrefutable pattern");
LL | | });
| |_______- in this macro invocation
warning: irrefutable while-let pattern
- --> $DIR/while-let.rs:24:5
+ --> $DIR/while-let.rs:25:5
|
-LL | / while let a = 1 {
+LL | / while let _a = 1 {
LL | | println!("irrefutable pattern");
LL | | break;
LL | | }
diff --git a/src/tools/cargo b/src/tools/cargo
index fe0e5a4..9655d70 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit fe0e5a48b75da2b405c8ce1ba2674e174ae11d5d
+Subproject commit 9655d70af8a6dddac238e3afa2fec75088c9226f
diff --git a/src/tools/clippy b/src/tools/clippy
index 5f28fda..58e01ea 160000
--- a/src/tools/clippy
+++ b/src/tools/clippy
@@ -1 +1 @@
-Subproject commit 5f28fda13efeb85097fe082af4b4827a58b0ecf6
+Subproject commit 58e01ea4d7df69e658c034afbfa6d0abd90808ed
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
index e759ad1..745233c 100644
--- a/src/tools/compiletest/Cargo.toml
+++ b/src/tools/compiletest/Cargo.toml
@@ -6,7 +6,7 @@
[dependencies]
diff = "0.1.10"
-env_logger = { version = "0.5", default-features = false }
+env_logger = { version = "0.6", default-features = false }
getopts = "0.2"
log = "0.4"
regex = "1.0"
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 3ba8cff..48dd68d 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -628,6 +628,11 @@
}
self.pass_mode
}
+
+ // does not consider CLI override for pass mode
+ pub fn local_pass_mode(&self) -> Option<PassMode> {
+ self.pass_mode
+ }
}
fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut dyn FnMut(&str)) {
@@ -835,10 +840,10 @@
if name == "test" ||
util::matches_os(&self.target, name) || // target
+ util::matches_env(&self.target, name) || // env
name == util::get_arch(&self.target) || // architecture
name == util::get_pointer_width(&self.target) || // pointer width
name == self.stage_id.split('-').next().unwrap() || // stage
- Some(name) == util::get_env(&self.target) || // env
(self.target != self.host && name == "cross-compile") ||
match self.compare_mode {
Some(CompareMode::Nll) => name == "compare-mode-nll",
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 9a3d24f..aff5546 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1557,7 +1557,11 @@
// want to actually assert warnings about all this code. Instead
// let's just ignore unused code warnings by defaults and tests
// can turn it back on if needed.
- if !self.config.src_base.ends_with("rustdoc-ui") {
+ if !self.config.src_base.ends_with("rustdoc-ui") &&
+ // Note that we don't call pass_mode() here as we don't want
+ // to set unused to allow if we've overriden the pass mode
+ // via command line flags.
+ self.props.local_pass_mode() != Some(PassMode::Run) {
rustc.args(&["-A", "unused"]);
}
}
diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
index 56ebea7..3a2ee44 100644
--- a/src/tools/compiletest/src/util.rs
+++ b/src/tools/compiletest/src/util.rs
@@ -105,8 +105,12 @@
panic!("Cannot determine Architecture from triple");
}
-pub fn get_env(triple: &str) -> Option<&str> {
- triple.split('-').nth(3)
+pub fn matches_env(triple: &str, name: &str) -> bool {
+ if let Some(env) = triple.split('-').nth(3) {
+ env.starts_with(name)
+ } else {
+ false
+ }
}
pub fn get_pointer_width(triple: &str) -> &'static str {
diff --git a/src/tools/error_index_generator/build.rs b/src/tools/error_index_generator/build.rs
index 2ac7351..832aa3b 100644
--- a/src/tools/error_index_generator/build.rs
+++ b/src/tools/error_index_generator/build.rs
@@ -14,9 +14,7 @@
if entry.file_name() == "error_codes.rs" {
println!("cargo:rerun-if-changed={}", entry.path().to_str().unwrap());
let file = fs::read_to_string(entry.path()).unwrap()
- .replace("use syntax::{register_diagnostics, register_long_diagnostics};", "")
- .replace("use syntax::register_diagnostics;", "")
- .replace("use syntax::register_long_diagnostics;", "");
+ .replace("syntax::register_diagnostics!", "register_diagnostics!");
let contents = format!("(|| {{\n{}\n}})();", file);
fs::write(&out_dir.join(&format!("error_{}.rs", idx)), &contents).unwrap();
@@ -26,36 +24,31 @@
}
let mut all = String::new();
- all.push_str("fn register_all() -> Vec<(&'static str, Option<&'static str>)> {\n");
- all.push_str("let mut long_codes: Vec<(&'static str, Option<&'static str>)> = Vec::new();\n");
- all.push_str(r#"
-macro_rules! register_diagnostics {
- ($($code:tt),*) => {{
- long_codes.extend([$(
- stringify!($code),
- )*].iter().cloned().map(|s| (s, None)).collect::<Vec<_>>());
- }};
- ($($code:tt),*,) => {{
- long_codes.extend([$(
- stringify!($code),
- )*].iter().cloned().map(|s| (s, None)));
- }}
-}
+ all.push_str(r###"
+fn register_all() -> Vec<(&'static str, Option<&'static str>)> {
+ let mut long_codes: Vec<(&'static str, Option<&'static str>)> = Vec::new();
+ macro_rules! register_diagnostics {
+ ($($ecode:ident: $message:expr,)*) => (
+ register_diagnostics!{$($ecode:$message,)* ;}
+ );
-macro_rules! register_long_diagnostics {
- ($($code:tt: $description:tt),*) => {
- {long_codes.extend([$(
- (stringify!($code), Some(stringify!($description))),
- )*].iter());}
- };
- ($($code:tt: $description:tt),*,) => {
- {long_codes.extend([$(
- (stringify!($code), Some(stringify!($description))),
- )*].iter());}
+ ($($ecode:ident: $message:expr,)* ; $($code:ident,)*) => (
+ $(
+ {long_codes.extend([
+ (stringify!($ecode), Some(stringify!($message))),
+ ].iter());}
+ )*
+ $(
+ {long_codes.extend([
+ stringify!($code),
+ ].iter().cloned().map(|s| (s, None)).collect::<Vec<_>>());}
+ )*
+ )
}
-}"#);
+"###);
for idx in 0..idx {
all.push_str(&format!(r#"include!(concat!(env!("OUT_DIR"), "/error_{}.rs"));"#, idx));
+ all.push_str("\n");
}
all.push_str("\nlong_codes\n");
all.push_str("}\n");
diff --git a/src/tools/miri b/src/tools/miri
index e479ab2..dd94c7c 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit e479ab26406ed8a473987e5f4a1f3be3e978e5d2
+Subproject commit dd94c7c5a32be2ee0adeeaf9d46f26f14925797c
diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py
index 1411f4c..2e2505b 100755
--- a/src/tools/publish_toolstate.py
+++ b/src/tools/publish_toolstate.py
@@ -22,7 +22,7 @@
# List of people to ping when the status of a tool or a book changed.
MAINTAINERS = {
'miri': '@oli-obk @RalfJung @eddyb',
- 'clippy-driver': '@Manishearth @llogiq @mcarton @oli-obk @phansch @flip1995',
+ 'clippy-driver': '@Manishearth @llogiq @mcarton @oli-obk @phansch @flip1995 @yaahc',
'rls': '@Xanewok',
'rustfmt': '@topecongiro',
'book': '@carols10cents @steveklabnik',
diff --git a/src/tools/rls b/src/tools/rls
index 496c892..412fb00 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 496c89275221303a4b0c2779cb8203fb3ce2a136
+Subproject commit 412fb00b37afb6b7f7fa96a35f2315c7e640b916
diff --git a/src/tools/rustbook/src/main.rs b/src/tools/rustbook/src/main.rs
index 95530b2..d5dc9a7 100644
--- a/src/tools/rustbook/src/main.rs
+++ b/src/tools/rustbook/src/main.rs
@@ -1,18 +1,19 @@
-use clap::{crate_version};
+use clap::crate_version;
use std::env;
use std::path::{Path, PathBuf};
-use clap::{App, ArgMatches, SubCommand, AppSettings};
+use clap::{App, AppSettings, ArgMatches, SubCommand};
+use mdbook::errors::Result as Result3;
use mdbook::MDBook;
-use mdbook::errors::{Result as Result3};
#[cfg(feature = "linkcheck")]
+use failure::Error;
+#[cfg(feature = "linkcheck")]
use mdbook::renderer::RenderContext;
#[cfg(feature = "linkcheck")]
use mdbook_linkcheck::{self, errors::BrokenLinks};
-use failure::Error;
fn main() {
let d_message = "-d, --dest-dir=[dest-dir]
@@ -21,18 +22,22 @@
'A directory for your book{n}(Defaults to Current Directory when omitted)'";
let matches = App::new("rustbook")
- .about("Build a book with mdBook")
- .author("Steve Klabnik <steve@steveklabnik.com>")
- .version(&*format!("v{}", crate_version!()))
- .setting(AppSettings::SubcommandRequired)
- .subcommand(SubCommand::with_name("build")
- .about("Build the book from the markdown files")
- .arg_from_usage(d_message)
- .arg_from_usage(dir_message))
- .subcommand(SubCommand::with_name("linkcheck")
- .about("Run linkcheck with mdBook 3")
- .arg_from_usage(dir_message))
- .get_matches();
+ .about("Build a book with mdBook")
+ .author("Steve Klabnik <steve@steveklabnik.com>")
+ .version(&*format!("v{}", crate_version!()))
+ .setting(AppSettings::SubcommandRequired)
+ .subcommand(
+ SubCommand::with_name("build")
+ .about("Build the book from the markdown files")
+ .arg_from_usage(d_message)
+ .arg_from_usage(dir_message),
+ )
+ .subcommand(
+ SubCommand::with_name("linkcheck")
+ .about("Run linkcheck with mdBook 3")
+ .arg_from_usage(dir_message),
+ )
+ .get_matches();
// Check which subcomamnd the user ran...
match matches.subcommand() {
@@ -46,23 +51,44 @@
::std::process::exit(101);
}
- },
+ }
("linkcheck", Some(sub_matches)) => {
- if let Err(err) = linkcheck(sub_matches) {
- eprintln!("Error: {}", err);
+ #[cfg(feature = "linkcheck")]
+ {
+ if let Err(err) = linkcheck(sub_matches) {
+ eprintln!("Error: {}", err);
- #[cfg(feature = "linkcheck")]
- {
- if let Ok(broken_links) = err.downcast::<BrokenLinks>() {
- for cause in broken_links.links().iter() {
- eprintln!("\tCaused By: {}", cause);
- }
+ // HACK: ignore timeouts
+ let actually_broken = err
+ .downcast::<BrokenLinks>()
+ .map(|broken_links| {
+ broken_links
+ .links()
+ .iter()
+ .inspect(|cause| eprintln!("\tCaused By: {}", cause))
+ .fold(false, |already_broken, cause| {
+ already_broken || !format!("{}", cause).contains("timed out")
+ })
+ })
+ .unwrap_or(false);
+
+ if actually_broken {
+ std::process::exit(101);
+ } else {
+ std::process::exit(0);
}
}
-
- ::std::process::exit(101);
}
- },
+
+ #[cfg(not(feature = "linkcheck"))]
+ {
+ // This avoids the `unused_binding` lint.
+ println!(
+ "mdbook-linkcheck is disabled, but arguments were passed: {:?}",
+ sub_matches
+ );
+ }
+ }
(_, _) => unreachable!(),
};
}
@@ -77,12 +103,6 @@
mdbook_linkcheck::check_links(&render_ctx)
}
-#[cfg(not(feature = "linkcheck"))]
-pub fn linkcheck(_args: &ArgMatches<'_>) -> Result<(), Error> {
- println!("mdbook-linkcheck is disabled.");
- Ok(())
-}
-
// Build command implementation
pub fn build(args: &ArgMatches<'_>) -> Result3<()> {
let book_dir = get_book_dir(args);
diff --git a/src/tools/rustc-std-workspace-alloc/Cargo.toml b/src/tools/rustc-std-workspace-alloc/Cargo.toml
index ef7dc81..9e04b14 100644
--- a/src/tools/rustc-std-workspace-alloc/Cargo.toml
+++ b/src/tools/rustc-std-workspace-alloc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustc-std-workspace-alloc"
-version = "1.0.0"
+version = "1.99.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT OR Apache-2.0'
description = """
diff --git a/src/tools/rustc-std-workspace-core/Cargo.toml b/src/tools/rustc-std-workspace-core/Cargo.toml
index 38ca56a..6b4e754 100644
--- a/src/tools/rustc-std-workspace-core/Cargo.toml
+++ b/src/tools/rustc-std-workspace-core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustc-std-workspace-core"
-version = "1.0.0"
+version = "1.99.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT OR Apache-2.0'
description = """
diff --git a/src/tools/rustc-std-workspace-std/Cargo.toml b/src/tools/rustc-std-workspace-std/Cargo.toml
index ce16448..e41554b 100644
--- a/src/tools/rustc-std-workspace-std/Cargo.toml
+++ b/src/tools/rustc-std-workspace-std/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustc-std-workspace-std"
-version = "1.0.0"
+version = "1.99.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT OR Apache-2.0'
description = """
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index f800ce4..afb1ee1 160000
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit f800ce47d1da2a1c02ffd260deca8b7445f7facf
+Subproject commit afb1ee1c14594aed5bb4a762b357b01f13c9de10
diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs
index 6a0d530..9302909 100644
--- a/src/tools/tidy/src/style.rs
+++ b/src/tools/tidy/src/style.rs
@@ -15,6 +15,7 @@
use std::path::Path;
+const ERROR_CODE_COLS: usize = 80;
const COLS: usize = 100;
const LINES: usize = 3000;
@@ -51,7 +52,13 @@
/// Lines of this form are allowed to be overlength, because Markdown
/// offers no way to split a line in the middle of a URL, and the lengths
/// of URLs to external references are beyond our control.
-fn line_is_url(line: &str) -> bool {
+fn line_is_url(columns: usize, line: &str) -> bool {
+ // more basic check for error_codes.rs, to avoid complexity in implementing two state machines
+ if columns == ERROR_CODE_COLS {
+ return line.starts_with("[") &&
+ line.contains("]:") && line.contains("http");
+ }
+
use self::LIUState::*;
let mut state: LIUState = EXP_COMMENT_START;
let is_url = |w: &str| w.starts_with("http://") || w.starts_with("https://");
@@ -75,7 +82,7 @@
=> state = EXP_END,
(_, w)
- if w.len() > COLS && is_url(w)
+ if w.len() > columns && is_url(w)
=> state = EXP_END,
(_, _) => {}
@@ -88,8 +95,8 @@
/// Returns `true` if `line` is allowed to be longer than the normal limit.
/// Currently there is only one exception, for long URLs, but more
/// may be added in the future.
-fn long_line_is_ok(line: &str) -> bool {
- if line_is_url(line) {
+fn long_line_is_ok(max_columns: usize, line: &str) -> bool {
+ if line_is_url(max_columns, line) {
return true;
}
@@ -144,6 +151,12 @@
tidy_error!(bad, "{}: empty file", file.display());
}
+ let max_columns = if filename == "error_codes.rs" {
+ ERROR_CODE_COLS
+ } else {
+ COLS
+ };
+
let can_contain = contents.contains("// ignore-tidy-") ||
contents.contains("# ignore-tidy-");
let mut skip_cr = contains_ignore_directive(can_contain, &contents, "cr");
@@ -162,11 +175,12 @@
let mut err = |msg: &str| {
tidy_error!(bad, "{}:{}: {}", file.display(), i + 1, msg);
};
- if line.chars().count() > COLS && !long_line_is_ok(line) {
+ if line.chars().count() > max_columns &&
+ !long_line_is_ok(max_columns, line) {
suppressible_tidy_err!(
err,
skip_line_length,
- &format!("line longer than {} chars", COLS)
+ &format!("line longer than {} chars", max_columns)
);
}
if line.contains('\t') {
