Skip to content

Commit f0260e0

Browse files
committed
Squashed commit of the following:
commit b4a144c Author: Brandon Saint-John <[email protected]> Date: Mon Mar 11 00:14:01 2024 -0700 New and cleaner CHANGELOG commit 9c55cad Author: Brandon Saint-John <[email protected]> Date: Mon Mar 11 00:06:11 2024 -0700 slow5lib-sys: Fix typos in README commit 07c6249 Author: Brandon Saint-John <[email protected]> Date: Mon Mar 11 00:03:25 2024 -0700 bump slow5lib_sys minor version: added new item commit b805b8b Author: Brandon Saint-John (aarch64) <[email protected]> Date: Fri Mar 8 15:25:10 2024 -0800 Expand testing os commit f5c9a5d Author: Brandon Saint-John <[email protected]> Date: Thu Feb 29 08:26:41 2024 -0800 fix: README.md cleanup commit a165655 Author: Brandon Saint-John <[email protected]> Date: Wed Feb 28 21:12:52 2024 -0800 bug: forgot to switch back CargoCallbacks commit 177f60a Author: Brandon Saint-John <[email protected]> Date: Wed Feb 28 21:02:19 2024 -0800 fix: missing __gnuc_va_list breaks compilation This commit adds __gnuc_va_list as a public type into slow5lib-sys. I recently ran into compilation errors during the build.rs phase of slow5lib-sys, 71 | pub type va_list = __gnuc_va_list; | ^^^^^^^^^^^^^^ not found in this scope It isn't clear why previous iterations didn't encounter this issue, and possibly may be due to compiler versions. There have been some issues dealing with variadic arguments. The only function using this is slow5_vasprintf, and in the future it might make more sense to remove that function from the API. But for now, we will add the missing type.
1 parent d700e73 commit f0260e0

File tree

7 files changed

+51
-17
lines changed

7 files changed

+51
-17
lines changed

.github/workflows/rust.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ env:
1919
jobs:
2020
build:
2121

22-
runs-on: ubuntu-latest
2322
strategy:
2423
matrix:
24+
os: [ubuntu-latest, ubuntu-20.04, macos-14]
2525
features: [--all-features, --no-default-features]
26+
runs-on: ${{ matrix.os }}
2627

2728
steps:
2829
- uses: actions/checkout@v3

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased] - yyyy-mm-dd
8+
<!-- ## [Unreleased] - yyyy-mm-dd
99
1010
### Added
1111
@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
1616
### Removed
1717
18-
### Fixed
18+
### Fixed -->
1919

2020
## [0.11.0]
2121

README.md

+18-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Crates.io][crates-badge]][crates-url]
55
[![docs.rs][docs-badge]][docs-url]
66
[![Rust][ci-badge]][ci-url]
7-
![Stability][stability-badge]
7+
[![stable][stability-badge]][stability-url]
88
[![codecov][codecov-badge]][codecov-url]
99

1010
[license-badge]: https://img.shields.io/crates/l/slow5?style=flat-square
@@ -17,13 +17,18 @@
1717
[ci-url]: https://github.com/bsaintjo/slow5-rs/actions/workflows/rust.yml
1818
[codecov-badge]: https://codecov.io/gh/bsaintjo/slow5-rs/branch/main/graph/badge.svg?token=MODXRVRNQ0
1919
[codecov-url]: https://codecov.io/gh/bsaintjo/slow5-rs
20-
[stability-badge]: https://img.shields.io/badge/stability-experimental-orange.svg
20+
[stability-badge]: http://badges.github.io/stability-badges/dist/stable.svg
21+
[stability-url]: https://github.com/badges/stability-badges
22+
A library for interacting with SLOW5/BLOW5 files in the Rust programming language.
2123

22-
A library for interacting with SLOW5/BLOW5 files in rust. Not official.
24+
For more information check out the main [slow5lib repository](https://github.com/hasindu2008/slow5lib) or the [paper](https://doi.org/10.1038/s41587-021-01147-4).
2325

24-
For more information checkout the main [slow5lib repository](https://github.com/hasindu2008/slow5lib).
26+
This repository provides two crates:
2527

26-
*Note*: Library design is in flux and care should be taken in upgrading this crate.
28+
- `slow5lib-sys`: Bindings to the C library using `bindgen`
29+
- `slow5`: Rust API built on-top of `slow5lib-sys`
30+
31+
The interface for `slow5` is largely stable and now updated primarily to follow new versions `slow5lib`. If there is additional functionality you'd like to see, please file a Github Issue.
2732

2833
## Installation
2934

@@ -94,16 +99,19 @@ For more example code, see the [test code](tests/full.rs). Several examples from
9499

95100
## Feature flags
96101

97-
* `zstd`: Enable zstd-based compression (enabled by default)
98-
* `zlib-ng`: Enable usage of high performance zlib-ng, adds `cmake` dependency
99-
* `serde`: Enable `serde` dependency (mainly for serializing `Record`)
102+
- `zstd`: Enable zstd-based compression
103+
- enabled by default
104+
- `zlib-ng`: Enable usage of high performance zlib-ng
105+
- adds `cmake` dependency
106+
- `serde`: Enable `serde` dependency
107+
- Mainly for serializing `Record` into `serde`-compatible formats
100108

101109
## License
102110

103111
Licensed under either of
104112

105-
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
106-
* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
113+
- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
114+
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
107115

108116
at your option.
109117

slow5lib-sys/CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
<!-- ## [Unreleased] - yyyy-mm-dd
9+
10+
### Added
11+
12+
### Changed
13+
14+
### Deprecated
15+
16+
### Removed
17+
18+
### Fixed -->
19+
20+
## [0.9.1] - 2024-03-11
21+
22+
### Added
23+
24+
- Add `__gnuc_va_list` type to fix compilation errors

slow5lib-sys/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "slow5lib-sys"
3-
version = "0.9.0+slow5lib.1.1.0"
3+
version = "0.9.1+slow5lib.1.1.0"
44
readme = "README.md"
55
homepage = "https://github.com/hasindu2008/slow5lib"
66
description = "Low-level bindings to the slow5lib C library"

slow5lib-sys/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[docs-badge]: https://img.shields.io/docsrs/slow5lib-sys?style=flat-square
1212
[docs-url]: https://docs.rs/slow5lib-sys
1313

14-
Low level bindings to the `slow5lib` C library version 1.0.0
14+
Low level bindings to the `slow5lib` C library version 1.1.0
1515

1616
## Installation
1717

@@ -26,8 +26,8 @@ slow5lib-sys = "0.9"
2626

2727
Licensed under either of
2828

29-
- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
30-
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
29+
- Apache License, Version 2.0, ([LICENSE-APACHE](../LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
30+
- MIT license ([LICENSE-MIT](../LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
3131

3232
at your option.
3333

slow5lib-sys/build.rs

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ fn main() -> Result<(), Box<dyn Error>> {
7979
.allowlist_type("slow5_.*")
8080
.allowlist_type("__slow5_press")
8181
.allowlist_type("__va_list_tag")
82+
.allowlist_type("__gnuc_va_list")
8283
.allowlist_type("va_list")
8384
.allowlist_type("__darwin_va_list")
8485
.allowlist_type("__builtin_va_list")

0 commit comments

Comments
 (0)