Skip to content

Commit 8559fae

Browse files
Merge branch 'master' into index-fai
2 parents 0b71b61 + b6aeba4 commit 8559fae

File tree

10 files changed

+17
-106
lines changed

10 files changed

+17
-106
lines changed

.github/workflows/rust.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ jobs:
8585
target:
8686
- no-default-features
8787
- all-features
88-
- musl-release-no-default-features
89-
- musl-release-all-features
90-
- musl-all-features
9188
include:
9289
- target: no-default-features
9390
args: --no-default-features
@@ -96,18 +93,6 @@ jobs:
9693
args: --all-features
9794
toolchain_target: x86_64-unknown-linux-musl
9895
use_cross: false
99-
- target: musl-release-no-default-features
100-
args: --release --target x86_64-unknown-linux-musl --no-default-features
101-
toolchain_target: x86_64-unknown-linux-musl
102-
use_cross: true
103-
- target: musl-release-all-features
104-
args: --release --target x86_64-unknown-linux-musl --all-features --verbose
105-
toolchain_target: x86_64-unknown-linux-musl
106-
use_cross: true
107-
- target: musl-all-features
108-
args: --target x86_64-unknown-linux-musl --all-features --verbose
109-
toolchain_target: x86_64-unknown-linux-musl
110-
use_cross: true
11196

11297
steps:
11398
- name: Checkout repository

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [0.46.0](https://github.com/rust-bio/rust-htslib/compare/v0.45.0...v0.46.0) (2024-02-22)
6+
7+
8+
### Features
9+
10+
* making several RecordBuffer methods public ([6757f52](https://github.com/rust-bio/rust-htslib/commit/6757f5219955fd4edba4f61e62978ce1e001068e))
11+
12+
13+
### Bug Fixes
14+
15+
* fix building libz-sys ([#420](https://github.com/rust-bio/rust-htslib/issues/420)) ([01c8849](https://github.com/rust-bio/rust-htslib/commit/01c884945686e7a6756406b579fde28657f70b36))
16+
517
## [0.45.0](https://github.com/rust-bio/rust-htslib/compare/v0.44.1...v0.45.0) (2024-02-07)
618

719

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ license = "MIT"
99
name = "rust-htslib"
1010
readme = "README.md"
1111
repository = "https://github.com/rust-bio/rust-htslib.git"
12-
version = "0.45.0"
12+
version = "0.46.0"
1313

1414
[package.metadata.release]
1515
pre-release-commit-message = "release version {{version}}"
1616
tag-message = "Version {{version}} of Rust-HTSlib."
1717

1818
[dependencies]
19+
libz-sys = ">=1.1.15"
1920
bio-types = ">=0.9"
2021
byteorder = "1.3"
2122
custom_derive = "0.1"

Cross.toml

Lines changed: 0 additions & 11 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,6 @@ If you only want to use the library, there is no need to clone the repository. G
2222

2323
rust-htslib comes with pre-built bindings to htslib for Mac and Linux. You will need a C toolchain compatible with the `cc` crate. The build script for this crate will automatically build a link htslib.
2424

25-
26-
### MUSL build
27-
To compile this for MUSL crate you need docker and cross:
28-
29-
```shell
30-
$ cargo install cross
31-
$ cross build # will build with GNU GCC or LLVM toolchains
32-
```
33-
34-
If you want to run rust-htslib code on AWS lambda, [you'll need to statically compile it with MUSL](https://github.com/awslabs/aws-lambda-rust-runtime/issues/17#issuecomment-577490373) as follows:
35-
36-
```shell
37-
$ cross build --target x86_64-unknown-linux-musl # will build with MUSL toolchain
38-
```
39-
40-
Alternatively, you can also install it locally by installing the development headers of zlib, bzip2 and xz. For instance, in Debian systems one needs the following dependencies:
41-
42-
```shell
43-
$ sudo apt-get install zlib1g-dev libbz2-dev liblzma-dev clang pkg-config
44-
```
45-
46-
We provide Dockerfile bases that provide these dependencies. Refer to the [docker](https://github.com/rust-bio/rust-htslib/tree/master/docker) directory in this repository for the latest instructions, including LLVM installation.
47-
48-
On OSX:
49-
50-
```shell
51-
$ brew install FiloSottile/musl-cross/musl-cross
52-
$ brew install bzip2 zlib xz curl-openssl
53-
```
54-
5525
## Usage
5626

5727
Add this to your `Cargo.toml`:

docker/Dockerfile.gnu

Lines changed: 0 additions & 7 deletions
This file was deleted.

docker/Dockerfile.musl

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker/README.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

docker/config-musl-cross-make.mak

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/bam/buffer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ impl RecordBuffer {
5757
}
5858

5959
/// Return start position of buffer
60-
fn start(&self) -> Option<u64> {
60+
pub fn start(&self) -> Option<u64> {
6161
self.inner.front().map(|rec| rec.pos() as u64)
6262
}
6363

6464
/// Return end position of buffer.
65-
fn end(&self) -> Option<u64> {
65+
pub fn end(&self) -> Option<u64> {
6666
self.inner.back().map(|rec| rec.pos() as u64)
6767
}
6868

69-
fn tid(&self) -> Option<i32> {
69+
pub fn tid(&self) -> Option<i32> {
7070
self.inner.back().map(|rec| rec.tid())
7171
}
7272

0 commit comments

Comments
 (0)