Basic support for Rust 2021

Author: shepmaster

compiler/base/modify-cargo-toml/src/main.rs

@@ -20,6 +20,10 @@ fn main() {
     let mut cargo_toml: Value = toml::from_str(&input)
         .unwrap_or_else(|e| panic!("Cannot parse {} as TOML: {}", input_filename.display(), e));
 
+    if env::var_os("PLAYGROUND_FEATURE_EDITION2021").is_some() {
+        cargo_toml = set_feature_edition2021(cargo_toml);
+    }
+
     if let Ok(edition) = env::var("PLAYGROUND_EDITION") {
         cargo_toml = set_edition(cargo_toml, &edition);
     }
@@ -62,6 +66,22 @@ fn ensure_string_in_vec(values: &mut Vec<String>, val: &str) {
     }
 }
 
+fn set_feature_edition2021(cargo_toml: Value) -> Value {
+    #[derive(Debug, Serialize, Deserialize)]
+    #[serde(rename_all = "kebab-case")]
+    struct CargoToml {
+        #[serde(default)]
+        cargo_features: Vec<String>,
+        #[serde(flatten)]
+        other: Other,
+    }
+
+    modify(cargo_toml, |mut cargo_toml: CargoToml| {
+        ensure_string_in_vec(&mut cargo_toml.cargo_features, "edition2021");
+        cargo_toml
+    })
+}
+
 fn set_edition(cargo_toml: Value, edition: &str) -> Value {
     #[derive(Debug, Serialize, Deserialize)]
     #[serde(rename_all = "kebab-case")]

ui/frontend/AdvancedOptionsMenu.tsx

@@ -29,6 +29,7 @@ const AdvancedOptionsMenu: React.SFC = () => {
       >
         <option value={Edition.Rust2015}>2015</option>
         <option value={Edition.Rust2018}>2018</option>
+        <option value={Edition.Rust2021}>2021</option>
       </SelectConfig>
 
       <EitherConfig

ui/frontend/types.ts

@@ -96,6 +96,7 @@ export enum Mode {
 export enum Edition {
   Rust2015 = '2015',
   Rust2018 = '2018',
+  Rust2021 = '2021',
 }
 
 export enum Backtrace {

ui/src/main.rs

@@ -1480,6 +1480,7 @@ fn parse_edition(s: &str) -> Result<Option<sandbox::Edition>> {
         "" => None,
         "2015" => Some(sandbox::Edition::Rust2015),
         "2018" => Some(sandbox::Edition::Rust2018),
+        "2021" => Some(sandbox::Edition::Rust2021),
         value => InvalidEdition { value }.fail()?,
     })
 }

ui/src/sandbox.rs

@@ -681,6 +681,7 @@ pub enum Mode {
 pub enum Edition {
     Rust2015,
     Rust2018,
+    Rust2021, // TODO - add parallel tests for 2021
 }
 
 impl Edition {
@@ -690,6 +691,7 @@ impl Edition {
         match *self {
             Rust2015 => "2015",
             Rust2018 => "2018",
+            Rust2021 => "2021",
         }
     }
 }
@@ -751,6 +753,10 @@ impl DockerCommandExt for Command {
 
     fn apply_edition(&mut self, req: impl EditionRequest) {
         if let Some(edition) = req.edition() {
+            if edition == Edition::Rust2021 {
+                self.args(&["--env", &format!("PLAYGROUND_FEATURE_EDITION2021=true")]);
+            }
+
             self.args(&["--env", &format!("PLAYGROUND_EDITION={}", edition.cargo_ident())]);
         }
     }