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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -194,7 +194,7 @@
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
 ]
 
 [[package]]
@@ -244,17 +244,6 @@
 dependencies = [
  "generic-array",
  "typenum",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -483,7 +472,6 @@
 dependencies = [
  "annotate-snippets",
  "anyhow",
- "derivative",
  "hashbrown 0.14.5",
  "hi-doc",
  "jrsonnet-gcmodule",
@@ -533,7 +521,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
 ]
 
 [[package]]
@@ -551,7 +539,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
  "syn-dissect-closure",
 ]
 
@@ -694,7 +682,7 @@
  "proc-macro2",
  "quote",
  "regex-syntax",
- "syn 2.0.76",
+ "syn",
 ]
 
 [[package]]
@@ -1019,7 +1007,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
 ]
 
 [[package]]
@@ -1123,17 +1111,6 @@
 
 [[package]]
 name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
 version = "2.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
@@ -1151,7 +1128,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
 ]
 
 [[package]]
@@ -1202,7 +1179,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
 ]
 
 [[package]]
@@ -1428,5 +1405,5 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn",
 ]
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
before · crates/jrsonnet-evaluator/Cargo.toml
1[package]2name = "jrsonnet-evaluator"3description = "jsonnet interpreter"4authors.workspace = true5edition.workspace = true6license.workspace = true7repository.workspace = true8version.workspace = true910[lints]11workspace = true1213[features]14default = ["explaining-traces"]15# Rustc-like trace visualization16explaining-traces = ["annotate-snippets", "hi-doc"]17# Allows library authors to throw custom errors18anyhow-error = ["anyhow"]19# Adds ability to build import closure in async20async-import = []2122# Allows to preserve field order in objects23exp-preserve-order = []24# Implements field destructuring25exp-destruct = ["jrsonnet-parser/exp-destruct"]26# Iteration over objects yields [key, value] elements27exp-object-iteration = []28# Bigint type29exp-bigint = ["num-bigint", "jrsonnet-types/exp-bigint"]30# obj?.field, obj?.['field']31exp-null-coaelse = ["jrsonnet-parser/exp-null-coaelse"]3233# Improves performance, and implements some useful things using nightly-only features34nightly = ["hashbrown/nightly"]3536[dependencies]37jrsonnet-interner.workspace = true38jrsonnet-parser.workspace = true39jrsonnet-types.workspace = true40jrsonnet-macros.workspace = true41jrsonnet-gcmodule.workspace = true4243pathdiff.workspace = true44hashbrown.workspace = true45static_assertions.workspace = true4647rustc-hash.workspace = true4849thiserror.workspace = true50# Friendly errors51strsim.workspace = true5253serde.workspace = true5455anyhow = { workspace = true, optional = true }56# Explaining traces57annotate-snippets = { workspace = true, optional = true }58# Better explaining traces59hi-doc = { workspace = true, optional = true }60# Bigint61num-bigint = { workspace = true, features = ["serde"], optional = true }62derivative.workspace = true63stacker = "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)