Skip to content

Rollup of 7 pull requests #127121

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.

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

Merged
merged 19 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
790c238
rewrite pdb-alt-path to rmake
Oneirical Jun 21, 2024
9dff8a3
rewrite mismatching-target-triples to rmake
Oneirical Jun 21, 2024
a2ed16c
rewrite mingw-export-call-convention to rmake
Oneirical Jun 21, 2024
2ffff79
rewrite pretty-print-with-dep-file to rmake
Oneirical Jun 26, 2024
722ae22
rewrite pretty-print-to-file to rmake
Oneirical Jun 26, 2024
53109d5
rewrite libtest-padding to rmake
Oneirical Jun 26, 2024
9bbf3d9
docs: say "includes" instead of "does include"
Sky9x Jun 28, 2024
df7331f
Remove unnecessary SeqCst in `impl fmt::Pointer for AtomicPtr`
Sky9x Jun 28, 2024
fa12064
Don't get output if `lldb --version` errors
ChrisDenton Jun 29, 2024
a6ef91e
Update test.rs
ChrisDenton Jun 29, 2024
4ee077a
Migrate `run-make/override-aliased-flags` to `rmake.rs`
GuillaumeGomez Jun 27, 2024
8cbeeda
Migrate `run-make/return-non-c-like-enum` to `rmake.rs`
GuillaumeGomez Jun 29, 2024
06aeb67
Rollup merge of #126805 - Oneirical:weaves-of-testiny, r=Kobzol
GuillaumeGomez Jun 29, 2024
c70a2e3
Rollup merge of #126995 - Oneirical:test-friends-forever, r=Kobzol
GuillaumeGomez Jun 29, 2024
c1fb4e5
Rollup merge of #127041 - GuillaumeGomez:run-make-override-aliased-fl…
GuillaumeGomez Jun 29, 2024
e9594b5
Rollup merge of #127072 - Sky9x:docs-includes-vs-does-include, r=scot…
GuillaumeGomez Jun 29, 2024
0886faa
Rollup merge of #127073 - Sky9x:unnecessary-seqcst, r=Nilstrieb
GuillaumeGomez Jun 29, 2024
38983df
Rollup merge of #127112 - ChrisDenton:lldb, r=Kobzol
GuillaumeGomez Jun 29, 2024
69f355a
Rollup merge of #127116 - GuillaumeGomez:run-make-return-non-c-like-e…
GuillaumeGomez Jun 29, 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
Migrate run-make/return-non-c-like-enum to rmake.rs
  • Loading branch information
GuillaumeGomez committed Jun 29, 2024
commit 8cbeedac8de7bbf7676129f07f338d106a162036
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ run-make/remap-path-prefix/Makefile
run-make/reproducible-build-2/Makefile
run-make/reproducible-build/Makefile
run-make/return-non-c-like-enum-from-c/Makefile
run-make/return-non-c-like-enum/Makefile
run-make/rlib-chain/Makefile
run-make/rlib-format-packed-bundled-libs-2/Makefile
run-make/rlib-format-packed-bundled-libs-3/Makefile
Expand Down
8 changes: 0 additions & 8 deletions tests/run-make/return-non-c-like-enum/Makefile

This file was deleted.

18 changes: 18 additions & 0 deletions tests/run-make/return-non-c-like-enum/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Check that we treat enum variants like union members in call ABIs.
// Added in #68443.
// Original issue: #68190.

//@ ignore-cross-compile

use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run, rustc, static_lib_name};

fn main() {
rustc().crate_type("staticlib").input("nonclike.rs").run();
cc().input("test.c")
.arg(&static_lib_name("nonclike"))
.out_exe("test")
.args(&extra_c_flags())
.args(&extra_cxx_flags())
.run();
run("test");
}
Loading