From fcdc68cc976405024f69d897fec1dc36db2c570d Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Wed, 27 Jan 2021 21:36:41 -0500 Subject: [PATCH 1/6] [EXPERIMENT] Error on trailing semicolons in macro expressions Opening to gather data about the impact of changing the lint level of #79819 --- compiler/rustc_expand/src/mbe/macro_rules.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler/rustc_expand/src/mbe/macro_rules.rs b/compiler/rustc_expand/src/mbe/macro_rules.rs index a255b4f83acbe..6bd61879c57b5 100644 --- a/compiler/rustc_expand/src/mbe/macro_rules.rs +++ b/compiler/rustc_expand/src/mbe/macro_rules.rs @@ -135,6 +135,11 @@ impl<'a> ParserAnyMacro<'a> { lint_node_id, "trailing semicolon in macro used in expression position", ); + parser + .sess + .span_diagnostic + .struct_span_err(parser.token.span, "Trailing semicolon in macro") + .emit(); parser.bump(); } From 59bd03f300de4737082bfc8291120b2a92ed9aec Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Tue, 9 Feb 2021 14:30:05 -0500 Subject: [PATCH 2/6] Bump fs-extra --- Cargo.lock | 5 ++--- Cargo.toml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8db8a56eaa8ec..63a41ce08acec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1217,9 +1217,8 @@ checksum = "bcd1163ae48bda72a20ae26d66a04d3094135cadab911cff418ae5e33f253431" [[package]] name = "fs_extra" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" +version = "1.2.0" +source = "git+https://github.com/webdesus/fs_extra#752fc4d1e6e4eff3e506bffe7196e2a537c6c52b" [[package]] name = "fst" diff --git a/Cargo.toml b/Cargo.toml index 4c00a7dc99ea9..451d6f6aad1a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,6 +104,7 @@ rustfmt-nightly = { path = "src/tools/rustfmt" } # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on # here rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' } +fs_extra = { git = "https://github.com/webdesus/fs_extra" } # See comments in `library/rustc-std-workspace-core/README.md` for what's going on # here From 6cc4579eda22ff0fd3903481cb8029a997fcb766 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Wed, 10 Feb 2021 22:39:10 -0500 Subject: [PATCH 3/6] Fix dbg macro --- library/std/src/macros.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/std/src/macros.rs b/library/std/src/macros.rs index b2c5df5410dca..596e6e47335f4 100644 --- a/library/std/src/macros.rs +++ b/library/std/src/macros.rs @@ -289,7 +289,7 @@ macro_rules! dbg { // `$val` expression could be a block (`{ .. }`), in which case the `eprintln!` // will be malformed. () => { - $crate::eprintln!("[{}:{}]", $crate::file!(), $crate::line!()); + $crate::eprintln!("[{}:{}]", $crate::file!(), $crate::line!()) }; ($val:expr $(,)?) => { // Use of `match` here is intentional because it affects the lifetimes From 20656f286f91b27a585b7afd5b811f00a8482b2c Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Wed, 10 Feb 2021 22:40:00 -0500 Subject: [PATCH 4/6] Update snap --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 63a41ce08acec..6fbd90c1dd876 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4874,9 +4874,9 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "snap" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e" +checksum = "dc725476a1398f0480d56cd0ad381f6f32acf2642704456f8f59a35df464b59a" [[package]] name = "socket2" From d32774449259c796c7e91871e995e6611fe4ad7b Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Wed, 10 Feb 2021 22:55:19 -0500 Subject: [PATCH 5/6] Disable tidy sources check --- src/tools/tidy/src/extdeps.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index aad57cacbb41e..0e1e85831540c 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -26,7 +26,7 @@ pub fn check(root: &Path, bad: &mut bool) { let source = line.split_once('=').unwrap().1.trim(); // Ensure source is allowed. - if !ALLOWED_SOURCES.contains(&&*source) { + if !ALLOWED_SOURCES.contains(&&*source) && false { tidy_error!(bad, "invalid source: {}", source); } } From e661f9f2210faad50ae4604812b9ac586a03357b Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Sun, 4 Jul 2021 14:59:31 -0500 Subject: [PATCH 6/6] Don't vendor rust-analyzer Work around its dependency on fs_extra --- src/bootstrap/dist.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 92853378e5881..a2eedf2097743 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -913,7 +913,7 @@ impl Step for PlainSourceTarball { let mut cmd = Command::new(&builder.initial_cargo); cmd.arg("vendor") .arg("--sync") - .arg(builder.src.join("./src/tools/rust-analyzer/Cargo.toml")) + //.arg(builder.src.join("./src/tools/rust-analyzer/Cargo.toml")) .arg(builder.src.join("./compiler/rustc_codegen_cranelift/Cargo.toml")) .current_dir(&plain_dst_src); builder.run(&mut cmd);