Migrate run-make/crate-data-smoke to rmake.rs
#125723
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-testsuite
lqd
reviewed
May 29, 2024
GuillaumeGomez
force-pushed
the
migrate-run-make-crate-data-smoke
branch
from
6379f9a
to
de1d0e0
Compare
jieyouxu
reviewed
May 29, 2024
| ); | ||
| compare_stdout( | ||
| rustc().print("file-names").input("lib.rs").run(), | ||
| rust_lib("mylib").file_name().unwrap().to_string_lossy(), |
There was a problem hiding this comment.
Suggestion: rust_lib is a bit weird because it constructs a path under tmp_dir() and then joins the library name. Then to get the filename we have to do this long .file_name().unwrap().to_string_lossy() dance.
I know we currently have it defined as
/// Construct a path to a rust library (rlib) under `$TMPDIR` given the library name. This will return a
/// path with `$TMPDIR` joined with the library name.
pub fn rust_lib(name: &str) -> PathBuf {
tmp_dir().join(format!("lib{name}.rlib"))
}
should we introduce a helper that's only responsible for calculating the rlib name itself?
fn rlib_name(name: &str) -> String {
format!("lib{name}.rlib")
}There was a problem hiding this comment.
That would be much better indeed! Doing it.
jieyouxu
approved these changes
May 29, 2024
| ); | ||
| compare_stdout( | ||
| rustc().print("file-names").input("lib.rs").run(), | ||
| rust_lib_name("mylib"), |
There was a problem hiding this comment.
Yes, I like how this reads much better :3
|
Thanks, r=me after CI is green |
|
@bors r=jieyouxu rollup |
bors
added
S-waiting-on-bors
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 29, 2024
…ate-data-smoke, r=jieyouxu Migrate `run-make/crate-data-smoke` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`
This was referenced May 29, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 30, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#125653 (Migrate `run-make/const-prop-lint` to `rmake.rs`) - rust-lang#125662 (Rewrite `fpic`, `simple-dylib` and `issue-37893` `run-make` tests in `rmake.rs` or ui test format) - rust-lang#125699 (Streamline `x fmt` and improve its output) - rust-lang#125701 ([ACP 362] genericize `ptr::from_raw_parts`) - rust-lang#125723 (Migrate `run-make/crate-data-smoke` to `rmake.rs`) - rust-lang#125733 (Add lang items for `AsyncFn*`, `Future`, `AsyncFnKindHelper`'s associated types) - rust-lang#125734 (ast: Revert a breaking attribute visiting order change) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 30, 2024
Rollup merge of rust-lang#125723 - GuillaumeGomez:migrate-run-make-crate-data-smoke, r=jieyouxu Migrate `run-make/crate-data-smoke` to `rmake.rs` Part of rust-lang#121876. r? ``@jieyouxu``
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #121876.
r? @jieyouxu