use 2021 edition (#3)

tyrchen · Oct 22, 2021 · 8157b44 · 8157b44
1 parent 9ab70c1
commit 8157b44
Show file tree

Hide file tree

Showing 36 changed files with 29 additions and 38 deletions.
diff --git a/01_stack_heap/Cargo.toml b/01_stack_heap/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stack_heap"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "error"

diff --git a/02_concepts/Cargo.toml b/02_concepts/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "concepts"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "shape"

diff --git a/03_grammar/concepts/Cargo.toml b/03_grammar/concepts/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "concepts"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "event"

diff --git a/03_grammar/scrape_url/Cargo.toml b/03_grammar/scrape_url/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "scrape_url"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/03_grammar/scrape_url_args/Cargo.toml b/03_grammar/scrape_url_args/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "scrape_url_args"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/03_grammar/scrape_url_with_error_handling/Cargo.toml b/03_grammar/scrape_url_with_error_handling/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "scrape_url_with_error_handling"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/04_httpie/Cargo.toml b/04_httpie/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "httpie"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/05_thumbor/Cargo.toml b/05_thumbor/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "thumbor"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "server1"

diff --git a/05_thumbor/src/engine/photon.rs b/05_thumbor/src/engine/photon.rs
@@ -7,7 +7,6 @@ use lazy_static::lazy_static;
 use photon_rs::{
     effects, filters, multiple, native::open_image_from_bytes, transform, PhotonImage,
 };
-use std::convert::TryFrom;
 
 lazy_static! {
     // 预先把水印文件加载为静态变量

diff --git a/05_thumbor/src/main.rs b/05_thumbor/src/main.rs
@@ -12,7 +12,6 @@ use percent_encoding::{percent_decode_str, percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;
 use std::{
     collections::hash_map::DefaultHasher,
-    convert::TryInto,
     hash::{Hash, Hasher},
     sync::Arc,
     time::Duration,

diff --git a/05_thumbor/src/pb/mod.rs b/05_thumbor/src/pb/mod.rs
@@ -1,7 +1,6 @@
 use base64::{decode_config, encode_config, URL_SAFE_NO_PAD};
 use photon_rs::transform::SamplingFilter;
 use prost::Message;
-use std::convert::TryFrom;
 
 mod abi; // 声明 abi.rs
 pub use abi::*;
@@ -99,7 +98,6 @@ impl Spec {
 mod tests {
     use super::*;
     use std::borrow::Borrow;
-    use std::convert::TryInto;
 
     #[test]
     fn encoded_spec_could_be_decoded() {

diff --git a/05_thumbor/src/server1.rs b/05_thumbor/src/server1.rs
@@ -1,7 +1,6 @@
 use axum::{extract::Path, handler::get, http::StatusCode, Router};
 use percent_encoding::percent_decode_str;
 use serde::Deserialize;
-use std::convert::TryInto;
 
 mod pb;
 

diff --git a/05_thumbor/src/server2.rs b/05_thumbor/src/server2.rs
@@ -11,7 +11,6 @@ use percent_encoding::{percent_decode_str, percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;
 use std::{
     collections::hash_map::DefaultHasher,
-    convert::TryInto,
     hash::{Hash, Hasher},
     sync::Arc,
 };

diff --git a/06_queryer/data-viewer/src-tauri/Cargo.toml b/06_queryer/data-viewer/src-tauri/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["you"]
 license = ""
 repository = ""
 default-run = "app"
-edition = "2018"
+edition = "2021"
 build = "src/build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/06_queryer/data-viewer/src-tauri/rustfmt.toml b/06_queryer/data-viewer/src-tauri/rustfmt.toml
@@ -6,7 +6,7 @@ use_small_heuristics = "Default"
 reorder_imports = true
 reorder_modules = true
 remove_nested_parens = true
-edition = "2018"
+edition = "2021"
 merge_derives = true
 use_try_shorthand = false
 use_field_init_shorthand = false

diff --git a/06_queryer/queryer-js/Cargo.toml b/06_queryer/queryer-js/Cargo.toml
@@ -2,7 +2,7 @@
 name = "queryer-js"
 version = "0.1.0"
 license = "ISC"
-edition = "2018"
+edition = "2021"
 exclude = ["index.node"]
 
 [lib]

diff --git a/06_queryer/queryer-py/Cargo.toml b/06_queryer/queryer-py/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "queryer_py" # Python 模块需要用下划线
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 
 [lib]

diff --git a/06_queryer/queryer/Cargo.toml b/06_queryer/queryer/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "queryer"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[example]]
 name = "dialect"

diff --git a/06_queryer/queryer/src/convert.rs b/06_queryer/queryer/src/convert.rs
@@ -4,7 +4,6 @@ use sqlparser::ast::{
     BinaryOperator as SqlBinaryOperator, Expr as SqlExpr, Offset as SqlOffset, OrderByExpr, Select,
     SelectItem, SetExpr, Statement, TableFactor, TableWithJoins, Value as SqlValue,
 };
-use std::convert::{TryFrom, TryInto};
 
 /// 解析出来的 SQL
 pub struct Sql<'a> {
@@ -232,7 +231,6 @@ mod tests {
     use super::*;
     use crate::TyrDialect;
     use sqlparser::parser::Parser;
-    use std::convert::TryInto;
 
     #[test]
     fn parse_sql_works() {

diff --git a/06_queryer/queryer/src/lib.rs b/06_queryer/queryer/src/lib.rs
@@ -1,7 +1,6 @@
 use anyhow::{anyhow, Result};
 use polars::prelude::*;
 use sqlparser::parser::Parser;
-use std::convert::TryInto;
 use std::ops::{Deref, DerefMut};
 use tracing::info;
 

diff --git a/07_ownership/Cargo.toml b/07_ownership/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ownership"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "ownership1"

diff --git a/08_borrow/Cargo.toml b/08_borrow/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "borrow"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "ownership_reference"

diff --git a/09_multi_owner/Cargo.toml b/09_multi_owner/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "multi_owner"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "dag"

diff --git a/10_lifetime/Cargo.toml b/10_lifetime/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "lifetime"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # 如果尝试编译 lifetime 会因为生命周期出错
 # [[bin]]

diff --git a/11_memory/Cargo.toml b/11_memory/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "memory"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/12_type_system/Cargo.toml b/12_type_system/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "type_system"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "constant"

diff --git a/13_traits/Cargo.toml b/13_traits/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "traits"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "write"

diff --git a/14_sys_traits/Cargo.toml b/14_sys_traits/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sys_traits"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "dev"

diff --git a/15_smart_pointers/Cargo.toml b/15_smart_pointers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "smart_pointers"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "box"

diff --git a/16_data_structure/Cargo.toml b/16_data_structure/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "data-structure"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "type_name"

diff --git a/17_hash_table/Cargo.toml b/17_hash_table/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hashtable"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "hashmap1"

diff --git a/19_closure/Cargo.toml b/19_closure/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "closure"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/21_kv/Cargo.toml b/21_kv/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "kv"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bytes = "1" # 高效处理网络 buffer 的库

diff --git a/23_advanced_generics/Cargo.toml b/23_advanced_generics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "advanced_generics"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/24_advanced_trait_objects/Cargo.toml b/24_advanced_trait_objects/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "advanced_trait_objects"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/mid_term_rgrep/Cargo.toml b/mid_term_rgrep/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rgrep"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html