upstream

Author: Ellen Arteca

.gitignore

@@ -9,5 +9,6 @@ tex/*/out
 perf.data
 perf.data.old
 flamegraph.svg
+<<<<<<< HEAD
 tests/extern-so/libtestlib.so
 .auto-*

tests/compiletest.rs

@@ -1,7 +1,11 @@
 use colored::*;
 use regex::Regex;
 use std::path::{Path, PathBuf};
+<<<<<<< HEAD
 use std::{env, ffi::OsString, process::Command};
+=======
+use std::{env, ffi::OsString};
+>>>>>>> master
 use ui_test::{color_eyre::Result, Config, DependencyBuilder, Mode, OutputConflictHandling};
 
 fn miri_path() -> PathBuf {