git.delta.rocks / jrsonnet / refs/commits / ed4ee4dbae32

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -426,18 +426,18 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.32"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
@@ -522,9 +522,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.82"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
  "proc-macro2",
  "quote",

--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -9,7 +9,7 @@
 [features]
 default = ["serialized-stdlib", "explaining-traces"]
 # Serializes standard library AST instead of parsing them every run
-serialized-stdlib = ["bincode", "jrsonnet-parser/deserialize"]
+serialized-stdlib = ["bincode", "jrsonnet-parser/serde"]
 # Rustc-like trace visualization
 explaining-traces = ["annotate-snippets"]
 # Allows library authors to throw custom errors
@@ -21,11 +21,11 @@
 jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" }
 jrsonnet-types = { path = "../jrsonnet-types", version = "0.4.2" }
 jrsonnet-macros = { path = "../jrsonnet-macros", version = "0.4.2" }
-pathdiff = "0.2.0"
+pathdiff = "0.2.1"
 
 md5 = "0.7.0"
 base64 = "0.13.0"
-rustc-hash = "1.1.0"
+rustc-hash = "1.1"
 
 thiserror = "1.0"
 gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" }
@@ -40,7 +40,7 @@
 
 # Serialized stdlib
 [dependencies.bincode]
-version = "1.3.1"
+version = "1.3"
 optional = true
 
 # Explaining traces
@@ -50,10 +50,7 @@
 optional = true
 
 [build-dependencies]
-jrsonnet-parser = { path = "../jrsonnet-parser", features = [
-    "serialize",
-    "deserialize",
-], version = "0.4.2" }
 jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" }
+jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }
 serde = "1.0"
-bincode = "1.3.1"
+bincode = "1.3"

--- a/crates/jrsonnet-interner/Cargo.toml
+++ b/crates/jrsonnet-interner/Cargo.toml
@@ -8,5 +8,5 @@
 
 [dependencies]
 serde = { version = "1.0" }
-rustc-hash = "1.1.0"
+rustc-hash = "1.1"
 gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" }

--- a/crates/jrsonnet-macros/Cargo.toml
+++ b/crates/jrsonnet-macros/Cargo.toml
@@ -7,6 +7,6 @@
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.32"
-quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full"] }
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full"] }

--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -6,11 +6,6 @@
 license = "MIT"
 edition = "2021"
 
-[features]
-default = []
-serialize = ["serde"]
-deserialize = ["serde"]
-
 [dependencies]
 jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
 

1use gcmodule::Trace;1use gcmodule::Trace;
2use jrsonnet_interner::IStr;2use jrsonnet_interner::IStr;
3#[cfg(feature = "deserialize")]
4use serde::Deserialize;
5#[cfg(feature = "serialize")]3#[cfg(feature = "serde")]
6use serde::Serialize;4use serde::{Deserialize, Serialize};
7use std::{5use std::{
8	fmt::{Debug, Display},6	fmt::{Debug, Display},
9	ops::Deref,7	ops::Deref,
10	path::{Path, PathBuf},8	path::{Path, PathBuf},
11	rc::Rc,9	rc::Rc,
12};10};
1311
14#[cfg_attr(feature = "serialize", derive(Serialize))]12#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
15#[cfg_attr(feature = "deserialize", derive(Deserialize))]
16#[derive(Debug, PartialEq, Trace)]13#[derive(Debug, PartialEq, Trace)]
17pub enum FieldName {14pub enum FieldName {
18	/// {fixed: 2}15	/// {fixed: 2}
21	Dyn(LocExpr),18	Dyn(LocExpr),
22}19}
2320
24#[cfg_attr(feature = "serialize", derive(Serialize))]21#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
25#[cfg_attr(feature = "deserialize", derive(Deserialize))]
26#[derive(Debug, Clone, Copy, PartialEq, Trace)]22#[derive(Debug, Clone, Copy, PartialEq, Trace)]
27pub enum Visibility {23pub enum Visibility {
28	/// :24	/// :
39	}35	}
40}36}
4137
42#[cfg_attr(feature = "serialize", derive(Serialize))]38#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
43#[cfg_attr(feature = "deserialize", derive(Deserialize))]
44#[derive(Clone, Debug, PartialEq, Trace)]39#[derive(Clone, Debug, PartialEq, Trace)]
45pub struct AssertStmt(pub LocExpr, pub Option<LocExpr>);40pub struct AssertStmt(pub LocExpr, pub Option<LocExpr>);
4641
47#[cfg_attr(feature = "serialize", derive(Serialize))]42#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
48#[cfg_attr(feature = "deserialize", derive(Deserialize))]
49#[derive(Debug, PartialEq, Trace)]43#[derive(Debug, PartialEq, Trace)]
50pub struct FieldMember {44pub struct FieldMember {
51	pub name: FieldName,45	pub name: FieldName,
55	pub value: LocExpr,49	pub value: LocExpr,
56}50}
5751
58#[cfg_attr(feature = "serialize", derive(Serialize))]52#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
59#[cfg_attr(feature = "deserialize", derive(Deserialize))]
60#[derive(Debug, PartialEq, Trace)]53#[derive(Debug, PartialEq, Trace)]
61pub enum Member {54pub enum Member {
62	Field(FieldMember),55	Field(FieldMember),
63	BindStmt(BindSpec),56	BindStmt(BindSpec),
64	AssertStmt(AssertStmt),57	AssertStmt(AssertStmt),
65}58}
6659
67#[cfg_attr(feature = "serialize", derive(Serialize))]60#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
68#[cfg_attr(feature = "deserialize", derive(Deserialize))]
69#[derive(Debug, Clone, Copy, PartialEq, Trace)]61#[derive(Debug, Clone, Copy, PartialEq, Trace)]
70pub enum UnaryOpType {62pub enum UnaryOpType {
71	Plus,63	Plus,
90	}82	}
91}83}
9284
93#[cfg_attr(feature = "serialize", derive(Serialize))]85#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
94#[cfg_attr(feature = "deserialize", derive(Deserialize))]
95#[derive(Debug, Clone, Copy, PartialEq, Trace)]86#[derive(Debug, Clone, Copy, PartialEq, Trace)]
96pub enum BinaryOpType {87pub enum BinaryOpType {
97	Mul,88	Mul,
157}148}
158149
159/// name, default value150/// name, default value
160#[cfg_attr(feature = "serialize", derive(Serialize))]151#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
161#[cfg_attr(feature = "deserialize", derive(Deserialize))]
162#[derive(Debug, PartialEq, Trace)]152#[derive(Debug, PartialEq, Trace)]
163pub struct Param(pub IStr, pub Option<LocExpr>);153pub struct Param(pub IStr, pub Option<LocExpr>);
164154
165/// Defined function parameters155/// Defined function parameters
166#[cfg_attr(feature = "serialize", derive(Serialize))]156#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
167#[cfg_attr(feature = "deserialize", derive(Deserialize))]
168#[derive(Debug, Clone, PartialEq, Trace)]157#[derive(Debug, Clone, PartialEq, Trace)]
169pub struct ParamsDesc(pub Rc<Vec<Param>>);158pub struct ParamsDesc(pub Rc<Vec<Param>>);
170159
175	}164	}
176}165}
177166
178#[cfg_attr(feature = "serialize", derive(Serialize))]167#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
179#[cfg_attr(feature = "deserialize", derive(Deserialize))]
180#[derive(Debug, PartialEq, Trace)]168#[derive(Debug, PartialEq, Trace)]
181pub struct ArgsDesc {169pub struct ArgsDesc {
182	pub unnamed: Vec<LocExpr>,170	pub unnamed: Vec<LocExpr>,
188	}176	}
189}177}
190178
191#[cfg_attr(feature = "serialize", derive(Serialize))]179#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
192#[cfg_attr(feature = "deserialize", derive(Deserialize))]
193#[derive(Debug, Clone, PartialEq, Trace)]180#[derive(Debug, Clone, PartialEq, Trace)]
194pub struct BindSpec {181pub struct BindSpec {
195	pub name: IStr,182	pub name: IStr,
196	pub params: Option<ParamsDesc>,183	pub params: Option<ParamsDesc>,
197	pub value: LocExpr,184	pub value: LocExpr,
198}185}
199186
200#[cfg_attr(feature = "serialize", derive(Serialize))]187#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
201#[cfg_attr(feature = "deserialize", derive(Deserialize))]
202#[derive(Debug, PartialEq, Trace)]188#[derive(Debug, PartialEq, Trace)]
203pub struct IfSpecData(pub LocExpr);189pub struct IfSpecData(pub LocExpr);
204190
205#[cfg_attr(feature = "serialize", derive(Serialize))]191#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
206#[cfg_attr(feature = "deserialize", derive(Deserialize))]
207#[derive(Debug, PartialEq, Trace)]192#[derive(Debug, PartialEq, Trace)]
208pub struct ForSpecData(pub IStr, pub LocExpr);193pub struct ForSpecData(pub IStr, pub LocExpr);
209194
210#[cfg_attr(feature = "serialize", derive(Serialize))]195#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
211#[cfg_attr(feature = "deserialize", derive(Deserialize))]
212#[derive(Debug, PartialEq, Trace)]196#[derive(Debug, PartialEq, Trace)]
213pub enum CompSpec {197pub enum CompSpec {
214	IfSpec(IfSpecData),198	IfSpec(IfSpecData),
215	ForSpec(ForSpecData),199	ForSpec(ForSpecData),
216}200}
217201
218#[cfg_attr(feature = "serialize", derive(Serialize))]202#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
219#[cfg_attr(feature = "deserialize", derive(Deserialize))]
220#[derive(Debug, PartialEq, Trace)]203#[derive(Debug, PartialEq, Trace)]
221pub struct ObjComp {204pub struct ObjComp {
222	pub pre_locals: Vec<BindSpec>,205	pub pre_locals: Vec<BindSpec>,
227	pub compspecs: Vec<CompSpec>,210	pub compspecs: Vec<CompSpec>,
228}211}
229212
230#[cfg_attr(feature = "serialize", derive(Serialize))]213#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
231#[cfg_attr(feature = "deserialize", derive(Deserialize))]
232#[derive(Debug, PartialEq, Trace)]214#[derive(Debug, PartialEq, Trace)]
233pub enum ObjBody {215pub enum ObjBody {
234	MemberList(Vec<Member>),216	MemberList(Vec<Member>),
235	ObjComp(ObjComp),217	ObjComp(ObjComp),
236}218}
237219
238#[cfg_attr(feature = "serialize", derive(Serialize))]220#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
239#[cfg_attr(feature = "deserialize", derive(Deserialize))]
240#[derive(Debug, PartialEq, Clone, Copy, Trace)]221#[derive(Debug, PartialEq, Clone, Copy, Trace)]
241pub enum LiteralType {222pub enum LiteralType {
242	This,223	This,
247	False,228	False,
248}229}
249230
250#[cfg_attr(feature = "serialize", derive(Serialize))]231#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
251#[cfg_attr(feature = "deserialize", derive(Deserialize))]
252#[derive(Debug, PartialEq, Trace)]232#[derive(Debug, PartialEq, Trace)]
253pub struct SliceDesc {233pub struct SliceDesc {
254	pub start: Option<LocExpr>,234	pub start: Option<LocExpr>,
257}237}
258238
259/// Syntax base239/// Syntax base
260#[cfg_attr(feature = "serialize", derive(Serialize))]240#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
261#[cfg_attr(feature = "deserialize", derive(Deserialize))]
262#[derive(Debug, PartialEq, Trace)]241#[derive(Debug, PartialEq, Trace)]
263pub enum Expr {242pub enum Expr {
264	Literal(LiteralType),243	Literal(LiteralType),
326}305}
327306
328/// file, begin offset, end offset307/// file, begin offset, end offset
329#[cfg_attr(feature = "serialize", derive(Serialize))]308#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
330#[cfg_attr(feature = "deserialize", derive(Deserialize))]
331#[derive(Clone, PartialEq, Trace)]309#[derive(Clone, PartialEq, Trace)]
332#[skip_trace]310#[skip_trace]
333pub struct ExprLocation(pub Rc<Path>, pub usize, pub usize);311pub struct ExprLocation(pub Rc<Path>, pub usize, pub usize);
344}322}
345323
346/// Holds AST expression and its location in source file324/// Holds AST expression and its location in source file
347#[cfg_attr(feature = "serialize", derive(Serialize))]325#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
348#[cfg_attr(feature = "deserialize", derive(Deserialize))]
349#[derive(Clone, PartialEq, Trace)]326#[derive(Clone, PartialEq, Trace)]
350pub struct LocExpr(pub Rc<Expr>, pub ExprLocation);327pub struct LocExpr(pub Rc<Expr>, pub ExprLocation);
351328