Merge pull request RustPython#3357 from coolreader18/edition2021

youknowone · web-flow · commit 6138cb447694 · 2021-10-22T08:21:45.000+09:00
Migrate to 2021 edition
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -108,6 +108,7 @@ jobs:
       - name: Prepare repository for redox compilation
         run: bash scripts/redox/uncomment-cargo.sh
       - name: Check compilation for Redox
+        if: false # FIXME: redoxer toolchain is from ~july 2021, edition2021 isn't stabilized
         uses: coolreader18/redoxer-action@v1
         with:
           command: check
@@ -249,6 +250,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
       - name: Cache cargo dependencies
         uses: actions/cache@v2
         with:
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,11 @@
+# REDOX START
+# cargo-features = ["edition2021"]
+# REDOX END
 [package]
 name = "rustpython"
 version = "0.1.2"
 authors = ["RustPython Team"]
-edition = "2018"
+edition = "2021"
 description = "A python interpreter written in rust."
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
diff --git a/ast/Cargo.toml b/ast/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rustpython-ast"
 version = "0.1.0"
 authors = ["RustPython Team"]
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["constant-optimization", "fold"]
diff --git a/bytecode/Cargo.toml b/bytecode/Cargo.toml
@@ -3,7 +3,7 @@ name = "rustpython-bytecode"
 description = "RustPython specific bytecode."
 version = "0.1.2"
 authors = ["RustPython Team"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
 
diff --git a/bytecode/src/lib.rs b/bytecode/src/lib.rs
@@ -1251,7 +1251,6 @@ pub struct FrozenModule<C: Constant = ConstantData> {
 pub mod frozen_lib {
     use super::*;
     use bincode::{options, Options};
-    use std::convert::TryInto;
     use std::io;
 
     /// Decode a library to a iterable of frozen modules
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rustpython-common"
 version = "0.0.0"
 authors = ["RustPython Team"]
-edition = "2018"
+edition = "2021"
 
 [features]
 threading = ["parking_lot"]
diff --git a/common/src/hash.rs b/common/src/hash.rs
@@ -2,7 +2,6 @@ use num_bigint::BigInt;
 use num_complex::Complex64;
 use num_traits::ToPrimitive;
 use siphasher::sip::SipHasher24;
-use std::convert::TryInto;
 use std::hash::{BuildHasher, Hash, Hasher};
 use std::num::Wrapping;
 
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -5,7 +5,7 @@ description = "Compiler for python code into bytecode for the rustpython VM."
 authors = ["RustPython Team"]
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 indexmap = "1.0"
diff --git a/compiler/porcelain/Cargo.toml b/compiler/porcelain/Cargo.toml
@@ -3,7 +3,7 @@ name = "rustpython-compiler"
 version = "0.1.2"
 description = "A usability wrapper around rustpython-parser and rustpython-compiler-core"
 authors = ["RustPython Team"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 thiserror = "1.0"
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -5,7 +5,7 @@ description = "Rust language extensions and macros specific to rustpython."
 authors = ["RustPython Team"]
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/derive/src/from_args.rs b/derive/src/from_args.rs
@@ -185,17 +185,17 @@ fn generate_field((i, field): (usize, &Field)) -> Result<TokenStream> {
     let file_output = match attr.kind {
         ParameterKind::PositionalOnly => {
             quote! {
-                #fieldname: args.take_positional()#middle#ending,
+                #fieldname: args.take_positional()#middle #ending,
             }
         }
         ParameterKind::PositionalOrKeyword => {
             quote! {
-                #fieldname: args.take_positional_keyword(#pyname)#middle#ending,
+                #fieldname: args.take_positional_keyword(#pyname)#middle #ending,
             }
         }
         ParameterKind::KeywordOnly => {
             quote! {
-                #fieldname: args.take_keyword(#pyname)#middle#ending,
+                #fieldname: args.take_keyword(#pyname)#middle #ending,
             }
         }
         ParameterKind::Flatten => unreachable!(),
diff --git a/jit/Cargo.toml b/jit/Cargo.toml
@@ -5,7 +5,7 @@ description = "Experimental JIT(just in time) compiler for python code."
 authors = [ "RustPython Team" ]
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 autotests = false
 
diff --git a/jit/src/lib.rs b/jit/src/lib.rs
@@ -10,7 +10,6 @@ use rustpython_bytecode as bytecode;
 mod instructions;
 
 use instructions::FunctionCompiler;
-use std::convert::TryFrom;
 
 #[derive(Debug, thiserror::Error)]
 pub enum JitCompileError {
diff --git a/jit/tests/common.rs b/jit/tests/common.rs
@@ -176,8 +176,6 @@ macro_rules! jit_function {
     };
     ($func_name:ident($($arg_name:ident:$arg_type:ty),*) -> $ret_type:ty => $($t:tt)*) => {
         {
-            use std::convert::TryInto;
-
             let jit_code = jit_function!($func_name => $($t)*);
 
             move |$($arg_name:$arg_type),*| -> Result<$ret_type, rustpython_jit::JitArgumentError> {
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -6,7 +6,7 @@ authors = [ "RustPython Team" ]
 build = "build.rs"
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 [build-dependencies]
 lalrpop = "0.19.6"
diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
@@ -3,8 +3,6 @@
 // See also: file:///usr/share/doc/python/html/reference/compound_stmts.html#function-definitions
 // See also: https://greentreesnakes.readthedocs.io/en/latest/nodes.html#keyword
 
-use std::iter::FromIterator;
-
 use crate::ast;
 use crate::fstring::parse_located_fstring;
 use crate::function::{ArgumentList, parse_args, parse_params};
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1 +1 @@
-edition = "2018"
+edition = "2021"
diff --git a/src/lib.rs b/src/lib.rs
@@ -50,7 +50,6 @@ use rustpython_vm::{
     TypeProtocol, VirtualMachine,
 };
 
-use std::convert::TryInto;
 use std::env;
 use std::path::Path;
 use std::process;
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustpython-stdlib"
 version = "0.1.2"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/stdlib/src/array.rs b/stdlib/src/array.rs
@@ -35,7 +35,6 @@ mod array {
     use itertools::Itertools;
     use lexical_core::Integer;
     use std::cmp::Ordering;
-    use std::convert::{TryFrom, TryInto};
     use std::{fmt, os::raw};
 
     macro_rules! def_array_enum {
diff --git a/stdlib/src/bisect.rs b/stdlib/src/bisect.rs
@@ -6,7 +6,6 @@ mod _bisect {
         function::OptionalArg, types::PyComparisonOp::Lt, ItemProtocol, PyObjectRef, PyResult,
         VirtualMachine,
     };
-    use std::convert::TryFrom;
 
     #[derive(FromArgs)]
     struct BisectArgs {
diff --git a/stdlib/src/lib.rs b/stdlib/src/lib.rs
@@ -66,12 +66,12 @@ pub fn get_module_inits() -> StdlibMap {
                 { $( $key:expr => $val:expr),* $(,)? }
             )*
         } => {{
-            let iter = std::array::IntoIter::new([
+            let modules = [
                 $(
                     $(#[cfg($cfg)] (Cow::<'static, str>::from($key), Box::new($val) as StdlibInitFunc),)*
                 )*
-            ]);
-            iter.collect()
+            ];
+            modules.into_iter().collect()
         }};
     }
     modules! {
diff --git a/stdlib/src/socket.rs b/stdlib/src/socket.rs
@@ -24,7 +24,6 @@ mod _socket {
     use crossbeam_utils::atomic::AtomicCell;
     use num_traits::ToPrimitive;
     use socket2::{Domain, Protocol, Socket, Type as SocketType};
-    use std::convert::TryFrom;
     use std::mem::MaybeUninit;
     use std::net::{self, Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr, ToSocketAddrs};
     use std::time::{Duration, Instant};
diff --git a/stdlib/src/ssl.rs b/stdlib/src/ssl.rs
@@ -53,7 +53,6 @@ mod _ssl {
     };
     use openssl_sys as sys;
     use std::{
-        convert::TryFrom,
         ffi::CStr,
         fmt,
         io::{Read, Write},
diff --git a/stdlib/src/termios.rs b/stdlib/src/termios.rs
@@ -7,7 +7,6 @@ mod termios {
         function::IntoPyObject,
         PyObjectRef, PyResult, TryFromObject, VirtualMachine,
     };
-    use std::convert::TryFrom;
     use termios::Termios;
 
     // TODO: more ioctl numbers
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -5,7 +5,7 @@ description = "Rust Python virtual machine."
 authors = ["RustPython Team"]
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 include = ["src/**/*.rs", "Cargo.toml", "build.rs", "Lib/**/*.py"]
 
 [features]
diff --git a/vm/pylib-crate/Cargo.toml b/vm/pylib-crate/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["RustPython Team"]
 description = "A subset of the Python standard library for use with RustPython"
 repository = "https://github.com/RustPython/RustPython"
 license-file = "Lib/PSF-LICENSE"
-edition = "2018"
+edition = "2021"
 include = ["Cargo.toml", "src/**/*.rs", "Lib/", "!Lib/**/test/", "!Lib/**/*.pyc"]
 
 [features]
diff --git a/vm/src/builtins/int.rs b/vm/src/builtins/int.rs
@@ -13,7 +13,6 @@ use bstr::ByteSlice;
 use num_bigint::{BigInt, BigUint, Sign};
 use num_integer::Integer;
 use num_traits::{One, Pow, PrimInt, Signed, ToPrimitive, Zero};
-use std::convert::TryFrom;
 use std::fmt;
 use std::mem::size_of;
 
diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs
@@ -18,7 +18,6 @@ use crate::{
     PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
 };
 use std::fmt;
-use std::iter::FromIterator;
 use std::mem::size_of;
 use std::ops::{DerefMut, Range};
 
diff --git a/vm/src/codecs.rs b/vm/src/codecs.rs
@@ -173,7 +173,8 @@ impl CodecsRegistry {
                 ctx.new_function("surrogateescape_errors", surrogateescape_errors),
             ),
         ];
-        let errors = std::array::IntoIter::new(errors)
+        let errors = errors
+            .into_iter()
             .map(|(name, f)| (name.to_owned(), f.into()))
             .collect();
         let inner = RegistryInner {
diff --git a/vm/src/dictdatatype.rs b/vm/src/dictdatatype.rs
@@ -240,8 +240,8 @@ impl<T: Clone> Dict<T> {
         let hash = key.key_hash(vm)?;
         let _removed = loop {
             let (entry_index, index_index) = self.lookup(vm, &key, hash, None)?;
+            let mut inner = self.write();
             if let IndexEntry::Index(index) = entry_index {
-                let mut inner = self.write();
                 // Update existing key
                 if let Some(entry) = inner.entries.get_mut(index) {
                     let entry = entry
@@ -259,7 +259,6 @@ impl<T: Clone> Dict<T> {
                 }
             } else {
                 // New key:
-                let mut inner = self.write();
                 inner.unchecked_push(index_index, hash, key.into_pyobject(vm), value, entry_index);
                 break None;
             }
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -1878,14 +1878,11 @@ impl ExecutingFrame<'_> {
         self.state.stack[self.state.stack.len() - depth as usize - 1].clone()
     }
 
-    // redox still has an old nightly, and edition 2021 won't be out for a while
-    #[allow(renamed_and_removed_lints)]
-    #[allow(non_fmt_panic)]
     #[cold]
     #[inline(never)]
     fn fatal(&self, msg: &'static str) -> ! {
         dbg!(self);
-        panic!(msg)
+        panic!("{}", msg)
     }
 }
 
diff --git a/vm/src/function.rs b/vm/src/function.rs
@@ -357,7 +357,7 @@ impl<T> KwArgs<T> {
         self.0.remove(name)
     }
 }
-impl<T> std::iter::FromIterator<(String, T)> for KwArgs<T> {
+impl<T> FromIterator<(String, T)> for KwArgs<T> {
     fn from_iter<I: IntoIterator<Item = (String, T)>>(iter: I) -> Self {
         KwArgs(iter.into_iter().collect())
     }
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -1343,7 +1343,6 @@ mod _io {
     }
 
     pub fn get_offset(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<Offset> {
-        use std::convert::TryInto;
         let int = vm.to_index(&obj)?;
         int.as_bigint().try_into().map_err(|_| {
             vm.new_value_error(format!(
@@ -2120,7 +2119,6 @@ mod _io {
         const BYTES_TO_SKIP_OFF: usize = Self::NEED_EOF_OFF + 1;
         const BYTE_LEN: usize = Self::BYTES_TO_SKIP_OFF + 4;
         fn parse(cookie: &num_bigint::BigInt) -> Option<Self> {
-            use std::convert::TryInto;
             let (_, mut buf) = cookie.to_bytes_le();
             if buf.len() > Self::BYTE_LEN {
                 return None;
diff --git a/vm/src/stdlib/mod.rs b/vm/src/stdlib/mod.rs
@@ -66,12 +66,12 @@ pub fn get_module_inits() -> StdlibMap {
                 { $( $key:expr => $val:expr),* $(,)? }
             )*
         } => {{
-            let iter = std::array::IntoIter::new([
+            let modules = [
                 $(
                     $(#[cfg($cfg)] (Cow::<'static, str>::from($key), Box::new($val) as StdlibInitFunc),)*
                 )*
-            ]);
-            iter.collect()
+            ];
+            modules.into_iter().collect()
         }};
     }
     modules! {
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -1584,7 +1584,6 @@ pub(super) mod _os {
     #[cfg(target_os = "linux")]
     #[pyfunction]
     fn copy_file_range(args: CopyFileRangeArgs, vm: &VirtualMachine) -> PyResult<usize> {
-        use std::convert::{TryFrom, TryInto};
         let p_offset_src = args.offset_src.as_ref().map_or_else(std::ptr::null, |x| x);
         let p_offset_dst = args.offset_dst.as_ref().map_or_else(std::ptr::null, |x| x);
         let count: usize = args
diff --git a/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs
@@ -43,9 +43,6 @@ pub mod module {
     use bitflags::bitflags;
     use nix::fcntl;
     use nix::unistd::{self, Gid, Pid, Uid};
-    #[allow(unused_imports)] // TODO: use will be unnecessary in edition 2021
-    use std::convert::TryFrom;
-    use std::convert::TryInto;
     use std::ffi::{CStr, CString};
     use std::os::unix::ffi as ffi_ext;
     use std::os::unix::io::RawFd;
diff --git a/vm/src/stdlib/pwd.rs b/vm/src/stdlib/pwd.rs
@@ -8,7 +8,6 @@ mod pwd {
         PyObjectRef, PyResult, PyStructSequence, VirtualMachine,
     };
     use nix::unistd::{self, User};
-    use std::convert::TryFrom;
     use std::ptr::NonNull;
 
     #[pyattr]
diff --git a/vm/src/stdlib/pystruct.rs b/vm/src/stdlib/pystruct.rs
diff --git a/vm/src/stdlib/winreg.rs b/vm/src/stdlib/winreg.rs
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
