8000 Const check/promotion cleanup and sanity assertion by oli-obk · Pull Request #71198 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Const check/promotion cleanup and sanity assertion #71198

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

Merged
merged 7 commits into from
Apr 23, 2020
Merged

Const check/promotion cleanup and sanity assertion #71198

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a135ced
Fix ui test blessing when a test has an empty stderr file after havin…
oli-obk Mar 16, 2020
6a3fb26
Rename `Item` to `ConstCx`.
oli-obk Mar 23, 2020
f0f7a59
Use ConstCx in more places
oli-obk Apr 2, 2020
0bc743e
Use ConstCx in the promoted collector
oli-obk Apr 2, 2020
22a5379
Use `ConstCx` for `validate_candidates`
oli-obk Apr 2, 2020
119c636
Catch and fix explicit promotions that fail to actually promote
oli-obk Apr 6, 2020
4cdc31b
Document our sanity assertion around explicit promotion
oli-obk Apr 16, 2020
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
Next Next commit
Fix ui test blessing when a test has an empty stderr file after havin… 
…g had content there before the current changes
  • Loading branch information
@oli-obk
oli-obk committed Apr 23, 2020
commit a135ced5ce76a842c85a9b62baccefc5e53fb31c
6 changes: 5 additions & 1 deletion src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3338,6 +3338,10 @@ impl<'test> TestCx<'test> {
}

fn delete_file(&self, file: &PathBuf) {
if !file.exists() {
// Deleting a nonexistant file would error.
return;
}
if let Err(e) = fs::remove_file(file) {
self.fatal(&format!("failed to delete `{}`: {}", file.display(), e,));
}
Expand Down Expand Up @@ -3400,7 +3404,7 @@ impl<'test> TestCx<'test> {
let examined_content =
self.load_expected_output_from_path(&examined_path).unwrap_or_else(|_| String::new());

if examined_path.exists() && canon_content == &examined_content {
if canon_content == &examined_content {
self.delete_file(&examined_path);
}
}
Expand Down
0