Skip to content

Commit 5c575a7

Browse files
committed
Merge bitcoin_hashes-0.14.1
Run `git merge bitcoin_hashes-0.14.1` which causes conflicts in the minimal/recent lock files. Just restore and then run `just update-lock-files`.
1 parent 56ee04c commit 5c575a7

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

Cargo-minimal.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ dependencies = [
102102

103103
[[package]]
104104
name = "bitcoin_hashes"
105-
version = "0.14.0"
105+
version = "0.14.1"
106106
dependencies = [
107107
"bitcoin-io",
108108
"hex-conservative",

Cargo-recent.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ dependencies = [
101101

102102
[[package]]
103103
name = "bitcoin_hashes"
104-
version = "0.14.0"
104+
version = "0.14.1"
105105
dependencies = [
106106
"bitcoin-io",
107107
"hex-conservative",

hashes/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.14.1 - 2025-12-03
2+
3+
* remove `doc_auto_cfg`
4+
15
# 0.14.0 - 2024-03-21
26

37
* Bump MSRV to Rust version 1.56.1 [#2188](https://github.com/rust-bitcoin/rust-bitcoin/pull/2188)

hashes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bitcoin_hashes"
3-
version = "0.14.0"
3+
version = "0.14.1"
44
authors = ["Andrew Poelstra <[email protected]>"]
55
license = "CC0-1.0"
66
repository = "https://github.com/rust-bitcoin/rust-bitcoin"

hashes/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
6868
#![cfg_attr(all(not(test), not(feature = "std")), no_std)]
6969
// Experimental features we need.
70-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
7170
#![cfg_attr(bench, feature(test))]
7271
// Coding conventions.
7372
#![warn(missing_docs)]

0 commit comments

Comments
 (0)