diff options
author | Thomas Bertschinger <tahbertschinger@gmail.com> | 2024-01-15 23:41:02 -0700 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-16 01:47:05 -0500 |
commit | f5baaf48e3e82b1caf9f5cd1207d4d6feba3a2e5 (patch) | |
tree | 59f7b0e4667df7a9d3d5a45725f2aaab3e79b4c5 /rust-src/bch_bindgen/src/errcode.rs | |
parent | fb35dbfdc5a9446fbb856dae5542b23963e28b89 (diff) |
move Rust sources to top level, C sources into c_src
This moves the Rust sources out of rust_src/ and into the top level.
Running the bcachefs executable out of the development tree is now:
$ ./target/release/bcachefs command
or
$ cargo run --profile release -- command
instead of "./bcachefs command".
Building and installing is still:
$ make && make install
Signed-off-by: Thomas Bertschinger <tahbertschinger@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'rust-src/bch_bindgen/src/errcode.rs')
-rw-r--r-- | rust-src/bch_bindgen/src/errcode.rs | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/rust-src/bch_bindgen/src/errcode.rs b/rust-src/bch_bindgen/src/errcode.rs deleted file mode 100644 index 4d75f1d2..00000000 --- a/rust-src/bch_bindgen/src/errcode.rs +++ /dev/null @@ -1,40 +0,0 @@ -use crate::bcachefs; -use std::ffi::CStr; -use std::fmt; - -pub use crate::c::bch_errcode; - -impl fmt::Display for bch_errcode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - let s = unsafe { CStr::from_ptr(bcachefs::bch2_err_str(*self as i32)) }; - write!(f, "{:?}", s) - } -} - -/* Can we make a function generic over ptr constness? */ - -pub fn errptr_to_result<T>(p: *mut T) -> Result<*mut T, bch_errcode> { - let addr = p as usize; - let max_err: isize = -4096; - if addr > max_err as usize { - let addr = addr as i32; - let err: bch_errcode = unsafe { std::mem::transmute(-addr) }; - Err(err) - } else { - Ok(p) - } -} - -pub fn errptr_to_result_c<T>(p: *const T) -> Result<*const T, bch_errcode> { - let addr = p as usize; - let max_err: isize = -4096; - if addr > max_err as usize { - let addr = addr as i32; - let err: bch_errcode = unsafe { std::mem::transmute(-addr) }; - Err(err) - } else { - Ok(p) - } -} - -impl std::error::Error for bch_errcode {} |