chore: update to Rust edition 2021 (denoland#12578)

hyp3rflow · Nov 2, 2021 · 8e31bbb · 8e31bbb
1 parent 7033691
commit 8e31bbb
Show file tree

Hide file tree

Showing 40 changed files with 23 additions and 46 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1,4 +1,4 @@
 # Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
 max_width = 80
 tab_spaces = 2
-edition = "2018"
+edition = "2021"
diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml
@@ -3,7 +3,7 @@
 name = "deno_bench_util"
 version = "0.17.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 publish = true
 readme = "README.md"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -5,7 +5,7 @@ name = "deno"
 version = "1.15.3"
 authors = ["the Deno authors"]
 default-run = "deno"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/denoland/deno"
 description = "Provides the deno executable"

diff --git a/cli/standalone.rs b/cli/standalone.rs
@@ -29,7 +29,6 @@ use deno_runtime::worker::WorkerOptions;
 use deno_runtime::BootstrapOptions;
 use deno_tls::create_default_root_cert_store;
 use log::Level;
-use std::convert::TryInto;
 use std::env::current_exe;
 use std::fs::File;
 use std::io::BufReader;

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -3,7 +3,7 @@
 name = "deno_core"
 version = "0.105.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/core/bindings.rs b/core/bindings.rs
@@ -17,8 +17,6 @@ use serde::Deserialize;
 use serde::Serialize;
 use serde_v8::to_v8;
 use std::cell::RefCell;
-use std::convert::TryFrom;
-use std::convert::TryInto;
 use std::option::Option;
 use url::Url;
 use v8::HandleScope;

diff --git a/core/error.rs b/core/error.rs
@@ -4,8 +4,6 @@ pub use anyhow::anyhow;
 pub use anyhow::bail;
 pub use anyhow::Context;
 use std::borrow::Cow;
-use std::convert::TryFrom;
-use std::convert::TryInto;
 use std::error::Error;
 use std::fmt;
 use std::fmt::Debug;

diff --git a/core/examples/http_bench_json_ops.rs b/core/examples/http_bench_json_ops.rs
@@ -10,7 +10,6 @@ use deno_core::Resource;
 use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use std::cell::RefCell;
-use std::convert::TryFrom;
 use std::env;
 use std::io::Error;
 use std::net::SocketAddr;

diff --git a/core/modules.rs b/core/modules.rs
@@ -16,7 +16,6 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::collections::VecDeque;
-use std::convert::TryFrom;
 use std::future::Future;
 use std::pin::Pin;
 use std::rc::Rc;

diff --git a/core/runtime.rs b/core/runtime.rs
@@ -29,7 +29,6 @@ use futures::task::AtomicWaker;
 use std::any::Any;
 use std::cell::RefCell;
 use std::collections::HashMap;
-use std::convert::TryFrom;
 use std::ffi::c_void;
 use std::mem::forget;
 use std::option::Option;

diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_broadcast_channel"
 version = "0.17.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_console"
 version = "0.23.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_crypto"
 version = "0.37.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs
@@ -14,8 +14,6 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use std::cell::RefCell;
-use std::convert::TryFrom;
-use std::convert::TryInto;
 use std::num::NonZeroU32;
 use std::rc::Rc;
 

diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_fetch"
 version = "0.46.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_ffi"
 version = "0.10.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/ffi/lib.rs b/ext/ffi/lib.rs
@@ -18,7 +18,6 @@ use serde::Deserialize;
 use std::borrow::Cow;
 use std::cell::RefCell;
 use std::collections::HashMap;
-use std::convert::TryFrom;
 use std::ffi::c_void;
 use std::path::Path;
 use std::path::PathBuf;

diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_http"
 version = "0.15.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_net"
 version = "0.15.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/timers/Cargo.toml b/ext/timers/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_timers"
 version = "0.21.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_tls"
 version = "0.10.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_url"
 version = "0.23.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_web"
 version = "0.54.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_webgpu"
 version = "0.24.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/webgpu/binding.rs b/ext/webgpu/binding.rs
@@ -5,7 +5,6 @@ use deno_core::ResourceId;
 use deno_core::{OpState, Resource};
 use serde::Deserialize;
 use std::borrow::Cow;
-use std::convert::{TryFrom, TryInto};
 
 use crate::texture::{GpuTextureFormat, GpuTextureViewDimension};
 

diff --git a/ext/webgpu/bundle.rs b/ext/webgpu/bundle.rs
@@ -7,7 +7,6 @@ use deno_core::{OpState, Resource};
 use serde::Deserialize;
 use std::borrow::Cow;
 use std::cell::RefCell;
-use std::convert::TryInto;
 use std::rc::Rc;
 
 use crate::pipeline::GpuIndexFormat;

diff --git a/ext/webgpu/pipeline.rs b/ext/webgpu/pipeline.rs
@@ -6,7 +6,6 @@ use deno_core::{OpState, Resource};
 use serde::Deserialize;
 use serde::Serialize;
 use std::borrow::Cow;
-use std::convert::{TryFrom, TryInto};
 
 use crate::sampler::GpuCompareFunction;
 use crate::texture::GpuTextureFormat;

diff --git a/ext/webgpu/texture.rs b/ext/webgpu/texture.rs
@@ -6,8 +6,6 @@ use deno_core::ResourceId;
 use deno_core::{OpState, Resource};
 use serde::Deserialize;
 use std::borrow::Cow;
-use std::convert::TryFrom;
-use std::convert::TryInto;
 
 use super::error::WebGpuResult;
 pub(crate) struct WebGpuTexture(pub(crate) wgpu_core::id::TextureId);

diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_webidl"
 version = "0.23.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_websocket"
 version = "0.28.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_webstorage"
 version = "0.18.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -4,7 +4,7 @@
 name = "deno_runtime"
 version = "0.31.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/denoland/deno"
 description = "Provides the deno runtime library"

diff --git a/runtime/ops/process.rs b/runtime/ops/process.rs
@@ -261,7 +261,6 @@ pub fn kill(pid: i32, signal: &str) -> Result<(), AnyError> {
  let signo = super::signal::signal_str_to_int(signal)?;
  use nix::sys::signal::{kill as unix_kill, Signal};
  use nix::unistd::Pid;
- use std::convert::TryFrom;
  let sig = Signal::try_from(signo)?;
  unix_kill(Pid::from_raw(pid), Option::Some(sig)).map_err(AnyError::from)
 }

diff --git a/serde_v8/Cargo.toml b/serde_v8/Cargo.toml
@@ -3,7 +3,7 @@
 name = "serde_v8"
 version = "0.16.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/denoland/deno"

diff --git a/serde_v8/benches/de.rs b/serde_v8/benches/de.rs
@@ -1,8 +1,6 @@
 // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
 use bencher::{benchmark_group, benchmark_main, Bencher};
 
-use std::convert::TryFrom;
-
 use serde::Deserialize;
 
 use serde_v8::utils::{js_exec, v8_do};

diff --git a/serde_v8/src/de.rs b/serde_v8/src/de.rs
@@ -2,8 +2,6 @@
 use serde::de::{self, Visitor};
 use serde::Deserialize;
 
-use std::convert::TryFrom;
-
 use crate::error::{Error, Result};
 use crate::keys::{v8_struct_key, KeyCache};
 use crate::payload::ValueType;

diff --git a/serde_v8/src/ser.rs b/serde_v8/src/ser.rs
@@ -3,7 +3,6 @@ use serde::ser;
 use serde::ser::Serialize;
 
 use std::cell::RefCell;
-use std::convert::TryInto;
 
 use crate::error::{Error, Result};
 use crate::keys::v8_struct_key;

diff --git a/serde_v8/tests/magic.rs b/serde_v8/tests/magic.rs
@@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize};
 
 use serde_v8::utils::{js_exec, v8_do};
 use serde_v8::Result;
-use std::convert::TryFrom;
 
 #[derive(Deserialize)]
 struct MagicOp<'s> {

diff --git a/test_ffi/Cargo.toml b/test_ffi/Cargo.toml
@@ -4,7 +4,7 @@
 name = "test_ffi"
 version = "0.1.0"
 authors = ["the deno authors"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/test_util/Cargo.toml b/test_util/Cargo.toml
@@ -4,7 +4,7 @@
 name = "test_util"
 version = "0.1.0"
 authors = ["the Deno authors"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[bin]]