From 193307eafc7ec131a0d540c3fdaaabf9fcac389e Mon Sep 17 00:00:00 2001 From: Dnomd343 Date: Tue, 28 Feb 2023 17:02:17 +0800 Subject: [PATCH] remove: legacy code in rust codec --- src/rust_ffi/src/codec/ffi.rs | 70 +++++++++++++++++------------------ src/rust_ffi/src/codec/mod.rs | 34 ----------------- src/rust_ffi/src/core.rs | 2 +- src/rust_ffi/src/lib.rs | 4 +- 4 files changed, 37 insertions(+), 73 deletions(-) diff --git a/src/rust_ffi/src/codec/ffi.rs b/src/rust_ffi/src/codec/ffi.rs index 1c65a20..a7b4e73 100644 --- a/src/rust_ffi/src/codec/ffi.rs +++ b/src/rust_ffi/src/codec/ffi.rs @@ -2,14 +2,14 @@ use crate::core::Core; use std::ffi::{c_char, CString}; #[inline] -pub fn short_code_enable() { +pub(crate) fn short_code_enable() { unsafe { Core::short_code_enable() } } #[inline] -pub fn short_code_enable_fast() { +pub(crate) fn short_code_enable_fast() { unsafe { Core::short_code_enable_fast() } @@ -17,7 +17,7 @@ pub fn short_code_enable_fast() { #[inline] #[allow(dead_code)] -pub fn is_short_code_available() -> bool { +pub(crate) fn is_short_code_available() -> bool { unsafe { Core::is_short_code_available() } @@ -25,35 +25,35 @@ pub fn is_short_code_available() -> bool { #[inline] #[allow(dead_code)] -pub fn is_short_code_available_fast() -> bool { +pub(crate) fn is_short_code_available_fast() -> bool { unsafe { Core::is_short_code_available_fast() } } #[inline] -pub fn raw_code_check(raw_code: u64) -> bool { +pub(crate) fn raw_code_check(raw_code: u64) -> bool { unsafe { Core::raw_code_check(raw_code) } } #[inline] -pub fn short_code_check(short_code: u32) -> bool { +pub(crate) fn short_code_check(short_code: u32) -> bool { unsafe { Core::short_code_check(short_code) } } #[inline] -pub fn common_code_check(common_code: u64) -> bool { +pub(crate) fn common_code_check(common_code: u64) -> bool { unsafe { Core::common_code_check(common_code) } } #[allow(dead_code)] -pub fn raw_code_to_short_code(raw_code: u64) -> Result { +pub(crate) fn raw_code_to_short_code(raw_code: u64) -> Result { let mut short_code: u32 = 0; unsafe { match Core::raw_code_to_short_code(raw_code, &mut short_code) { @@ -64,7 +64,7 @@ pub fn raw_code_to_short_code(raw_code: u64) -> Result { } #[allow(dead_code)] -pub fn short_code_to_raw_code(short_code: u32) -> Result { +pub(crate) fn short_code_to_raw_code(short_code: u32) -> Result { let mut raw_code: u64 = 0; unsafe { match Core::short_code_to_raw_code(short_code, &mut raw_code) { @@ -75,7 +75,7 @@ pub fn short_code_to_raw_code(short_code: u32) -> Result { } #[allow(dead_code)] -pub fn raw_code_to_common_code(raw_code: u64) -> Result { +pub(crate) fn raw_code_to_common_code(raw_code: u64) -> Result { let mut common_code: u64 = 0; unsafe { match Core::raw_code_to_common_code(raw_code, &mut common_code) { @@ -86,7 +86,7 @@ pub fn raw_code_to_common_code(raw_code: u64) -> Result { } #[allow(dead_code)] -pub fn common_code_to_raw_code(common_code: u64) -> Result { +pub(crate) fn common_code_to_raw_code(common_code: u64) -> Result { let mut raw_code: u64 = 0; unsafe { match Core::common_code_to_raw_code(common_code, &mut raw_code) { @@ -97,7 +97,7 @@ pub fn common_code_to_raw_code(common_code: u64) -> Result { } #[allow(dead_code)] -pub fn short_code_to_common_code(short_code: u32) -> Result { +pub(crate) fn short_code_to_common_code(short_code: u32) -> Result { let mut common_code: u64 = 0; unsafe { match Core::short_code_to_common_code(short_code, &mut common_code) { @@ -108,7 +108,7 @@ pub fn short_code_to_common_code(short_code: u32) -> Result { } #[allow(dead_code)] -pub fn common_code_to_short_code(common_code: u64) -> Result { +pub(crate) fn common_code_to_short_code(common_code: u64) -> Result { let mut short_code: u32 = 0; unsafe { match Core::common_code_to_short_code(common_code, &mut short_code) { @@ -119,49 +119,49 @@ pub fn common_code_to_short_code(common_code: u64) -> Result } #[inline] -pub fn raw_code_to_short_code_unsafe(raw_code: u64) -> u32 { +pub(crate) fn raw_code_to_short_code_unsafe(raw_code: u64) -> u32 { unsafe { Core::raw_code_to_short_code_unsafe(raw_code) } } #[inline] -pub fn short_code_to_raw_code_unsafe(short_code: u32) -> u64 { +pub(crate) fn short_code_to_raw_code_unsafe(short_code: u32) -> u64 { unsafe { Core::short_code_to_raw_code_unsafe(short_code) } } #[inline] -pub fn raw_code_to_common_code_unsafe(raw_code: u64) -> u64 { +pub(crate) fn raw_code_to_common_code_unsafe(raw_code: u64) -> u64 { unsafe { Core::raw_code_to_common_code_unsafe(raw_code) } } #[inline] -pub fn common_code_to_raw_code_unsafe(common_code: u64) -> u64 { +pub(crate) fn common_code_to_raw_code_unsafe(common_code: u64) -> u64 { unsafe { Core::common_code_to_raw_code_unsafe(common_code) } } #[inline] -pub fn short_code_to_common_code_unsafe(short_code: u32) -> u64 { +pub(crate) fn short_code_to_common_code_unsafe(short_code: u32) -> u64 { unsafe { Core::short_code_to_common_code_unsafe(short_code) } } #[inline] -pub fn common_code_to_short_code_unsafe(common_code: u64) -> u32 { +pub(crate) fn common_code_to_short_code_unsafe(common_code: u64) -> u32 { unsafe { Core::common_code_to_short_code_unsafe(common_code) } } #[allow(dead_code)] -pub fn is_vertical_mirror(raw_code: u64) -> Result { +pub(crate) fn is_vertical_mirror(raw_code: u64) -> Result { let mut result: bool = false; unsafe { match Core::is_vertical_mirror(raw_code, &mut result) { @@ -172,7 +172,7 @@ pub fn is_vertical_mirror(raw_code: u64) -> Result { } #[allow(dead_code)] -pub fn is_horizontal_mirror(raw_code: u64) -> Result { +pub(crate) fn is_horizontal_mirror(raw_code: u64) -> Result { let mut result: bool = false; unsafe { match Core::is_horizontal_mirror(raw_code, &mut result) { @@ -183,7 +183,7 @@ pub fn is_horizontal_mirror(raw_code: u64) -> Result { } #[allow(dead_code)] -pub fn to_vertical_mirror(raw_code: u64) -> Result { +pub(crate) fn to_vertical_mirror(raw_code: u64) -> Result { let mut result: u64 = 0; unsafe { match Core::to_vertical_mirror(raw_code, &mut result) { @@ -194,7 +194,7 @@ pub fn to_vertical_mirror(raw_code: u64) -> Result { } #[allow(dead_code)] -pub fn to_horizontal_mirror(raw_code: u64) -> Result { +pub(crate) fn to_horizontal_mirror(raw_code: u64) -> Result { let mut result: u64 = 0; unsafe { match Core::to_horizontal_mirror(raw_code, &mut result) { @@ -205,35 +205,35 @@ pub fn to_horizontal_mirror(raw_code: u64) -> Result { } #[inline] -pub fn is_vertical_mirror_unsafe(raw_code: u64) -> bool { +pub(crate) fn is_vertical_mirror_unsafe(raw_code: u64) -> bool { unsafe { Core::is_vertical_mirror_unsafe(raw_code) } } #[inline] -pub fn is_horizontal_mirror_unsafe(raw_code: u64) -> bool { +pub(crate) fn is_horizontal_mirror_unsafe(raw_code: u64) -> bool { unsafe { Core::is_horizontal_mirror_unsafe(raw_code) } } #[inline] -pub fn to_vertical_mirror_unsafe(raw_code: u64) -> u64 { +pub(crate) fn to_vertical_mirror_unsafe(raw_code: u64) -> u64 { unsafe { Core::to_vertical_mirror_unsafe(raw_code) } } #[inline] -pub fn to_horizontal_mirror_unsafe(raw_code: u64) -> u64 { +pub(crate) fn to_horizontal_mirror_unsafe(raw_code: u64) -> u64 { unsafe { Core::to_horizontal_mirror_unsafe(raw_code) } } #[allow(dead_code)] -pub fn short_code_to_string(short_code: u32) -> Result { +pub(crate) fn short_code_to_string(short_code: u32) -> Result { unsafe { let mut buffer: Vec = vec![0; Core::SHORT_CODE_STR_SIZE as usize]; match Core::short_code_to_string(short_code, buffer.as_mut_ptr()) { @@ -249,7 +249,7 @@ pub fn short_code_to_string(short_code: u32) -> Result { } } -pub fn short_code_to_string_unsafe(short_code: u32) -> String { +pub(crate) fn short_code_to_string_unsafe(short_code: u32) -> String { unsafe { let mut buffer: Vec = vec![0; Core::SHORT_CODE_STR_SIZE as usize]; Core::short_code_to_string(short_code, buffer.as_mut_ptr()); @@ -261,7 +261,7 @@ pub fn short_code_to_string_unsafe(short_code: u32) -> String { } } -pub fn short_code_from_string(short_code: &str) -> Result { +pub(crate) fn short_code_from_string(short_code: &str) -> Result { unsafe { let mut result: u32 = 0; match Core::short_code_from_string( @@ -275,7 +275,7 @@ pub fn short_code_from_string(short_code: &str) -> Result { } #[allow(dead_code)] -pub fn common_code_to_string(common_code: u64) -> Result { +pub(crate) fn common_code_to_string(common_code: u64) -> Result { unsafe { let mut buffer: Vec = vec![0; Core::COMMON_CODE_STR_SIZE as usize]; match Core::common_code_to_string(common_code, buffer.as_mut_ptr()) { @@ -291,7 +291,7 @@ pub fn common_code_to_string(common_code: u64) -> Result { } } -pub fn common_code_to_string_unsafe(common_code: u64) -> String { +pub(crate) fn common_code_to_string_unsafe(common_code: u64) -> String { unsafe { let mut buffer: Vec = vec![0; Core::COMMON_CODE_STR_SIZE as usize]; Core::common_code_to_string_unsafe(common_code, buffer.as_mut_ptr()); @@ -304,7 +304,7 @@ pub fn common_code_to_string_unsafe(common_code: u64) -> String { } #[allow(dead_code)] -pub fn common_code_to_string_shorten(common_code: u64) -> Result { +pub(crate) fn common_code_to_string_shorten(common_code: u64) -> Result { unsafe { let mut buffer: Vec = vec![0; Core::COMMON_CODE_STR_SIZE as usize]; match Core::common_code_to_string_shorten(common_code, buffer.as_mut_ptr()) { @@ -321,7 +321,7 @@ pub fn common_code_to_string_shorten(common_code: u64) -> Result String { +pub(crate) fn common_code_to_string_shorten_unsafe(common_code: u64) -> String { unsafe { let mut buffer: Vec = vec![0; Core::COMMON_CODE_STR_SIZE as usize]; Core::common_code_to_string_shorten(common_code, buffer.as_mut_ptr()); @@ -334,7 +334,7 @@ pub fn common_code_to_string_shorten_unsafe(common_code: u64) -> String { } } -pub fn common_code_from_string(common_code: &str) -> Result { +pub(crate) fn common_code_from_string(common_code: &str) -> Result { unsafe { let mut result: u64 = 0; match Core::common_code_from_string( diff --git a/src/rust_ffi/src/codec/mod.rs b/src/rust_ffi/src/codec/mod.rs index 4931cfa..3f510da 100644 --- a/src/rust_ffi/src/codec/mod.rs +++ b/src/rust_ffi/src/codec/mod.rs @@ -6,37 +6,3 @@ mod common_code; pub use raw_code::RawCode; pub use short_code::ShortCode; pub use common_code::CommonCode; - -pub fn demo() { - let s = ShortCode::from(4091296).unwrap(); - println!("{}", s.unwrap()); - println!("{:?}", s); - println!("{}", s); - - let s = ShortCode::from_str("4WVE1").unwrap(); - println!("{}", s); - - println!("ShortCode warm up"); - ShortCode::warm_up(); - println!("ShortCode warm up fast"); - ShortCode::warm_up_fast(); - - println!("{}", s.to_string()); - println!("{}", s.to_raw_code()); - println!("{}", s.to_common_code()); - - let c = CommonCode::from(0x1A9BF0C00).unwrap(); - println!("{}", c.unwrap()); - println!("{:?}", c); - println!("{}", c); - - let c = CommonCode::from_str("1A9BF0C00").unwrap(); - println!("{}", c); - let c = CommonCode::from_str("1A9BF0C").unwrap(); - println!("{}", c); - - println!("{}", c.to_string()); - println!("{}", c.to_string_shorten()); - println!("{}", c.to_short_code()); - -} diff --git a/src/rust_ffi/src/core.rs b/src/rust_ffi/src/core.rs index f51beb1..678e684 100644 --- a/src/rust_ffi/src/core.rs +++ b/src/rust_ffi/src/core.rs @@ -1,7 +1,7 @@ /// Klotski c-style ABI convert by bindgen. /// Core module expose these interfaces for abstraction. -pub mod Core { +pub(crate) mod Core { #![allow(dead_code)] #![allow(non_snake_case)] #![allow(non_camel_case_types)] diff --git a/src/rust_ffi/src/lib.rs b/src/rust_ffi/src/lib.rs index ade14cc..2045f9b 100644 --- a/src/rust_ffi/src/lib.rs +++ b/src/rust_ffi/src/lib.rs @@ -2,10 +2,8 @@ mod core; mod codec; mod metadata; -pub use metadata::load_metadata as metadata; - pub use codec::RawCode; pub use codec::ShortCode; pub use codec::CommonCode; -pub use codec::demo; +pub use metadata::load_metadata as metadata;