From 89f9735ab95899091576144202e9c5d8efb09383 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 9 Jul 2024 10:51:56 +0800
Subject: [PATCH] Update Rust edition to 2021

---
 app/src/main/rust/Cargo.toml                       |  2 +-
 app/src/main/rust/src/lib.rs                       | 10 ----------
 app/src/main/rust/src/{parser/mod.rs => parser.rs} |  0
 app/src/main/rust/src/parser/config.rs             |  2 +-
 app/src/main/rust/src/parser/fav.rs                |  4 ++--
 app/src/main/rust/src/parser/home.rs               |  2 +-
 app/src/main/rust/src/parser/list.rs               | 10 +++++-----
 app/src/main/rust/src/parser/torrent.rs            |  2 +-
 8 files changed, 11 insertions(+), 21 deletions(-)
 rename app/src/main/rust/src/{parser/mod.rs => parser.rs} (100%)

diff --git a/app/src/main/rust/Cargo.toml b/app/src/main/rust/Cargo.toml
index bd0d0bd66..ca8ac1cbc 100644
--- a/app/src/main/rust/Cargo.toml
+++ b/app/src/main/rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ehviewer_rust"
 version = "0.0.0"
-resolver = "2"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/app/src/main/rust/src/lib.rs b/app/src/main/rust/src/lib.rs
index eb2be5e6b..f590a48bc 100644
--- a/app/src/main/rust/src/lib.rs
+++ b/app/src/main/rust/src/lib.rs
@@ -1,15 +1,5 @@
 mod parser;
 
-extern crate android_logger;
-extern crate anyhow;
-extern crate jni;
-extern crate jni_fn;
-extern crate log;
-extern crate quick_xml;
-extern crate regex_lite;
-extern crate serde;
-extern crate tl;
-
 use android_logger::Config;
 use anyhow::{anyhow, ensure, Result};
 use jni::objects::JByteBuffer;
diff --git a/app/src/main/rust/src/parser/mod.rs b/app/src/main/rust/src/parser.rs
similarity index 100%
rename from app/src/main/rust/src/parser/mod.rs
rename to app/src/main/rust/src/parser.rs
diff --git a/app/src/main/rust/src/parser/config.rs b/app/src/main/rust/src/parser/config.rs
index 787a273cb..640c1454f 100644
--- a/app/src/main/rust/src/parser/config.rs
+++ b/app/src/main/rust/src/parser/config.rs
@@ -1,9 +1,9 @@
+use crate::{parse_marshal_inplace, regex};
 use jni::objects::{JByteBuffer, JClass};
 use jni::sys::jint;
 use jni::JNIEnv;
 use jni_fn::jni_fn;
 use quick_xml::escape::unescape;
-use {parse_marshal_inplace, regex};
 
 #[no_mangle]
 #[allow(non_snake_case)]
diff --git a/app/src/main/rust/src/parser/fav.rs b/app/src/main/rust/src/parser/fav.rs
index cfc3298cc..f7f97cf57 100644
--- a/app/src/main/rust/src/parser/fav.rs
+++ b/app/src/main/rust/src/parser/fav.rs
@@ -1,10 +1,10 @@
+use crate::parse_marshal_inplace;
+use crate::parser::list::{parse_info_list, GalleryListResult};
 use anyhow::{bail, Result};
 use jni::objects::{JByteBuffer, JClass};
 use jni::sys::jint;
 use jni::JNIEnv;
 use jni_fn::jni_fn;
-use parse_marshal_inplace;
-use parser::list::{parse_info_list, GalleryListResult};
 use quick_xml::escape::unescape;
 use serde::Serialize;
 use tl::Parser;
diff --git a/app/src/main/rust/src/parser/home.rs b/app/src/main/rust/src/parser/home.rs
index fb2d64827..515fa9624 100644
--- a/app/src/main/rust/src/parser/home.rs
+++ b/app/src/main/rust/src/parser/home.rs
@@ -1,3 +1,4 @@
+use crate::{get_vdom_first_element_by_class_name, parse_marshal_inplace};
 use anyhow::anyhow;
 use jni::objects::{JByteBuffer, JClass};
 use jni::sys::jint;
@@ -6,7 +7,6 @@ use jni_fn::jni_fn;
 use serde::Serialize;
 use tl::Parser;
 use tl::VDom;
-use {get_vdom_first_element_by_class_name, parse_marshal_inplace};
 
 #[allow(non_snake_case)]
 #[derive(Serialize)]
diff --git a/app/src/main/rust/src/parser/list.rs b/app/src/main/rust/src/parser/list.rs
index ec6a8c86b..e57b7d1bf 100644
--- a/app/src/main/rust/src/parser/list.rs
+++ b/app/src/main/rust/src/parser/list.rs
@@ -1,18 +1,18 @@
+use crate::parse_marshal_inplace;
+use crate::{get_element_by_id, get_vdom_first_element_by_class_name};
+use crate::{get_first_element_by_class_name, query_childs_first_match_attr};
+use crate::{get_node_attr, get_node_handle_attr, regex};
+use crate::{EHGT_PREFIX, EX_PREFIX};
 use anyhow::{anyhow, bail, Result};
 use jni::objects::{JByteBuffer, JClass};
 use jni::sys::jint;
 use jni::JNIEnv;
 use jni_fn::jni_fn;
-use parse_marshal_inplace;
 use quick_xml::escape::unescape;
 use serde::Serialize;
 use std::borrow::Cow;
 use std::ops::Index;
 use tl::{Node, Parser, VDom};
-use {get_element_by_id, get_vdom_first_element_by_class_name};
-use {get_first_element_by_class_name, query_childs_first_match_attr};
-use {get_node_attr, get_node_handle_attr, regex};
-use {EHGT_PREFIX, EX_PREFIX};
 
 #[derive(Serialize)]
 #[allow(non_snake_case)]
diff --git a/app/src/main/rust/src/parser/torrent.rs b/app/src/main/rust/src/parser/torrent.rs
index f3520086e..a82fbb5cb 100644
--- a/app/src/main/rust/src/parser/torrent.rs
+++ b/app/src/main/rust/src/parser/torrent.rs
@@ -1,3 +1,4 @@
+use crate::{parse_marshal_inplace, regex};
 use anyhow::{anyhow, Result};
 use jni::objects::{JByteBuffer, JClass};
 use jni::sys::jint;
@@ -6,7 +7,6 @@ use jni_fn::jni_fn;
 use quick_xml::escape::unescape;
 use serde::Serialize;
 use tl::{Parser, VDom};
-use {parse_marshal_inplace, regex};
 
 #[derive(Serialize)]
 struct Torrent {