Merge pull request #266 from oli-obk/miri

Make a bunch of things public so that miri can use them

Author: oli-obk

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.26.0"
+version = "0.26.1"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"

Cargo.toml

@@ -4,9 +4,8 @@ use spanned::Spanned;
 
 #[cfg(feature = "rustc")]
 use crate::{
-    aux_builds::AuxBuilder, build_manager::BuildManager, custom_flags::run::Run,
-    custom_flags::rustfix::RustfixMode, custom_flags::Flag, filter::Match,
-    per_test_config::TestConfig, rustc_stderr, Errored,
+    aux_builds::AuxBuilder, custom_flags::run::Run, custom_flags::rustfix::RustfixMode,
+    custom_flags::Flag, filter::Match, rustc_stderr,
 };
 use crate::{
     diagnostics::Diagnostics,
@@ -75,29 +74,9 @@ impl Config {
     /// `rustc` on the test files.
     #[cfg(feature = "rustc")]
     pub fn rustc(root_dir: impl Into<PathBuf>) -> Self {
-        let mut comment_defaults = Comments::default();
-
-        #[derive(Debug)]
-        struct Edition(String);
-
-        impl Flag for Edition {
-            fn must_be_unique(&self) -> bool {
-                true
-            }
-            fn clone_inner(&self) -> Box<dyn Flag> {
-                Box::new(Edition(self.0.clone()))
-            }
+        use crate::custom_flags::edition::Edition;
 
-            fn apply(
-                &self,
-                cmd: &mut std::process::Command,
-                _config: &TestConfig,
-                _build_manager: &BuildManager,
-            ) -> Result<(), Errored> {
-                cmd.arg("--edition").arg(&self.0);
-                Ok(())
-            }
-        }
+        let mut comment_defaults = Comments::default();
 
         #[derive(Debug)]
         struct NeedsAsmSupport;

src/config.rs

@@ -7,6 +7,8 @@ use std::{
 
 use crate::{build_manager::BuildManager, per_test_config::TestConfig, Config, Errored};
 
+#[cfg(feature = "rustc")]
+pub mod edition;
 #[cfg(feature = "rustc")]
 pub mod run;
 pub mod rustfix;

src/custom_flags.rs

@@ -0,0 +1,28 @@
+//! Custom flag for setting the edition for all tests
+
+use crate::{build_manager::BuildManager, per_test_config::TestConfig, Errored};
+
+use super::Flag;
+
+#[derive(Debug)]
+/// Set the edition of the tests
+pub struct Edition(pub String);
+
+impl Flag for Edition {
+    fn must_be_unique(&self) -> bool {
+        true
+    }
+    fn clone_inner(&self) -> Box<dyn Flag> {
+        Box::new(Edition(self.0.clone()))
+    }
+
+    fn apply(
+        &self,
+        cmd: &mut std::process::Command,
+        _config: &TestConfig,
+        _build_manager: &BuildManager,
+    ) -> Result<(), Errored> {
+        cmd.arg("--edition").arg(&self.0);
+        Ok(())
+    }
+}

src/custom_flags/edition.rs

@@ -18,7 +18,7 @@ pub use crate::diagnostics::Level;
 use crate::diagnostics::{Diagnostics, Message};
 pub use crate::parser::{Comments, Condition, Revisioned};
 use crate::parser::{ErrorMatch, ErrorMatchKind, OptWithLine};
-use crate::status_emitter::TestStatus;
+use crate::status_emitter::{SilentStatus, TestStatus};
 use crate::test_result::{Errored, TestOk, TestResult};
 use crate::{core::strip_path_prefix, Config, Error, Errors, OutputConflictHandling};
 
@@ -34,6 +34,19 @@ pub struct TestConfig {
 }
 
 impl TestConfig {
+    /// Create a config for running one file.
+    pub fn one_off_runner(config: Config, path: PathBuf) -> Self {
+        Self {
+            comments: Arc::new(config.comment_defaults.clone()),
+            config,
+            aux_dir: PathBuf::new(),
+            status: Box::new(SilentStatus {
+                revision: "".into(),
+                path,
+            }),
+        }
+    }
+
     pub(crate) fn patch_out_dir(&mut self) {
         // Put aux builds into a separate directory per path so that multiple aux files
         // from different directories (but with the same file name) don't collide.
@@ -112,7 +125,8 @@ impl TestConfig {
         Ok(())
     }
 
-    pub(crate) fn build_command(&self, build_manager: &BuildManager) -> Result<Command, Errored> {
+    /// Produce the command that will be executed to run the test.
+    pub fn build_command(&self, build_manager: &BuildManager) -> Result<Command, Errored> {
         let mut cmd = self.config.program.build(&self.config.out_dir);
         cmd.arg(self.status.path());
         if !self.status.revision().is_empty() {