From de5f2e0033a220d2cc6c16e5b8d4b82f3853945c Mon Sep 17 00:00:00 2001 From: azw Date: Wed, 8 Nov 2023 14:29:05 +0000 Subject: [PATCH] 1 --- server/stat/src/app.rs | 1 + server/stat/src/app/mod.rs | 1 - server/stat/src/app/{app.rs => user_app.rs} | 1 - server/stat/src/main.rs | 7 +++---- 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 server/stat/src/app.rs delete mode 100644 server/stat/src/app/mod.rs rename server/stat/src/app/{app.rs => user_app.rs} (95%) diff --git a/server/stat/src/app.rs b/server/stat/src/app.rs new file mode 100644 index 0000000..13619b2 --- /dev/null +++ b/server/stat/src/app.rs @@ -0,0 +1 @@ +pub mod user_app; diff --git a/server/stat/src/app/mod.rs b/server/stat/src/app/mod.rs deleted file mode 100644 index 309be62..0000000 --- a/server/stat/src/app/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod app; diff --git a/server/stat/src/app/app.rs b/server/stat/src/app/user_app.rs similarity index 95% rename from server/stat/src/app/app.rs rename to server/stat/src/app/user_app.rs index bdf3248..ed98001 100644 --- a/server/stat/src/app/app.rs +++ b/server/stat/src/app/user_app.rs @@ -2,7 +2,6 @@ use std::rc::{Rc, Weak}; use std::cell::RefCell; use r9_macro::SharedFromSelf; use r9_macro_derive::SharedFromSelf; -//use r9_macro::Singleton; use r9_macro_derive::Singleton; #[derive(SharedFromSelf)] diff --git a/server/stat/src/main.rs b/server/stat/src/main.rs index 15670f1..82b73e3 100755 --- a/server/stat/src/main.rs +++ b/server/stat/src/main.rs @@ -1,11 +1,10 @@ use f9::app::App; -pub mod app; +mod app; +use crate::app::user_app::UserApp; fn main() { - App::instance().borrow_mut().init( - crate::app::app::UserApp::instance() - ); + App::instance().borrow_mut().init(UserApp::instance()); App::instance().borrow_mut().run(); App::instance().borrow_mut().uninit(); }