Migrate to 2021 edition

coolreader18 · coolreader18 · commit ee8b11f5d205 · 2021-10-21T11:46:24.000-05:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 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/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/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/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/rustfmt.toml b/rustfmt.toml
@@ -1 +1 @@
-edition = "2018"
+edition = "2021"
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/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/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/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["RustPython Team"]
 license = "MIT"
 description = "A Python-3 (CPython >= 3.5.0) Interpreter written in Rust, compiled to WASM"
 repository = "https://github.com/RustPython/RustPython/tree/main/wasm/lib"
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

Original file line number	Diff line number	Diff line change
`@@ -185,17 +185,17 @@ fn generate_field((i, field): (usize, &Field)) -> Result<TokenStream> {`
`185`	`185`	`let file_output = match attr.kind {`
`186`	`186`	`ParameterKind::PositionalOnly => {`
`187`	`187`	`quote! {`
`188`		`- #fieldname: args.take_positional()#middle#ending,`
	`188`	`+ #fieldname: args.take_positional()#middle #ending,`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`ParameterKind::PositionalOrKeyword => {`
`192`	`192`	`quote! {`
`193`		`- #fieldname: args.take_positional_keyword(#pyname)#middle#ending,`
	`193`	`+ #fieldname: args.take_positional_keyword(#pyname)#middle #ending,`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`ParameterKind::KeywordOnly => {`
`197`	`197`	`quote! {`
`198`		`- #fieldname: args.take_keyword(#pyname)#middle#ending,`
	`198`	`+ #fieldname: args.take_keyword(#pyname)#middle #ending,`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`ParameterKind::Flatten => unreachable!(),`