mirror of https://github.com/zcash/orchard.git
Bump MSRV to 1.60
This commit is contained in:
parent
e2bfd99454
commit
0f123ca707
|
@ -14,7 +14,7 @@ jobs:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions-rs/toolchain@v1
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.56.1
|
toolchain: 1.60.0
|
||||||
override: true
|
override: true
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
|
@ -30,7 +30,7 @@ jobs:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions-rs/toolchain@v1
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.56.1
|
toolchain: 1.60.0
|
||||||
override: true
|
override: true
|
||||||
# Build benchmarks to prevent bitrot
|
# Build benchmarks to prevent bitrot
|
||||||
- name: Build benchmarks
|
- name: Build benchmarks
|
||||||
|
@ -46,7 +46,7 @@ jobs:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions-rs/toolchain@v1
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.56.1
|
toolchain: 1.60.0
|
||||||
override: true
|
override: true
|
||||||
- name: Setup mdBook
|
- name: Setup mdBook
|
||||||
uses: peaceiris/actions-mdbook@v1
|
uses: peaceiris/actions-mdbook@v1
|
||||||
|
@ -89,7 +89,7 @@ jobs:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions-rs/toolchain@v1
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.56.1
|
toolchain: 1.60.0
|
||||||
override: true
|
override: true
|
||||||
- name: cargo fetch
|
- name: cargo fetch
|
||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
|
@ -112,7 +112,7 @@ jobs:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions-rs/toolchain@v1
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.56.1
|
toolchain: 1.60.0
|
||||||
override: true
|
override: true
|
||||||
- run: rustup component add rustfmt
|
- run: rustup component add rustfmt
|
||||||
- uses: actions-rs/cargo@v1
|
- uses: actions-rs/cargo@v1
|
||||||
|
|
|
@ -5,19 +5,19 @@ on: pull_request
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
clippy:
|
clippy:
|
||||||
name: Clippy (1.56.1)
|
name: Clippy (1.60.0)
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions-rs/toolchain@v1
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.56.1
|
toolchain: 1.60.0
|
||||||
components: clippy
|
components: clippy
|
||||||
override: true
|
override: true
|
||||||
- name: Run Clippy
|
- name: Run Clippy
|
||||||
uses: actions-rs/clippy-check@v1
|
uses: actions-rs/clippy-check@v1
|
||||||
with:
|
with:
|
||||||
name: Clippy (1.56.1)
|
name: Clippy (1.60.0)
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
args: --all-features --all-targets -- -D warnings
|
args: --all-features --all-targets -- -D warnings
|
||||||
|
|
|
@ -14,6 +14,7 @@ and this project adheres to Rust's notion of
|
||||||
- `OutputError`
|
- `OutputError`
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
- MSRV is now 1.60.0.
|
||||||
- `orchard::builder`:
|
- `orchard::builder`:
|
||||||
- `Builder::{add_spend, add_output}` now use concrete error types instead of
|
- `Builder::{add_spend, add_output}` now use concrete error types instead of
|
||||||
`&'static str`s.
|
`&'static str`s.
|
||||||
|
|
|
@ -9,7 +9,7 @@ authors = [
|
||||||
"Kris Nuttycombe <kris@electriccoin.co>",
|
"Kris Nuttycombe <kris@electriccoin.co>",
|
||||||
]
|
]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.56.1"
|
rust-version = "1.60"
|
||||||
description = "The Orchard shielded transaction protocol"
|
description = "The Orchard shielded transaction protocol"
|
||||||
license-file = "LICENSE-BOSL"
|
license-file = "LICENSE-BOSL"
|
||||||
repository = "https://github.com/zcash/orchard"
|
repository = "https://github.com/zcash/orchard"
|
||||||
|
@ -48,6 +48,7 @@ incrementalmerkletree = "0.3"
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
|
|
||||||
# Developer tooling dependencies
|
# Developer tooling dependencies
|
||||||
|
image = { version = ">= 0.24, < 0.24.5", optional = true } # 0.24.5 has MSRV 1.61
|
||||||
plotters = { version = "0.3.0", optional = true }
|
plotters = { version = "0.3.0", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
@ -58,13 +59,14 @@ proptest = "1.0.0"
|
||||||
zcash_note_encryption = { version = "0.2", features = ["pre-zip-212"] }
|
zcash_note_encryption = { version = "0.2", features = ["pre-zip-212"] }
|
||||||
|
|
||||||
[target.'cfg(unix)'.dev-dependencies]
|
[target.'cfg(unix)'.dev-dependencies]
|
||||||
|
inferno = ">= 0.11, < 0.11.15"
|
||||||
pprof = { version = "0.9", features = ["criterion", "flamegraph"] } # MSRV 1.56
|
pprof = { version = "0.9", features = ["criterion", "flamegraph"] } # MSRV 1.56
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
bench = false
|
bench = false
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
dev-graph = ["halo2_proofs/dev-graph", "plotters"]
|
dev-graph = ["halo2_proofs/dev-graph", "image", "plotters"]
|
||||||
test-dependencies = ["proptest"]
|
test-dependencies = ["proptest"]
|
||||||
|
|
||||||
[[bench]]
|
[[bench]]
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# orchard [![Crates.io](https://img.shields.io/crates/v/orchard.svg)](https://crates.io/crates/orchard) #
|
# orchard [![Crates.io](https://img.shields.io/crates/v/orchard.svg)](https://crates.io/crates/orchard) #
|
||||||
|
|
||||||
Requires Rust 1.56.1+.
|
Requires Rust 1.60+.
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
1.56.1
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
[toolchain]
|
||||||
|
channel = "1.60.0"
|
||||||
|
components = [ "clippy", "rustfmt" ]
|
|
@ -49,7 +49,7 @@ impl Display for BuildError {
|
||||||
use BuildError::*;
|
use BuildError::*;
|
||||||
match self {
|
match self {
|
||||||
MissingSignatures => f.write_str("Required signatures were missing during build"),
|
MissingSignatures => f.write_str("Required signatures were missing during build"),
|
||||||
Proof(e) => f.write_str(&format!("Could not create proof: {}", e.to_string())),
|
Proof(e) => f.write_str(&format!("Could not create proof: {}", e)),
|
||||||
ValueSum(_) => f.write_str("Overflow occurred during value construction"),
|
ValueSum(_) => f.write_str("Overflow occurred during value construction"),
|
||||||
InvalidExternalSignature => f.write_str("External signature was invalid"),
|
InvalidExternalSignature => f.write_str("External signature was invalid"),
|
||||||
DuplicateSignature => f.write_str("Signature valid for more than one input"),
|
DuplicateSignature => f.write_str("Signature valid for more than one input"),
|
||||||
|
|
Loading…
Reference in New Issue