Skip to content

Commit

Permalink
chore: Bump MSRV to 1.63.0
Browse files Browse the repository at this point in the history
See rust-bitcoin/rust-bitcoin@c72069e

Use the new `dep:` syntax to define the serde feature.
Resolve a new clippy lint.
  • Loading branch information
uncomputable committed Sep 27, 2024
1 parent 1db6d94 commit f5c9dbd
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- stable
- beta
- nightly
- 1.58.0
- 1.63.0
steps:
- name: Checkout Crate
uses: actions/checkout@v4
Expand Down
8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ repository = "https://github.com/BlockstreamResearch/rust-simplicity/"
documentation = "https://docs.rs/simplicity-lang/"
description = "General purpose library for processing Simplicity programs"
edition = "2021"
rust-version = "1.58.0"
rust-version = "1.63.0"

[features]
default = ["bitcoin", "elements"]
test-utils = ["simplicity-sys/test-utils"]
serde = ["actual-serde", "bitcoin/serde", "elements/serde"]
serde = ["dep:serde", "bitcoin/serde", "elements/serde"]

[lib]
name = "simplicity"
Expand All @@ -28,9 +28,7 @@ hashes = { package = "bitcoin_hashes", version = "0.13" }
hex = { package = "hex-conservative", version = "0.1.1" }
santiago = "1.3"
simplicity-sys = { version = "0.2.0", path = "./simplicity-sys" }
actual-serde = { package = "serde", version = "1.0.103", features = [
"derive",
], optional = true }
serde = { version = "1.0.103", features = ["derive"], optional = true }

[target.wasm32-unknown-unknown.dependencies]
getrandom = { version = "0.2", features = ["js"] }
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Under development....

# Minimum Supported Rust Version

The MSRV of this crate is **1.58.0**.
The MSRV of this crate is **1.63.0**.

# Updating jets code

Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
msrv = "1.58.0"
msrv = "1.63.0"

# Default 250, not sure what units. But it does not like the generic node stuff.
type-complexity-threshold = 1000
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "simplicity-fuzz"
edition = "2021"
rust-version = "1.58.0"
rust-version = "1.63.0"
version = "0.0.1"
authors = ["Generated by fuzz/generate-files.sh"]
publish = false
Expand Down
2 changes: 1 addition & 1 deletion fuzz/generate-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cat > "$REPO_DIR/fuzz/Cargo.toml" <<EOF
[package]
name = "simplicity-fuzz"
edition = "2021"
rust-version = "1.58.0"
rust-version = "1.63.0"
version = "0.0.1"
authors = ["Generated by fuzz/generate-files.sh"]
publish = false
Expand Down
2 changes: 1 addition & 1 deletion simplicity-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/BlockstreamResearch/rust-simplicity/"
documentation = "https://docs.rs/simplicity-sys/"
description = "FFI bindings to libsimplicity"
edition = "2021"
rust-version = "1.58.0"
rust-version = "1.63.0"

[build-dependencies]
cc = "1.0.83"
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
clippy::map_clone
)]

#[cfg(feature = "serde")]
pub extern crate actual_serde as serde;
#[cfg(feature = "bitcoin")]
pub extern crate bitcoin;
#[cfg(feature = "elements")]
pub extern crate elements;
#[cfg(feature = "serde")]
pub extern crate serde;

/// Re-export of byteorder crate
pub extern crate byteorder;
Expand Down
2 changes: 1 addition & 1 deletion src/types/precomputed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use std::sync::Arc;
const N_POWERS: usize = Tmr::POWERS_OF_TWO.len();

thread_local! {
static POWERS_OF_TWO: RefCell<Option<[Arc<Final>; N_POWERS]>> = RefCell::new(None);
static POWERS_OF_TWO: RefCell<Option<[Arc<Final>; N_POWERS]>> = const { RefCell::new(None) };
}

fn initialize(write: &mut Option<[Arc<Final>; N_POWERS]>) {
Expand Down

0 comments on commit f5c9dbd

Please sign in to comment.