Skip to content

Commit

Permalink
Auto merge of rust-lang#86588 - JohnTitor:rollup-ibgjbkf, r=JohnTitor
Browse files Browse the repository at this point in the history
Rollup of 8 pull requests

Successful merges:

 - rust-lang#86137 (Error code cleanup and enforce checks)
 - rust-lang#86296 (Add documentation for various THIR structs)
 - rust-lang#86415 (Document associativity of iterator folds.)
 - rust-lang#86533 (Support lowercase error codes in `--explain`)
 - rust-lang#86536 (Edition 2021 enables disjoint capture)
 - rust-lang#86560 (Update cargo)
 - rust-lang#86561 (chore(rustdoc): Remove unused impl block)
 - rust-lang#86566 (Use `use_verbose` for `mir::Constant`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Jun 24, 2021
2 parents f1e691d + 64c9712 commit 964a81e
Show file tree
Hide file tree
Showing 25 changed files with 319 additions and 158 deletions.
28 changes: 21 additions & 7 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ dependencies = [
"merge",
"num_cpus",
"once_cell",
"opener",
"opener 0.5.0",
"pretty_assertions",
"serde",
"serde_json",
Expand All @@ -195,7 +195,9 @@ version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
dependencies = [
"lazy_static",
"memchr",
"regex-automata",
]

[[package]]
Expand Down Expand Up @@ -253,7 +255,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"

[[package]]
name = "cargo"
version = "0.55.0"
version = "0.56.0"
dependencies = [
"anyhow",
"atty",
Expand Down Expand Up @@ -288,11 +290,10 @@ dependencies = [
"log",
"memchr",
"num_cpus",
"opener",
"opener 0.5.0",
"openssl",
"percent-encoding 2.1.0",
"pretty_env_logger",
"rand 0.8.3",
"rustc-workspace-hack",
"rustfix 0.6.0",
"semver 1.0.3",
Expand Down Expand Up @@ -375,10 +376,12 @@ dependencies = [
"flate2",
"git2",
"glob",
"itertools 0.10.0",
"lazy_static",
"remove_dir_all",
"serde_json",
"tar",
"termcolor",
"toml",
"url 2.2.2",
]
Expand Down Expand Up @@ -575,7 +578,7 @@ dependencies = [
"bytecount",
"clap",
"itertools 0.9.0",
"opener",
"opener 0.4.1",
"regex",
"shell-escape",
"walkdir",
Expand Down Expand Up @@ -2418,6 +2421,16 @@ dependencies = [
"winapi 0.3.9",
]

[[package]]
name = "opener"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952"
dependencies = [
"bstr",
"winapi 0.3.9",
]

[[package]]
name = "openssl"
version = "0.10.33"
Expand Down Expand Up @@ -3558,6 +3571,7 @@ dependencies = [
name = "rustc-workspace-hack"
version = "1.0.0"
dependencies = [
"bstr",
"byteorder",
"crossbeam-utils 0.8.3",
"libc",
Expand Down Expand Up @@ -5158,9 +5172,9 @@ dependencies = [

[[package]]
name = "termcolor"
version = "1.1.0"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
Expand Down
8 changes: 6 additions & 2 deletions compiler/rustc_driver/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,12 @@ fn stderr_isatty() -> bool {
}

fn handle_explain(registry: Registry, code: &str, output: ErrorOutputType) {
let normalised =
if code.starts_with('E') { code.to_string() } else { format!("E{0:0>4}", code) };
let upper_cased_code = code.to_ascii_uppercase();
let normalised = if upper_cased_code.starts_with('E') {
upper_cased_code
} else {
format!("E{0:0>4}", code)
};
match registry.try_find_description(&normalised) {
Ok(Some(description)) => {
let mut is_in_code_block = false;
Expand Down
9 changes: 4 additions & 5 deletions compiler/rustc_error_codes/src/error_codes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ E0783: include_str!("./error_codes/E0783.md"),
// E0540, // multiple rustc_deprecated attributes
E0544, // multiple stability levels
// E0548, // replaced with a generic attribute input check
E0553, // multiple rustc_const_unstable attributes
// E0553, // multiple rustc_const_unstable attributes
// E0555, // replaced with a generic attribute input check
// E0558, // replaced with a generic attribute input check
// E0563, // cannot determine a type for this `impl Trait` removed in 6383de15
Expand All @@ -620,10 +620,9 @@ E0783: include_str!("./error_codes/E0783.md"),
// E0612, // merged into E0609
// E0613, // Removed (merged with E0609)
E0625, // thread-local statics cannot be accessed at compile-time
E0629, // missing 'feature' (rustc_const_unstable)
// rustc_const_unstable attribute must be paired with stable/unstable
// attribute
E0630,
// E0629, // missing 'feature' (rustc_const_unstable)
// E0630, // rustc_const_unstable attribute must be paired with stable/unstable
// attribute
E0632, // cannot provide explicit generic arguments when `impl Trait` is
// used in argument position
E0640, // infer outlives requirements
Expand Down
Loading

0 comments on commit 964a81e

Please sign in to comment.