diff options
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 11 | ||||
| -rw-r--r-- | compiler/rustc_passes/src/check_attr.rs | 17 | ||||
| -rw-r--r-- | tests/run-make/linker-warning/rmake.rs | 7 | ||||
| -rw-r--r-- | tests/run-make/rust-lld-by-default-beta-stable/rmake.rs | 5 | ||||
| -rw-r--r-- | tests/run-make/rust-lld-by-default-nightly/rmake.rs | 5 | ||||
| -rw-r--r-- | tests/run-make/rust-lld-custom-target/rmake.rs | 2 | ||||
| -rw-r--r-- | tests/run-make/rust-lld/rmake.rs | 10 |
7 files changed, 28 insertions, 29 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 80758aac134..fae59a3b9dc 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1040,6 +1040,11 @@ fn link_natively( sess.dcx().abort_if_errors(); } + let stderr = escape_string(&prog.stderr); + let stdout = escape_string(&prog.stdout); + info!("linker stderr:\n{}", &stderr); + info!("linker stdout:\n{}", &stdout); + let (level, src) = codegen_results.crate_info.lint_levels.linker_messages; let lint = |msg| { lint_level(sess, LINKER_MESSAGES, level, src, None, |diag| { @@ -1049,16 +1054,14 @@ fn link_natively( if !prog.stderr.is_empty() { // We already print `warning:` at the start of the diagnostic. Remove it from the linker output if present. - let stderr = escape_string(&prog.stderr); - debug!("original stderr: {stderr}"); let stderr = stderr .strip_prefix("warning: ") .unwrap_or(&stderr) .replace(": warning: ", ": "); lint(format!("linker stderr: {stderr}")); } - if !prog.stdout.is_empty() && sess.opts.verbose { - lint(format!("linker stdout: {}", escape_string(&prog.stdout))) + if !prog.stdout.is_empty() { + lint(format!("linker stdout: {}", stdout)) } } Err(e) => { diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs index 7df792c0f79..3d88fe1a4d3 100644 --- a/compiler/rustc_passes/src/check_attr.rs +++ b/compiler/rustc_passes/src/check_attr.rs @@ -2338,11 +2338,20 @@ impl<'tcx> CheckAttrVisitor<'tcx> { }) { if hir_id != CRATE_HIR_ID { - let err = match attr.style { - ast::AttrStyle::Outer => errors::OuterCrateLevelAttr, - ast::AttrStyle::Inner => errors::OuterCrateLevelAttr, + match attr.style { + ast::AttrStyle::Outer => self.tcx.emit_node_span_lint( + UNUSED_ATTRIBUTES, + hir_id, + attr.span, + errors::OuterCrateLevelAttr, + ), + ast::AttrStyle::Inner => self.tcx.emit_node_span_lint( + UNUSED_ATTRIBUTES, + hir_id, + attr.span, + errors::InnerCrateLevelAttr, + ), }; - self.tcx.emit_node_span_lint(UNUSED_ATTRIBUTES, hir_id, attr.span, err); return; } else { let never_needs_link = self diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs index 5967f5b32e9..0a4c13c5f01 100644 --- a/tests/run-make/linker-warning/rmake.rs +++ b/tests/run-make/linker-warning/rmake.rs @@ -14,16 +14,11 @@ fn main() { let warnings = run_rustc().link_arg("run_make_warn").run(); warnings.assert_stderr_contains("warning: linker stderr: bar"); - // Make sure it shows stdout, but only when --verbose is passed + // Make sure it shows stdout run_rustc() .link_arg("run_make_info") - .verbose() .run() .assert_stderr_contains("warning: linker stdout: foo"); - run_rustc() - .link_arg("run_make_info") - .run() - .assert_stderr_not_contains("warning: linker stdout: foo"); // Make sure we short-circuit this new path if the linker exits with an error // (so the diagnostic is less verbose) diff --git a/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs b/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs index 85860fc95b8..d2f1e8b253a 100644 --- a/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs +++ b/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs @@ -12,7 +12,7 @@ use run_make_support::rustc; fn main() { // A regular compilation should not use rust-lld by default. We'll check that by asking the // linker to display its version number with a link-arg. - let output = rustc().verbose().link_arg("-Wl,-v").input("main.rs").run(); + let output = rustc().link_arg("-Wl,-v").input("main.rs").run(); assert!( !find_lld_version_in_logs(output.stderr_utf8()), "the LLD version string should not be present in the output logs:\n{}", @@ -21,6 +21,7 @@ fn main() { } fn find_lld_version_in_logs(stderr: String) -> bool { - let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap(); + let lld_version_re = + Regex::new(r"^warning: linker stdout: LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap(); stderr.lines().any(|line| lld_version_re.is_match(line.trim())) } diff --git a/tests/run-make/rust-lld-by-default-nightly/rmake.rs b/tests/run-make/rust-lld-by-default-nightly/rmake.rs index 4026af83064..a25a69b859b 100644 --- a/tests/run-make/rust-lld-by-default-nightly/rmake.rs +++ b/tests/run-make/rust-lld-by-default-nightly/rmake.rs @@ -12,7 +12,7 @@ use run_make_support::rustc; fn main() { // A regular compilation should use rust-lld by default. We'll check that by asking the linker // to display its version number with a link-arg. - let output = rustc().verbose().link_arg("-Wl,-v").input("main.rs").run(); + let output = rustc().link_arg("-Wl,-v").input("main.rs").run(); assert!( find_lld_version_in_logs(output.stderr_utf8()), "the LLD version string should be present in the output logs:\n{}", @@ -20,8 +20,7 @@ fn main() { ); // But it can still be disabled by turning the linker feature off. - let output = - rustc().verbose().link_arg("-Wl,-v").arg("-Zlinker-features=-lld").input("main.rs").run(); + let output = rustc().link_arg("-Wl,-v").arg("-Zlinker-features=-lld").input("main.rs").run(); assert!( !find_lld_version_in_logs(output.stderr_utf8()), "the LLD version string should not be present in the output logs:\n{}", diff --git a/tests/run-make/rust-lld-custom-target/rmake.rs b/tests/run-make/rust-lld-custom-target/rmake.rs index 17468223306..a6f936ba6e5 100644 --- a/tests/run-make/rust-lld-custom-target/rmake.rs +++ b/tests/run-make/rust-lld-custom-target/rmake.rs @@ -15,7 +15,6 @@ fn main() { // Compile to a custom target spec with rust-lld enabled by default. We'll check that by asking // the linker to display its version number with a link-arg. let output = rustc() - .verbose() .crate_type("cdylib") .target("custom-target.json") .link_arg("-Wl,-v") @@ -29,7 +28,6 @@ fn main() { // But it can also be disabled via linker features. let output = rustc() - .verbose() .crate_type("cdylib") .target("custom-target.json") .arg("-Zlinker-features=-lld") diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs index 732bc6f6ba2..1f098fdb1d9 100644 --- a/tests/run-make/rust-lld/rmake.rs +++ b/tests/run-make/rust-lld/rmake.rs @@ -17,7 +17,6 @@ fn main() { .arg("-Zlinker-features=+lld") .arg("-Clink-self-contained=+linker") .arg("-Zunstable-options") - .verbose() .link_arg(linker_version_flag) .input("main.rs") .run(); @@ -28,12 +27,8 @@ fn main() { ); // It should not be used when we explicitly opt-out of lld. - let output = rustc() - .link_arg(linker_version_flag) - .verbose() - .arg("-Zlinker-features=-lld") - .input("main.rs") - .run(); + let output = + rustc().link_arg(linker_version_flag).arg("-Zlinker-features=-lld").input("main.rs").run(); assert!( !find_lld_version_in_logs(output.stderr_utf8()), "the LLD version string should not be present in the output logs:\n{}", @@ -44,7 +39,6 @@ fn main() { // times to rustc. let output = rustc() .link_arg(linker_version_flag) - .verbose() .arg("-Clink-self-contained=+linker") .arg("-Zunstable-options") .arg("-Zlinker-features=-lld") |