pull upstream changes

.circleci/config.yml

@@ -46,7 +46,7 @@ commands:
 jobs:
   check-style:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - checkout
@@ -61,7 +61,7 @@ jobs:
 
   clippy:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - checkout
@@ -76,7 +76,7 @@ jobs:
           
   # code-cov:
   #   docker:
-  #     - image: cimg/rust:1.54.0
+  #     - image: cimg/rust:1.56.1
   #   resource_class: xlarge
   #   environment:
   #     RUSTC_BOOTSTRAP: 1
@@ -118,7 +118,7 @@ jobs:
 
   leo-executable:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - checkout
@@ -136,7 +136,7 @@ jobs:
 
   leo-new:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -149,7 +149,7 @@ jobs:
 
   leo-init:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -162,7 +162,7 @@ jobs:
 
   leo-clean:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -175,7 +175,7 @@ jobs:
 
   leo-setup:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -188,7 +188,7 @@ jobs:
 
   # leo-add-remove:
   #   docker:
-  #     - image: cimg/rust:1.54.0
+  #     - image: cimg/rust:1.56.1
   #   resource_class: xlarge
   #   steps:
   #     - attach_workspace:
@@ -199,22 +199,23 @@ jobs:
   #           export LEO=/home/circleci/project/project/bin/leo
   #           ./project/.circleci/leo-add-remove.sh
 
-  leo-check-constraints:
-    docker:
-      - image: cimg/rust:1.54.0
-    resource_class: xlarge
-    steps:
-      - attach_workspace:
-          at: /home/circleci/project/
-      - run:
-          name: leo check constraints for Pedersen Hash
-          command: |
-            export LEO=/home/circleci/project/project/bin/leo
-            ./project/.circleci/leo-check-constraints.sh
+# todo (collin): uncomment after compiler refactor
+#  leo-check-constraints:
+#    docker:
+#       - image: cimg/rust:1.56.1
+#    resource_class: xlarge
+#    steps:
+#      - attach_workspace:
+#          at: /home/circleci/project/
+#      - run:
+#          name: leo check constraints for Pedersen Hash
+#          command: |
+#            export LEO=/home/circleci/project/project/bin/leo
+#            ./project/.circleci/leo-check-constraints.sh
 
   leo-login-logout:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -227,7 +228,7 @@ jobs:
 
   leo-clone:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -240,7 +241,7 @@ jobs:
 
   leo-publish:
     docker:
-      - image: cimg/rust:1.54.0
+      - image: cimg/rust:1.56.1
     resource_class: xlarge
     steps:
       - attach_workspace:
@@ -270,12 +271,12 @@ workflows:
       - leo-setup:
           requires:
             - leo-executable
-      # - leo-add-remove:
-      #     requires:
-      #       - leo-executable
-      - leo-check-constraints:
-          requires:
-            - leo-executable
+#       - leo-add-remove:
+#           requires:
+#             - leo-executable
+#      - leo-check-constraints:
+#          requires:
+#            - leo-executable
       - leo-login-logout:
           requires:
             - leo-executable

.github/workflows/ci.yml

@@ -236,7 +236,7 @@ jobs:
         
       - name: Stop sccache server
         run: sccache --stop-server || true
-  
+
   codecov:
     name: Code Coverage
     runs-on: ubuntu-latest
@@ -328,4 +328,4 @@ jobs:
         run: sccache --show-stats
         
       - name: Stop sccache server
-        run: sccache --stop-server || true
+        run: sccache --stop-server || true

.github/workflows/wasm.yml

@@ -37,6 +37,3 @@ jobs:
         run: wasm-pack build --dev --target nodejs
       - name: Install dependencies and run tests
         run: cd tests && npm ci && npm test
-      
-
-  

.rusty-hook.toml

@@ -1,5 +1,5 @@
 [hooks]
-# pre-commit = "cargo clippy && cargo fmt --all -- --check"
+# pre-commit = "cargo clippy && cargo +nightly fmt --all -- --check"
 # temp disable for this branch
 [logging]
 verbose = true

span/src/symbol.rs

@@ -29,7 +29,7 @@ use std::intrinsics::transmute;
 use std::marker::PhantomData;
 
 /// A helper for `symbols` defined below.
-/// The macro's job is to bind conventiently usable `const` items to the symbol names provided.
+/// The macro's job is to bind conveniently  usable `const` items to the symbol names provided.
 /// For example, with `symbol { a, b }` you'd have `sym::a` and `sym::b`.
 macro_rules! consts {
     ($val: expr, $sym:ident $(,)?) => {