Skip to content

Cleanup: Rid the rmake test runners of extern crate run_make_support; #124622

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
May 2, 2024

Conversation

fmease
Copy link
Member

@fmease fmease commented May 2, 2024

run_make_support is part of the extern prelude of rmake test runners & we're using Rust 2021 for them since #124280 rendering extern crate run_make_support redundant:

.arg("--extern")
.arg(format!("run_make_support={}", &support_lib_path.to_string_lossy()))

Contains some fmt'ing changes because I've enabled format-on-save in my editor and because we don't run x fmt for rmake test runners yet (this gets addressed by #124613). I can revert those if you'd like me to. (reverted)

r? jieyouxu or testing-devex(?) or boostrap(?)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 2, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@fmease fmease changed the title Cleanup: Rid the rmake test runners from extern crate run_make_support; Cleanup: Rid the rmake test runners of extern crate run_make_support; May 2, 2024
@fmease fmease force-pushed the yeet-extern-crate-run_make_support branch from 68b4795 to e853ab6 Compare May 2, 2024 15:38
@fmease fmease added the C-cleanup Category: PRs that clean code up or issues documenting cleanup. label May 2, 2024
@jieyouxu
Copy link
Member

jieyouxu commented May 2, 2024

I think it's better if the formatting changes were done after #124613. Feel free to r=me after removing the formatting changes.

@fmease fmease force-pushed the yeet-extern-crate-run_make_support branch from e853ab6 to 09aa772 Compare May 2, 2024 15:58
@fmease
Copy link
Member Author

fmease commented May 2, 2024

@bors r=jieyouxu rollup

@bors
Copy link
Collaborator

bors commented May 2, 2024

📌 Commit 09aa772 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 2, 2024
fmease added a commit to fmease/rust that referenced this pull request May 2, 2024
…support, r=jieyouxu

Cleanup: Rid the `rmake` test runners of `extern crate run_make_support;`

`run_make_support` is part of the *extern prelude* of `rmake` test runners rendering `extern crate run_make_support` redundant:

https://github.com/rust-lang/rust/blob/80451a485b006bd32732c003a54ee7de457d8266/src/tools/compiletest/src/runtest.rs#L3826-L3827

~~Contains some fmt'ing changes because I've enabled format-on-save in my editor and because we don't run `x fmt` for `rmake` test runners yet (this gets addressed by rust-lang#124613). I can revert those if you'd like me to.~~ (reverted)

r? jieyouxu or testing-devex(?) or boostrap(?)
bors added a commit to rust-lang-ci/rust that referenced this pull request May 2, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#124138 (Ignore LLVM ABI in dlltool tests since those targets don't use dlltool)
 - rust-lang#124414 (remove extraneous note on `UnableToRunDsymutil` diagnostic)
 - rust-lang#124579 (Align: add bytes_usize and bits_usize)
 - rust-lang#124622 (Cleanup: Rid the `rmake` test runners of `extern crate run_make_support;`)
 - rust-lang#124623 (shallow resolve in orphan check)
 - rust-lang#124624 (Use `tcx.types.unit` instead of `Ty::new_unit(tcx)`)
 - rust-lang#124627 (interpret: hide some reexports in rustdoc)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6cc3959 into rust-lang:master May 2, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 2, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 2, 2024
Rollup merge of rust-lang#124622 - fmease:yeet-extern-crate-run_make_support, r=jieyouxu

Cleanup: Rid the `rmake` test runners of `extern crate run_make_support;`

`run_make_support` is part of the *extern prelude* of `rmake` test runners rendering `extern crate run_make_support` redundant:

https://github.com/rust-lang/rust/blob/80451a485b006bd32732c003a54ee7de457d8266/src/tools/compiletest/src/runtest.rs#L3826-L3827

~~Contains some fmt'ing changes because I've enabled format-on-save in my editor and because we don't run `x fmt` for `rmake` test runners yet (this gets addressed by rust-lang#124613). I can revert those if you'd like me to.~~ (reverted)

r? jieyouxu or testing-devex(?) or boostrap(?)
@fmease fmease deleted the yeet-extern-crate-run_make_support branch May 2, 2024 20:38
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants