Remove derive_more dep

coolreader18 · coolreader18 · commit 4de16f695567 · 2021-07-31T10:49:39.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -19,6 +19,5 @@ cfg-if = "1.0"
 once_cell = "1.4.1"
 siphasher = "0.3"
 rand = "0.8"
-derive_more = "0.99.9"
 volatile = "0.3"
 radium = "0.6"
diff --git a/common/src/borrow.rs b/common/src/borrow.rs
@@ -4,14 +4,33 @@ use crate::lock::{
 };
 use std::ops::{Deref, DerefMut};
 
-#[derive(Debug, derive_more::From)]
+macro_rules! impl_from {
+    ($lt:lifetime, $gen:ident, $t:ty, $($var:ident($from:ty),)*) => {
+        $(
+            impl<$lt, $gen: ?Sized> From<$from> for $t {
+                fn from(t: $from) -> Self {
+                    Self::$var(t)
+                }
+            }
+        )*
+    };
+}
+
+#[derive(Debug)]
 pub enum BorrowedValue<'a, T: ?Sized> {
     Ref(&'a T),
     MuLock(PyMutexGuard<'a, T>),
     MappedMuLock(PyImmutableMappedMutexGuard<'a, T>),
     ReadLock(PyRwLockReadGuard<'a, T>),
     MappedReadLock(PyMappedRwLockReadGuard<'a, T>),
 }
+impl_from!('a, T, BorrowedValue<'a, T>,
+    Ref(&'a T),
+    MuLock(PyMutexGuard<'a, T>),
+    MappedMuLock(PyImmutableMappedMutexGuard<'a, T>),
+    ReadLock(PyRwLockReadGuard<'a, T>),
+    MappedReadLock(PyMappedRwLockReadGuard<'a, T>),
+);
 
 impl<'a, T: ?Sized> BorrowedValue<'a, T> {
     pub fn map<U: ?Sized, F>(s: Self, f: F) -> BorrowedValue<'a, U>
@@ -45,14 +64,21 @@ impl<T: ?Sized> Deref for BorrowedValue<'_, T> {
     }
 }
 
-#[derive(Debug, derive_more::From)]
+#[derive(Debug)]
 pub enum BorrowedValueMut<'a, T: ?Sized> {
     RefMut(&'a mut T),
     MuLock(PyMutexGuard<'a, T>),
     MappedMuLock(PyMappedMutexGuard<'a, T>),
     WriteLock(PyRwLockWriteGuard<'a, T>),
     MappedWriteLock(PyMappedRwLockWriteGuard<'a, T>),
 }
+impl_from!('a, T, BorrowedValueMut<'a, T>,
+    RefMut(&'a mut T),
+    MuLock(PyMutexGuard<'a, T>),
+    MappedMuLock(PyMappedMutexGuard<'a, T>),
+    WriteLock(PyRwLockWriteGuard<'a, T>),
+    MappedWriteLock(PyMappedRwLockWriteGuard<'a, T>),
+);
 
 impl<'a, T: ?Sized> BorrowedValueMut<'a, T> {
     pub fn map<U: ?Sized, F>(s: Self, f: F) -> BorrowedValueMut<'a, U>
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -54,7 +54,6 @@ rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
 rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" }
 rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" }
 serde = { version = "1.0.66", features = ["derive"] }
-rustc_version_runtime = "0.2.0"
 puruspe = "0.1"
 caseless = "0.2.1"
 chrono = { version = "0.4", features = ["wasmbind"] }
@@ -159,3 +158,4 @@ wasm-bindgen = "0.2"
 
 [build-dependencies]
 itertools = "0.10.0"
+rustc_version = "0.4"
diff --git a/vm/build.rs b/vm/build.rs
@@ -12,6 +12,10 @@ fn main() {
     );
     println!("cargo:rustc-env=RUSTPYTHON_GIT_TAG={}", git_tag());
     println!("cargo:rustc-env=RUSTPYTHON_GIT_BRANCH={}", git_branch());
+    println!(
+        "cargo:rustc-env=RUSTC_VERSION={}",
+        rustc_version::version().unwrap()
+    );
 
     println!(
         "cargo:rustc-env=RUSTPYTHON_TARGET_TRIPLE={}",
diff --git a/vm/src/version.rs b/vm/src/version.rs
@@ -59,8 +59,7 @@ pub fn get_version_number() -> String {
 }
 
 pub fn get_compiler() -> String {
-    let rustc_version = rustc_version_runtime::version_meta();
-    format!("rustc {}", rustc_version.semver)
+    format!("rustc {}", env!("RUSTC_VERSION"))
 }
 
 pub fn get_build_info() -> String {

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ pub fn get_version_number() -> String {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`pub fn get_compiler() -> String {`
`62`		`- let rustc_version = rustc_version_runtime::version_meta();`
`63`		`- format!("rustc {}", rustc_version.semver)`
	`62`	`+ format!("rustc {}", env!("RUSTC_VERSION"))`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`pub fn get_build_info() -> String {`