Migrate to Rust 2021

taiki-e · Jun 13, 2022 · 2b527ae · 2b527ae
1 parent 1efe61d
commit 2b527ae
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -26,7 +26,7 @@ use_try_shorthand = true
 
 # Set the default settings again to always apply the proper formatting without
 # being affected by the editor settings.
-edition = "2018"
+edition = "2021"
 hard_tabs = false
 newline_style = "Unix"
 tab_spaces = 4
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-llvm-cov"
 version = "0.4.6" #publish:version
-edition = "2018"
+edition = "2021"
 rust-version = "1.56"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/taiki-e/cargo-llvm-cov"

diff --git a/src/main.rs b/src/main.rs
@@ -25,7 +25,6 @@ mod fs;
 
 use std::{
     collections::HashMap,
-    convert::TryInto,
     ffi::{OsStr, OsString},
     fmt::Write as _,
     path::Path,

diff --git a/tests/auxiliary/mod.rs b/tests/auxiliary/mod.rs
@@ -1,5 +1,4 @@
 use std::{
-    convert::TryInto,
     env,
     ffi::OsStr,
     io::{Read, Seek, Write},

diff --git a/tests/fixtures/crates/coverage_helper/Cargo.toml b/tests/fixtures/crates/coverage_helper/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "no_coverage_coverage_helper"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [workspace]