]> Repositorios git - scryer-prolog.git/commitdiff
Merge branch 'master' into library-use-case
authorNicolas Luck <[email protected]>
Fri, 26 Jan 2024 16:21:47 +0000 (17:21 +0100)
committerNicolas Luck <[email protected]>
Fri, 26 Jan 2024 16:21:47 +0000 (17:21 +0100)
1  2 
Cargo.lock
Cargo.toml
src/machine/lib_machine.rs

diff --cc Cargo.lock
Simple merge
diff --cc Cargo.toml
index 2b4f103b757b8cbc1b6029bfe935647f000ea118,3e06970e00b2da86a58a3446834aa209a434b6ab..62fab35f74c81090f4970427e2a222414f135907
@@@ -71,10 -71,8 +71,11 @@@ bytes = "1
  dashu = "0.4.0"
  num-order = { version = "1.2.0" }
  rand = "0.8.5"
+ ring = { version = "0.17.5", features = ["wasm32_unknown_unknown_js"] }
  
 +serde_json = "1.0.95"
 +serde = "1.0.159"
 +
  [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
  libffi = { version = "3.2.0", optional = true }
  hostname = { version = "0.3.1", optional = true }
Simple merge