Skip to content

Commit

Permalink
Update rand_core to 0.6, merlin to 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hdevalence committed Jan 28, 2021
1 parent 1dda9dd commit be198b4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 3.0.0

* Update `rand_core` to `0.6`. Because traits from `rand_core` are part of the
public API, this is technically a breaking change, but there are no other
changes to Merlin's API.

## 2.0.1

* Update repository, add `html_root_url`, update dev-dependencies.
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "merlin"
# - update CHANGELOG
# - update html_root_url
# - update README if required by semver
version = "2.0.1"
version = "3.0.0"
authors = ["Henry de Valence <hdevalence@hdevalence.ca>"]
edition = "2018"
readme = "README.md"
Expand All @@ -25,13 +25,13 @@ features = ["nightly"]
keccak = { version = "0.1.0", default-features = false }
byteorder = { version = "1.2.4", default-features = false }
zeroize = { version = "1", default-features = false, features = ["zeroize_derive"] }
rand_core = { version = "0.5", default-features = false }
rand_core = { version = "0.6", default-features = false }
hex = {version = "0.3", default-features = false, optional = true}

[dev-dependencies]
strobe-rs = "0.5"
curve25519-dalek = { version = "3", package = "curve25519-dalek-ng" }
rand_chacha = "0.2"
curve25519-dalek = { version = "4", package = "curve25519-dalek-ng" }
rand_chacha = "0.3"

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(feature = "nightly", feature(external_doc))]
#![cfg_attr(feature = "nightly", doc(include = "../README.md"))]
#![doc(html_root_url = "https://docs.rs/merlin/2.0.1")]
#![doc(html_root_url = "https://docs.rs/merlin/3.0.0")]
// put this after the #![doc(..)] so it appears as a footer:
//! Note that docs will only build on nightly Rust until
//! [RFC 1990 stabilizes](https://github.com/rust-lang/rust/issues/44732).
Expand Down

0 comments on commit be198b4

Please sign in to comment.