merge dev, use multicore in cli

.circleci/config.yml

@@ -42,9 +42,9 @@ jobs:
       - restore_cache:
           keys:
             - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
-      # - run:
-      #     name: Check format
-      #     command: rustup component add rustfmt; cargo fmt --all -- --check
+      - run:
+          name: Check format
+          command: rustup component add rustfmt; cargo fmt --all -- --check
       - run:
           name: Install libsnark prerequisites
           command: ./scripts/install_libsnark_prerequisites.sh

zokrates_cli/Cargo.toml

@@ -15,7 +15,7 @@ bincode = "0.8.0"
 regex = "0.2"
 zokrates_field = { version = "0.3", path = "../zokrates_field" }
 zokrates_abi = { version = "0.1", path = "../zokrates_abi" }
-zokrates_core = { version = "0.4", path = "../zokrates_core" }
+zokrates_core = { version = "0.4", path = "../zokrates_core", features = ["multicore"] }
 zokrates_fs_resolver = { version = "0.4", path = "../zokrates_fs_resolver"}
 serde_json = "1.0"
 

zokrates_github_resolver/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "zokrates_github_resolver"
-version = "0.1.1"
-authors = ["Evgenii P. <eupn@protonmail.com>", "schaeff <thibaut@schaeff.fr>"]
-repository = "https://github.com/eupn/ZoKrates.git"
-edition = "2018"
-
-[features]
-default = []
-
-[dependencies]
-reqwest = "0.9"
-tempfile = "3"
-
-[dev-dependencies]
-mockito = "0.17"
-
-[lib]

zokrates_parser/src/zokrates.pest

@@ -119,8 +119,6 @@ WHITESPACE = _{ " " | "\t" | "\\" ~ NEWLINE}
 COMMENT = _{ ("/*" ~ (!"*/" ~ ANY)* ~ "*/") | ("//" ~ (!NEWLINE ~ ANY)*) }
 
 // TODO: Order by alphabet
-keyword = @{"for" | "endfor" | "as" | "in" | "return" | "byte" | "field" | "bool" | "if" | "do" | "else" | "export" | "false" |
-            "def" | "for" | "import" | "uint" |
-            "in" | "public" | "private" | "return" |
-            "struct" | "true"
-            }
+keyword = @{"as"|"bool"|"byte"|"def"|"do"|"else"|"endfor"|"export"|"false"|"field"|"for"|"if"|"import"|
+            "in"|"private"|"public"|"return"|"struct"|"true"|"uint"
+            }