Merge #3220

3220: Fix clippy warnings, update Cargo.toml versions r=matklad a=SomeoneToIgnore

In the `cargo xtask lint` ouptut, there were two interesting Clippy warnings that might be interesting to investigate further:

* warning: this argument (4 byte) is passed by reference, but would be more efficient if passed by value (limit: 8 byte)

* warning: large size difference between variants

Co-authored-by: Kirill Bulatov <[email protected]>

2 files changed, 2 insertions, 2 deletions

diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 7afa5d8fc..878c22ba9 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -10,7 +10,7 @@ doctest = false
 [dependencies]
 salsa = "0.14.1"
 relative-path = "1.0.0"
-rustc-hash = "1.0"
+rustc-hash = "1.1.0"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_cfg = { path = "../ra_cfg" }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 1b4b47215..78d121683 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -249,7 +249,7 @@ impl FromStr for Edition {
         let res = match s {
             "2015" => Edition::Edition2015,
             "2018" => Edition::Edition2018,
-            _ => Err(ParseEditionError { invalid_input: s.to_string() })?,
+            _ => return Err(ParseEditionError { invalid_input: s.to_string() }),
         };
         Ok(res)
     }