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 4 pull requests #125628

Merged
merged 11 commits into from
May 27, 2024
Merged

Rollup of 4 pull requests #125628

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c8b0e5b
The number of tests does not depend on the architecture's pointer width
tbu- May 20, 2024
90fec5a
Add `copy_dir_all` and `recursive_diff` functions to `run-make-support`
GuillaumeGomez May 25, 2024
1551fd1
Add file path in case it cannot be read in `Diff::actual_file`
GuillaumeGomez May 25, 2024
f0ab814
Add `Rustdoc::output_format`
GuillaumeGomez May 25, 2024
bdf3864
Migrate `run-make/rustdoc-verify-output-files` to `rmake.rs`
GuillaumeGomez May 25, 2024
7d24f87
MIR validation: ensure that downcast projection is followed by field …
RalfJung May 27, 2024
7a847fc
Use grep to implement verify-line-endings
ChrisDenton May 27, 2024
8bd1587
Rollup merge of #125339 - tbu-:pr_tidy_ui_tests_u32, r=clubby789
matthiaskrgr May 27, 2024
e8dd585
Rollup merge of #125542 - GuillaumeGomez:migrate-rustdoc-verify-outpu…
matthiaskrgr May 27, 2024
61f9d35
Rollup merge of #125616 - RalfJung:mir-validate-downcast-projection, …
matthiaskrgr May 27, 2024
4966e1a
Rollup merge of #125625 - ChrisDenton:line-endings, r=Mark-Simulacrum
matthiaskrgr May 27, 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
Add file path in case it cannot be read in Diff::actual_file
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed May 27, 2024
commit 1551fd12023e3b84d844bde2e376c407af1e9a04
5 changes: 4 additions & 1 deletion src/tools/run-make-support/src/diff/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ impl Diff {
/// Specify the actual output for the diff from a file.
pub fn actual_file<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
let path = path.as_ref();
let content = std::fs::read_to_string(path).expect("failed to read file");
let content = match std::fs::read_to_string(path) {
Ok(c) => c,
Err(e) => panic!("failed to read `{}`: {:?}", path.display(), e),
};
let name = path.to_string_lossy().to_string();

self.actual = Some(content);
Expand Down