Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #86588

Merged
merged 22 commits into from
Jun 24, 2021
Merged

Rollup of 8 pull requests #86588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8eb0c0d
Document associativity of iterator folds.
Kmeakin Jun 17, 2021
f265997
Edition 2021 enables disjoint capture
arora-aman Jun 21, 2021
30793c1
Add documentation for various THIR structs
LeSeulArtichaut Jun 14, 2021
faa6461
Update cargo
ehuss Jun 22, 2021
e629381
chore(rustdoc): Remove unused impl block
notriddle Jun 22, 2021
4d1b3a5
Use `use_verbose` for mir::Constant
fee1-dead Jun 23, 2021
6370567
Updated mir pretty print output
fee1-dead Jun 23, 2021
0bb6bc4
Teach rustc to accept lowercase error codes
inquisitivecrystal Jun 22, 2021
d296ea0
Add bstr to rustc-workspace-hack for rustfmt/cargo.
ehuss Jun 23, 2021
23e5ed1
Check if error code is used
GuillaumeGomez Jun 8, 2021
22a702d
Add check on constant to ensure it's up to date
GuillaumeGomez Jun 8, 2021
12b6d32
Remove unused error codes from error_codes.rs and from EXEMPTED_FROM_…
GuillaumeGomez Jun 8, 2021
20f1b1c
Greatly improve code
GuillaumeGomez Jun 23, 2021
0ab9d01
Handle windows paths as well
GuillaumeGomez Jun 23, 2021
55fd13b
Rollup merge of #86137 - GuillaumeGomez:error-code-cleanup, r=Mark-Si…
JohnTitor Jun 24, 2021
469329d
Rollup merge of #86296 - LeSeulArtichaut:thir-doc, r=nikomatsakis
JohnTitor Jun 24, 2021
0fa4f0b
Rollup merge of #86415 - Kmeakin:iterator-associativity-docs, r=dtolnay
JohnTitor Jun 24, 2021
6b618c8
Rollup merge of #86533 - inquisitivecrystal:lower-case-error-explain,…
JohnTitor Jun 24, 2021
3998c03
Rollup merge of #86536 - sexxi-goose:edition, r=nikomatsakis
JohnTitor Jun 24, 2021
60dae7a
Rollup merge of #86560 - ehuss:update-cargo, r=ehuss
JohnTitor Jun 24, 2021
2322097
Rollup merge of #86561 - notriddle:notriddle/cleanup-rustdoc, r=jyn514
JohnTitor Jun 24, 2021
64c9712
Rollup merge of #86566 - fee1-dead:mir-pretty-print, r=oli-obk
JohnTitor Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions Cargo.lock
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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