Merge pull request #717 from integer32llc/edition-2021

Add support for Rust 2021

Author: shepmaster

compiler/base/Cargo.toml

@@ -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")]

compiler/base/crate-information.json

@@ -20,7 +20,7 @@ GEM
       addressable (~> 2.7)
     mini_mime (1.1.0)
     mini_portile2 (2.5.1)
-    nokogiri (1.11.3)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     public_suffix (4.0.6)

compiler/base/modify-cargo-toml/Cargo.lock

@@ -7,37 +7,45 @@
 
   before do
     visit '/'
-    editor.set(rust_2018_code)
+    editor.set(rust_edition_code)
   end
 
-  scenario "using the 2015 channel" do
-    in_advanced_options_menu { choose '2015' }
+  scenario "using the 2015 edition" do
+    in_advanced_options_menu { select '2015' }
     click_on("Run")
 
     within(:output, :stderr) do
-      expect(page).to have_content 'unused variable: `async`'
-      expect(page).to_not have_content 'expected identifier, found keyword `async`'
+      expect(page).to have_content 'cannot find struct, variant or union type `async` in this scope'
     end
   end
 
-  scenario "using the 2018 channel" do
-    in_advanced_options_menu { choose '2018' }
+  scenario "using the 2018 edition" do
+    in_advanced_options_menu { select '2018' }
     click_on("Run")
 
     within(:output, :stderr) do
-      expect(page).to have_content 'expected identifier, found keyword `async`'
-      expect(page).to_not have_content 'unused variable: `async`'
+      expect(page).to have_content "thread 'main' panicked at 'Box<Any>'"
+    end
+  end
+
+  scenario "using the 2021 edition" do
+    in_advanced_options_menu { select '2021' }
+    click_on("Run")
+
+    within(:output, :stderr) do
+      expect(page).to have_content 'format argument must be a string literal', wait: 10
     end
   end
 
   def editor
     Editor.new(page)
   end
 
-  def rust_2018_code
+  def rust_edition_code
     <<~EOF
+    #![allow(non_fmt_panic)]
     fn main() {
-        let async = 42;
+        panic!(async {})
     }
     EOF
   end

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

@@ -14,7 +14,7 @@
 
     in_channel_menu { click_on("Nightly") }
     in_mode_menu { click_on("Release") }
-    in_advanced_options_menu { choose("2018") }
+    in_advanced_options_menu { select("2018") }
 
     within(:header) { click_on 'Share' }
 

tests/Gemfile.lock

@@ -26,7 +26,7 @@
   RSpec::Matchers.define :have_edition do |expected|
     match do |actual|
       in_advanced_options_menu do
-        expect(page).to have_checked_field(expected, visible: false)
+        expect(page).to have_select(selected: expected)
       end
     end
   end