Update to 2021 edition (#3217)

..and also include the rust-version property in the taskchampion crate.

Cargo.toml

@@ -8,6 +8,8 @@ members = [
     "taskchampion/xtask",
 ]
 
+resolver = "2"
+
 # src/tc/rust is just part of the TW build and not a public crate
 exclude = [ "src/tc/rust" ]
 

taskchampion/integration-tests/Cargo.toml

@@ -2,7 +2,7 @@
 name = "integration-tests"
 version = "0.4.1"
 authors = ["Dustin J. Mitchell <dustin@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 build = "build.rs"
 

taskchampion/lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "taskchampion-lib"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libc.workspace = true

taskchampion/sync-server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "taskchampion-sync-server"
 version = "0.4.1"
 authors = ["Dustin J. Mitchell <dustin@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

taskchampion/taskchampion/Cargo.toml

@@ -8,7 +8,8 @@ documentation = "https://docs.rs/crate/taskchampion"
 repository = "https://github.com/GothenburgBitFactory/taskwarrior"
 readme = "../README.md"
 license = "MIT"
-edition = "2018"
+edition = "2021"
+rust-version = "1.65"
 
 [features]
 default = ["server-sync" ]

taskchampion/xtask/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "xtask"
 version = "0.4.1" 
-edition = "2018"
-# rust-version = "1.65" # Used for testing xtask MSRV functionality
+edition = "2021"
 
 [dependencies]
 anyhow.workspace = true

taskchampion/xtask/src/main.rs

@@ -22,6 +22,7 @@ const MSRV_PATH_REGEX: &[(&str, &str)] = &[
         "taskchampion/src/lib.rs",
         r#"Rust version [0-9.]* and higher"#,
     ),
+    ("taskchampion/Cargo.toml", r#"^rust-version = "[0-9.]"#),
 ];
 
 pub fn main() -> anyhow::Result<()> {