Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch elements-miniscript for rustc recursion bug #49

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions contrib/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ rustc --version

# Pin dependencies required to build with Rust 1.48
if cargo --version | grep "1\.48"; then
cargo update -p serde_json --precise 1.0.99
cargo update -p serde --precise 1.0.156
cargo update -p once_cell --precise 1.13.1
cargo update -p regex --precise 1.7.0
# These two needed for serde_derive with 1.48.0, *in addition*
# to pinning serde itself above.
cargo update -p quote --precise 1.0.30
cargo update -p proc-macro2 --precise 1.0.65
fi

# Format if told to
Expand Down
1 change: 1 addition & 0 deletions src/policy/concrete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ impl<Pk: MiniscriptKey> ForEachKey<Pk> for Policy<Pk> {
where
Pk: 'a,
{
let mut pred = |x| pred(x);
match *self {
Policy::Unsatisfiable | Policy::Trivial => true,
Policy::Key(ref pk) => pred(pk),
Expand Down
1 change: 1 addition & 0 deletions src/policy/semantic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ impl<Pk: MiniscriptKey> ForEachKey<Pk> for Policy<Pk> {
where
Pk: 'a,
{
let mut pred = |x| pred(x);
match *self {
Policy::Unsatisfiable | Policy::Trivial => true,
Policy::Key(ref _pkh) => todo!("Semantic Policy KeyHash must store Pk"),
Expand Down
Loading