Skip to content

Remove generic import from anyhow - it was overriding Ok() and breaki… #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2021
Merged

Remove generic import from anyhow - it was overriding Ok() and breaki… #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use std::{fmt};
use std::mem::discriminant;

//Error handling crate
use anyhow::Result;
use anyhow::*;
use anyhow::{Result, Context, anyhow};
//use anyhow::*;

//Serializing/Deserializing crate
use serde::*;
Expand Down Expand Up @@ -787,7 +787,7 @@ pub extern "C" fn compound_bca_list_c(input: InputCompoundBCA) -> OutputBCA {

#[no_mangle]
pub extern "C" fn compound_bca_list_fortran(num_incident_ions: &mut c_int, track_recoils: &mut bool,
ux: *mut f64, uy: *mut f64, uz: *mut f64, E1: *mut f64,
ux: *mut f64, uy: *mut f64, uz: *mut f64, E1: *mut f64,
Z1: *mut f64, m1: *mut f64, Ec1: *mut f64, Es1: *mut f64,
num_species_target: &mut c_int,
Z2: *mut f64, m2: *mut f64, Ec2: *mut f64, Es2: *mut f64, Eb2: *mut f64, n2: *mut f64,
Expand Down
3 changes: 1 addition & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ use std::mem::discriminant;
use indicatif::{ProgressBar, ProgressStyle};

//Error handling crate
use anyhow::Result;
use anyhow::*;
use anyhow::{Result, Context, anyhow};

//Serializing/Deserializing crate
use serde::*;
Expand Down