Upgrade Rust edition

All crates in workspace are now 2021 Rust commit-id:e6fac661
flokli · Sep 30, 2023 · b34454b · b34454b
1 parent e296d3a
commit b34454b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/hyper_cgi/Cargo.toml b/hyper_cgi/Cargo.toml
@@ -2,7 +2,7 @@
 name = "hyper_cgi"
 version = "22.10.25"
 authors = ["Christian Schilling <[email protected]>", "Louis-Marie Givel <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license-file = "LICENSE"
 description = "Run CGI scripts with hyper"
 repository = "https://github.com/josh-project/josh"

diff --git a/josh-core/Cargo.toml b/josh-core/Cargo.toml
@@ -7,7 +7,7 @@ license-file = "LICENSE"
 description = "GIT virtualization proxy"
 keywords = ["git", "monorepo", "workflow", "scm"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 backtrace = "0.3.69"

diff --git a/josh-filter/Cargo.toml b/josh-filter/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Christian Schilling <[email protected]>"]
 description = "GIT filter cli"
-edition = "2018"
+edition = "2021"
 keywords = ["git", "monorepo", "workflow", "scm"]
 license-file = "LICENSE"
 name = "josh-filter"

diff --git a/josh-proxy/Cargo.toml b/josh-proxy/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Christian Schilling <[email protected]>"]
 description = "GIT virtualization proxy"
-edition = "2018"
+edition = "2021"
 keywords = ["git", "monorepo", "workflow", "scm"]
 license-file = "LICENSE"
 name = "josh-proxy"

diff --git a/josh-proxy/src/lib.rs b/josh-proxy/src/lib.rs
@@ -510,7 +510,6 @@ fn create_repo_base(path: &PathBuf) -> josh::JoshResult<josh::shell::Shell> {
                 .cloned()
                 .try_for_each(|(key, value)| -> JoshResult<()> {
                     use gix::config::parse::section::Key;
-                    use std::convert::TryFrom;
 
                     let key = Key::try_from(key)
                         .map_err(|_| josh_error("unable to create config section"))?;

diff --git a/josh-rpc/Cargo.toml b/josh-rpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "josh-rpc"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = { workspace = true }

diff --git a/josh-ssh-shell/Cargo.toml b/josh-ssh-shell/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "josh-ssh-shell"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 clap = { workspace = true }