Skip to content

Commit

Permalink
Remove forked bitvec (scroll-tech#745)
Browse files Browse the repository at this point in the history
The compliation error comming from the funty dependency of bitvec isn't
happening anymore, so we remove the patched dependency to the forked
bitvec.

Resolve privacy-scaling-explorations#163
  • Loading branch information
ed255 authored Sep 7, 2022
1 parent 3e400dc commit 8ca6a7d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
13 changes: 7 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ members = [
]

[patch.crates-io]
# This fork makes bitvec 0.20.x work with funty 1.1 and funty 1.2. Without
# this fork, bitvec 0.20.x is incompatible with funty 1.2, which we depend on,
# and leads to a compilation error. This can be removed once the upstream PR
# is resolved: https://github.com/bitvecto-rs/bitvec/pull/141
bitvec = { git = "https://github.com/ed255/bitvec.git", rev = "5cfc5fa8496c66872d21905e677120fc3e79693c" }
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" }

# Definition of benchmarks profile to use.
Expand Down

0 comments on commit 8ca6a7d

Please sign in to comment.