git.delta.rocks / jrsonnet / refs/commits / 6baa18de6571

difftreelog

refactor drop derivative dependency

Yaroslav Bolyukin2024-11-24parent: #a9a2382.patch.diff
in: master

5 files changed

modifiedCargo.lockdiffbeforeafterboth
194 "heck",194 "heck",
195 "proc-macro2",195 "proc-macro2",
196 "quote",196 "quote",
197 "syn 2.0.76",197 "syn",
198]198]
199199
200[[package]]200[[package]]
246 "typenum",246 "typenum",
247]247]
248
249[[package]]
250name = "derivative"
251version = "2.2.0"
252source = "registry+https://github.com/rust-lang/crates.io-index"
253checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
254dependencies = [
255 "proc-macro2",
256 "quote",
257 "syn 1.0.109",
258]
259248
260[[package]]249[[package]]
261name = "difflib"250name = "difflib"
483dependencies = [472dependencies = [
484 "annotate-snippets",473 "annotate-snippets",
485 "anyhow",474 "anyhow",
486 "derivative",
487 "hashbrown 0.14.5",475 "hashbrown 0.14.5",
488 "hi-doc",476 "hi-doc",
489 "jrsonnet-gcmodule",477 "jrsonnet-gcmodule",
533dependencies = [521dependencies = [
534 "proc-macro2",522 "proc-macro2",
535 "quote",523 "quote",
536 "syn 2.0.76",524 "syn",
537]525]
538526
539[[package]]527[[package]]
551dependencies = [539dependencies = [
552 "proc-macro2",540 "proc-macro2",
553 "quote",541 "quote",
554 "syn 2.0.76",542 "syn",
555 "syn-dissect-closure",543 "syn-dissect-closure",
556]544]
557545
694 "proc-macro2",682 "proc-macro2",
695 "quote",683 "quote",
696 "regex-syntax",684 "regex-syntax",
697 "syn 2.0.76",685 "syn",
698]686]
699687
700[[package]]688[[package]]
1019dependencies = [1007dependencies = [
1020 "proc-macro2",1008 "proc-macro2",
1021 "quote",1009 "quote",
1022 "syn 2.0.76",1010 "syn",
1023]1011]
10241012
1025[[package]]1013[[package]]
1121source = "registry+https://github.com/rust-lang/crates.io-index"1109source = "registry+https://github.com/rust-lang/crates.io-index"
1122checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"1110checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
1123
1124[[package]]
1125name = "syn"
1126version = "1.0.109"
1127source = "registry+https://github.com/rust-lang/crates.io-index"
1128checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
1129dependencies = [
1130 "proc-macro2",
1131 "quote",
1132 "unicode-ident",
1133]
11341111
1135[[package]]1112[[package]]
1136name = "syn"1113name = "syn"
1151dependencies = [1128dependencies = [
1152 "proc-macro2",1129 "proc-macro2",
1153 "quote",1130 "quote",
1154 "syn 2.0.76",1131 "syn",
1155]1132]
11561133
1157[[package]]1134[[package]]
1202dependencies = [1179dependencies = [
1203 "proc-macro2",1180 "proc-macro2",
1204 "quote",1181 "quote",
1205 "syn 2.0.76",1182 "syn",
1206]1183]
12071184
1208[[package]]1185[[package]]
1428dependencies = [1405dependencies = [
1429 "proc-macro2",1406 "proc-macro2",
1430 "quote",1407 "quote",
1431 "syn 2.0.76",1408 "syn",
1432]1409]
14331410
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,7 +71,6 @@
 static_assertions = "1.1"
 rustc-hash = "1.1"
 num-bigint = "0.4.5"
-derivative = "2.2.0"
 strsim = "0.11.0"
 proc-macro2 = "1.0"
 quote = "1.0"
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -59,5 +59,4 @@
 hi-doc = { workspace = true, optional = true }
 # Bigint
 num-bigint = { workspace = true, features = ["serde"], optional = true }
-derivative.workspace = true
 stacker = "0.1.15"
modifiedcrates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -1,8 +1,7 @@
 use std::mem::replace;
 
-use jrsonnet_gcmodule::Trace;
 use jrsonnet_interner::IStr;
-use jrsonnet_parser::{LocExpr, ParamsDesc};
+use jrsonnet_parser::ParamsDesc;
 
 use super::{arglike::ArgsLike, builtin::BuiltinParam};
 use crate::{
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -8,7 +8,6 @@
 	rc::Rc,
 };
 
-use derivative::Derivative;
 use jrsonnet_gcmodule::{Cc, Trace};
 use jrsonnet_interner::IStr;
 pub use jrsonnet_macros::Thunk;
@@ -402,8 +401,7 @@
 
 /// Represents jsonnet number
 /// Jsonnet numbers are finite f64, with NaNs disallowed
-#[derive(Trace, Clone, Copy, Derivative)]
-#[derivative(Debug = "transparent")]
+#[derive(Trace, Clone, Copy)]
 #[repr(transparent)]
 pub struct NumValue(f64);
 impl NumValue {
@@ -439,6 +437,11 @@
 		Some(self.cmp(other))
 	}
 }
+impl Debug for NumValue {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		Debug::fmt(&self.0, f)
+	}
+}
 impl Display for NumValue {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		Display::fmt(&self.0, f)