Auto merge of #1709 - m-ou-se:2021, r=Xanewok

Add edition 2021. See rust-lang/rust#80576. This un-breaks the build of RLS after rust-lang/rust#79576 broke it.
rust-lang · Jan 10, 2021 · 288260a · 288260a
2 parents 2cf84ba + 956c2e2
commit 288260a
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,11 +42,11 @@ lsp-types = { version = "0.60", features = ["proposed"] }
 lazy_static = "1"
 log = "0.4"
 num_cpus = "1"
-racer = { version = "2.1.41", default-features = false }
+racer = { version = "2.1.42", default-features = false }
 rand = "0.7"
 rayon = "1"
 rustc_tools_util = "0.2"
-rustfmt-nightly = { git = "https://github.com/rust-lang/rustfmt", branch = "rustfmt-1.4.29" }
+rustfmt-nightly = { git = "https://github.com/rust-lang/rustfmt", branch = "rustfmt-1.4.31" }
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"

diff --git a/rls-ipc/src/rpc.rs b/rls-ipc/src/rpc.rs
@@ -73,4 +73,6 @@ pub enum Edition {
     Edition2015,
     /// Rust 2018
     Edition2018,
+    /// Rust 2021
+    Edition2021,
 }
diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs
@@ -140,6 +140,7 @@ impl Callbacks for ShimCalls {
             edition: match sess.edition() {
                 rustc_span::edition::Edition::Edition2015 => Edition::Edition2015,
                 rustc_span::edition::Edition::Edition2018 => Edition::Edition2018,
+                rustc_span::edition::Edition::Edition2021 => Edition::Edition2021,
             },
         };
 

diff --git a/rls/src/actions/requests.rs b/rls/src/actions/requests.rs
@@ -696,6 +696,7 @@ fn reformat(
                 let edition = match edition {
                     Edition::Edition2015 => RustfmtEdition::Edition2015,
                     Edition::Edition2018 => RustfmtEdition::Edition2018,
+                    Edition::Edition2021 => RustfmtEdition::Edition2021,
                 };
                 config.set().edition(edition);
                 trace!("Detected edition {:?} for file `{}`", edition, path.display());

diff --git a/rls/src/build/ipc.rs b/rls/src/build/ipc.rs
@@ -106,6 +106,7 @@ mod callbacks {
                 edition: match krate.edition {
                     rls_ipc::rpc::Edition::Edition2015 => crate::build::plan::Edition::Edition2015,
                     rls_ipc::rpc::Edition::Edition2018 => crate::build::plan::Edition::Edition2018,
+                    rls_ipc::rpc::Edition::Edition2021 => crate::build::plan::Edition::Edition2021,
                 },
                 disambiguator: krate.disambiguator,
             }

diff --git a/rls/src/build/plan.rs b/rls/src/build/plan.rs
@@ -236,6 +236,7 @@ pub struct Crate {
 pub enum Edition {
     Edition2015,
     Edition2018,
+    Edition2021,
 }
 
 impl Default for Edition {
@@ -251,6 +252,7 @@ impl std::convert::TryFrom<&str> for Edition {
         Ok(match val {
             "2015" => Edition::Edition2015,
             "2018" => Edition::Edition2018,
+            "2021" => Edition::Edition2021,
             _ => return Err("unknown"),
         })
     }

diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
@@ -254,6 +254,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls {
             edition: match sess.edition() {
                 RustcEdition::Edition2015 => Edition::Edition2015,
                 RustcEdition::Edition2018 => Edition::Edition2018,
+                RustcEdition::Edition2021 => Edition::Edition2021,
             },
         };