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 7 pull requests #128650

Closed
wants to merge 15 commits into from
Closed

Rollup of 7 pull requests #128650

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9d9b55c
make invalid_type_param_default lint show up in cargo future-compat r…
RalfJung Jul 15, 2024
468f935
std::thread: available_parallelism implementation for vxWorks proposal.
devnexen Jul 21, 2024
bbeff8c
set `force_recompile: true` if library is modified
onur-ozkan Jul 30, 2024
6fcc630
update download-rustc documentation
onur-ozkan Jul 30, 2024
8497800
Add test for updating enum discriminant through pointer
clubby789 Aug 1, 2024
249afea
docs(resolve): more explain about `target`
bvanjoi Aug 4, 2024
5ee6701
add test for symbol visibility of `#[naked]` functions
folkertdev Jul 29, 2024
d8c2b76
run-make: enable msvc for link-dedup
ChrisDenton Aug 4, 2024
b572e84
Rollup merge of #127655 - RalfJung:invalid_type_param_default, r=comp…
matthiaskrgr Aug 4, 2024
429e8f9
Rollup merge of #127974 - onur-ozkan:force-std-builds, r=Mark-Simulacrum
matthiaskrgr Aug 4, 2024
30d4abb
Rollup merge of #128026 - devnexen:available_parallelism_vxworks, r=M…
matthiaskrgr Aug 4, 2024
0e78361
Rollup merge of #128362 - folkertdev:naked-function-symbol-visibility…
matthiaskrgr Aug 4, 2024
8453534
Rollup merge of #128500 - clubby789:122600-test, r=Mark-Simulacrum
matthiaskrgr Aug 4, 2024
aafa68d
Rollup merge of #128630 - bvanjoi:resolve-comment, r=petrochenkov
matthiaskrgr Aug 4, 2024
0c0354d
Rollup merge of #128638 - ChrisDenton:link-dedup, r=jieyouxu
matthiaskrgr Aug 4, 2024
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
Prev Previous commit
Next Next commit
run-make: enable msvc for link-dedup
  • Loading branch information
@ChrisDenton
ChrisDenton committed Aug 4, 2024
commit d8c2b767c6a18780a617d82c6a232253e447e5db
33 changes: 25 additions & 8 deletions tests/run-make/link-dedup/rmake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,37 @@
// Without the --cfg flag, there should be a single -ltesta, no more, no less.
// See https://github.com/rust-lang/rust/pull/84794

//@ ignore-msvc
use std::fmt::Write;

use run_make_support::rustc;
use run_make_support::{is_msvc, rustc};

fn main() {
rustc().input("depa.rs").run();
rustc().input("depb.rs").run();
rustc().input("depc.rs").run();

let output = rustc().input("empty.rs").cfg("bar").run_fail();
output.assert_stderr_contains(r#""-ltesta" "-ltestb" "-ltesta""#);
let output = rustc().input("empty.rs").run_fail();
output.assert_stderr_contains(r#""-ltesta""#);
let output = rustc().input("empty.rs").run_fail();
output.assert_stderr_not_contains(r#""-ltestb""#);
output.assert_stderr_contains(needle_from_libs(&["testa", "testb", "testa"]));

let output = rustc().input("empty.rs").run_fail();
output.assert_stderr_not_contains(r#""-ltesta" "-ltesta" "-ltesta""#);
output.assert_stderr_contains(needle_from_libs(&["testa"]));
output.assert_stderr_not_contains(needle_from_libs(&["testb"]));
output.assert_stderr_not_contains(needle_from_libs(&["testa", "testa", "testa"]));
// Adjacent identical native libraries are no longer deduplicated if
// they come from different crates (https://github.com/rust-lang/rust/pull/103311)
// so the following will fail:
//output.assert_stderr_not_contains(needle_from_libs(&["testa", "testa"]));
}

fn needle_from_libs(libs: &[&str]) -> String {
let mut needle = String::new();
for lib in libs {
if is_msvc() {
let _ = needle.write_fmt(format_args!(r#""{lib}.lib" "#));
} else {
let _ = needle.write_fmt(format_args!(r#""-l{lib}" "#));
}
}
needle.pop(); // remove trailing space
needle
}
Loading