Skip to content

Commit 69d439f

Browse files
Bump rust version and transitive deps. (#65)
* Bump rust version to 1.59.0. Also run clippy --fix. * Update transitive dependencies. * explicit dep on libz-sys to fix OSX segfault issue. Co-authored-by: Luiz Irber <83029587+luiz10x@users.noreply.github.com>
1 parent 43aebe7 commit 69d439f

File tree

6 files changed

+41
-39
lines changed

6 files changed

+41
-39
lines changed

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Install Rust
6666
uses: actions-rs/toolchain@v1
6767
with:
68-
toolchain: 1.58.1
68+
toolchain: 1.59.0
6969
default: true
7070
- name: Make release build
7171
run: |

.github/workflows/test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Rust
1818
uses: actions-rs/toolchain@v1
1919
with:
20-
toolchain: 1.58.1
20+
toolchain: 1.59.0
2121
components: rustfmt
2222
default: true
2323
- name: Checkout bamtofastq master
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install Rust
3737
uses: actions-rs/toolchain@v1
3838
with:
39-
toolchain: 1.58.1
39+
toolchain: 1.59.0
4040
components: rustfmt, clippy
4141
default: true
4242
- name: Checkout bamtofastq master

Cargo.lock

+33-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ curl = ["rust-htslib/curl"]
2020
docopt = "*"
2121
rust-htslib = { version = "0.38", default-features = false }
2222
flate2 = { version = "1.0", features = ["zlib"], default-features = false }
23+
libz-sys = "1.1.5"
2324
shardio = "0.8.2"
2425
bincode = "1"
2526
itertools = ">=0.8.0"

src/locus.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl fmt::Display for Locus {
2121

2222
fn remove_commas(s: &str) -> String {
2323
let ss = s.to_string();
24-
ss.replace(",", "")
24+
ss.replace(',', "")
2525
}
2626

2727
impl FromStr for Locus {

src/main.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ impl FormatBamRecords {
214214
rg_spec: rgs,
215215
r1_spec: spec.remove("R1").unwrap(),
216216
r2_spec: spec.remove("R2").unwrap(),
217-
i1_spec: spec.remove("I1").unwrap_or_else(Vec::new),
218-
i2_spec: spec.remove("I2").unwrap_or_else(Vec::new),
217+
i1_spec: spec.remove("I1").unwrap_or_default(),
218+
i2_spec: spec.remove("I2").unwrap_or_default(),
219219
rename: seq_names,
220220
order: [1, 3, 2, 4],
221221
})
@@ -668,7 +668,7 @@ impl FastqManager {
668668
for (_, &(ref _samp, lane)) in formatter.rg_spec.iter() {
669669
let samp = _samp.clone();
670670
let path = sample_def_paths.entry(samp).or_insert_with(|| {
671-
let suffix = _samp.replace(":", "_");
671+
let suffix = _samp.replace(':', "_");
672672

673673
//create_dir(&samp_path).expect("couldn't create output directory");
674674
out_path.join(suffix)

0 commit comments

Comments
 (0)