autocommit

Rust/source/src/idgen/default_id_generator.rs

@@ -5,12 +5,10 @@
 use std::{thread, time};
 use std::net::UdpSocket;
 use chrono::Utc;
-use super::super::contract::*;
-use super::super::core::*;
-use super::*;
 use std::sync::Mutex;
 use std::sync::Arc;
 use std::borrow::BorrowMut;
+use crate::idgen::*;
 
 // static mut instance2: Option<Arc<Mutex<SnowWorkerM1>>> = None;
 

Rust/source/src/idgen/mod.rs

@@ -0,0 +1,18 @@
+mod default_id_generator;
+mod yit_id_helper;
+mod snow_worker_m1;
+mod snow_worker_m2;
+mod id_generator_options;
+mod i_snow_worker;
+mod over_cost_action_arg;
+
+use snow_worker_m1::SnowWorkerM1;
+use snow_worker_m2::SnowWorkerM2;
+
+pub use over_cost_action_arg::OverCostActionArg;
+pub use yit_id_helper::YitIdHelper;
+pub use default_id_generator::DefaultIdGenerator;
+pub use id_generator_options::IdGeneratorOptions;
+pub use i_snow_worker::ISnowWorker;
+
+

Rust/source/src/idgen/snow_worker_m1.rs

@@ -2,10 +2,10 @@
  * 版权属于：yitter(yitter@126.com)
  * 开源地址：https://gitee.com/yitter/idgenerator
  */
-use super::super::contract::*;
 use std::{thread};
 use chrono::Utc;
 use std::thread::sleep;
+use crate::idgen::*;
 // use lazy_static::lazy_static;
 
 pub struct SnowWorkerM1 {

Rust/source/src/idgen/snow_worker_m2.rs

@@ -2,7 +2,7 @@
  * 版权属于：yitter(yitter@126.com)
  * 开源地址：https://gitee.com/yitter/idgenerator
  */
-use super::super::contract::ISnowWorker;
+use crate::idgen::*;
 
 pub struct SnowWorkerM2 {
 

Rust/source/src/idgen/yit_id_helper.rs

@@ -2,11 +2,9 @@
  * 版权属于：yitter(yitter@126.com)
  * 开源地址：https://gitee.com/yitter/idgenerator
  */
-use super::super::contract::*;
-use super::super::core::*;
-use super::*;
 use std::sync::Mutex;
 use std::sync::Arc;
+use crate::idgen::*;
 
 pub struct YitIdHelper;
 

Rust/source/src/lib.rs

@@ -1,7 +1,4 @@
-mod yitgen;
-
-use yitgen::gen::YitIdHelper;
-use yitgen::contract::*;
+mod idgen;
 
 #[macro_use]
 // extern crate lazy_static;
@@ -12,6 +9,7 @@ extern crate libc;
 use libc::{c_char, uint32_t};
 use std::ffi::{CStr, CString};
 use std::str;
+pub use idgen::*;
 
 // lazy_static! {
 //         static ref TestValue: Vec<i32> = vec!(0);

Rust/source/src/main.rs

@@ -1,7 +1,6 @@
-mod yitgen;
+mod idgen;
 
-use yitgen::contract::*;
-use yitgen::gen::*;
+use idgen::*;
 use std::thread;
 use chrono::Utc;
 use std::time::Duration;

Rust/source/src/yitgen/contract/mod.rs

@@ -1,13 +0,0 @@
-/*
- * 版权属于：yitter(yitter@126.com)
- * 开源地址：https://gitee.com/yitter/idgenerator
- */
-mod id_generator_options;
-mod i_snow_worker;
-mod over_cost_action_arg;
-
-pub use id_generator_options::IdGeneratorOptions;
-pub use i_snow_worker::ISnowWorker;
-pub use over_cost_action_arg::OverCostActionArg;
-
-

Rust/source/src/yitgen/core/mod.rs

@@ -1,10 +0,0 @@
-/*
- * 版权属于：yitter(yitter@126.com)
- * 开源地址：https://gitee.com/yitter/idgenerator
- */
-mod snow_worker_m1;
-mod snow_worker_m2;
-
-pub use snow_worker_m1::SnowWorkerM1;
-pub use snow_worker_m2::SnowWorkerM2;
-

Rust/source/src/yitgen/gen/mod.rs

@@ -1,9 +0,0 @@
-/*
- * 版权属于：yitter(yitter@126.com)
- * 开源地址：https://gitee.com/yitter/idgenerator
- */
-mod default_id_generator;
-mod yit_id_helper;
-
-pub use yit_id_helper::YitIdHelper;
-pub use default_id_generator::DefaultIdGenerator;

Rust/source/src/yitgen/mod.rs

@@ -1,3 +0,0 @@
-pub mod contract;
-pub mod core;
-pub mod gen;