hir and edition test

Author: shepmaster

orchestrator/src/coordinator.rs

@@ -319,7 +319,7 @@ async fn modify_cargo_toml(
     let cargo_toml = String::from_utf8(cargo_toml.0)?;
     let cargo_toml = toml::from_str(&cargo_toml)?;
 
-    let cargo_toml = modify_cargo_toml::set_edition(cargo_toml, edition.as_cargo_toml_key());
+    let cargo_toml = modify_cargo_toml::set_edition(cargo_toml, edition.to_cargo_toml_key());
 
     let cargo_toml = toml::to_string(&cargo_toml)?;
     let cargo_toml = cargo_toml.into_bytes();
@@ -795,6 +795,23 @@ mod tests {
         }
     }
 
+    fn new_compile_hir_request() -> CompileRequest {
+        new_compile_hir_request_for(Edition::Rust2021)
+    }
+
+    fn new_compile_hir_request_for(edition: Edition) -> CompileRequest {
+        CompileRequest {
+            target: CompileTarget::Hir,
+            channel: Channel::Beta,
+            crate_type: CrateType::Library(LibraryType::Lib),
+            mode: Mode::Release,
+            edition,
+            tests: false,
+            backtrace: false,
+            code: r#"pub fn sub(a: u8, b: u8) -> u8 { a - b }"#.to_owned(),
+        }
+    }
+
     fn new_compile_llvm_ir_request() -> CompileRequest {
         CompileRequest {
             target: CompileTarget::LlvmIr,
@@ -879,6 +896,30 @@ mod tests {
         Ok(())
     }
 
+    #[tokio::test]
+    #[snafu::report]
+    async fn test_compile_edition() -> Result<()> {
+        for edition in Edition::ALL {
+            let coordinator = new_coordinator()?;
+
+            let response = coordinator
+                .compile(new_compile_hir_request_for(edition))
+                .with_timeout()
+                .await
+                .unwrap();
+
+            let prelude = format!("std::prelude::rust_{}", edition.to_str());
+
+            assert!(response.success, "stderr: {}", response.stderr);
+            assert_contains!(response.code, &prelude);
+
+            coordinator.shutdown().await?;
+        }
+
+        Ok(())
+    }
+
+
     #[tokio::test]
     #[snafu::report]
     async fn test_compile_assembly() -> Result<()> {
@@ -904,6 +945,25 @@ mod tests {
         Ok(())
     }
 
+    #[tokio::test]
+    #[snafu::report]
+    async fn test_compile_hir() -> Result<()> {
+        let coordinator = new_coordinator()?;
+
+        let response = coordinator
+            .compile(new_compile_hir_request())
+            .with_timeout()
+            .await
+            .unwrap();
+
+        assert!(response.success, "stderr: {}", response.stderr);
+        assert_contains!(response.code, "extern crate std");
+
+        coordinator.shutdown().await?;
+
+        Ok(())
+    }
+
     #[tokio::test]
     #[snafu::report]
     async fn test_compile_llvm_ir() -> Result<()> {

orchestrator/src/sandbox.rs

@@ -62,13 +62,20 @@ pub enum Edition {
 }
 
 impl Edition {
-    pub(crate) fn as_cargo_toml_key(&self) -> &'static str {
+    #[cfg(test)]
+    pub(crate) const ALL: [Self; 3] = [Self::Rust2015, Self::Rust2018, Self::Rust2021];
+
+    pub(crate) fn to_str(&self) -> &'static str {
         match self {
             Edition::Rust2015 => "2015",
             Edition::Rust2018 => "2018",
             Edition::Rust2021 => "2021",
         }
     }
+
+    pub(crate) fn to_cargo_toml_key(&self) -> &'static str {
+        self.to_str()
+    }
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]