Skip to content

Commit 038b0dc

Browse files
committed
remove once_cell as dependency
our MSVR at least 1.71.0, and once_cell was merge into std in 1.70.0, so there are no reason to use external one instead of std
1 parent 772434e commit 038b0dc

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ default = ["regex"]
1717
regex = ["env_filter/regex"]
1818

1919
[dependencies]
20-
once_cell = "1.9"
2120
env_filter = "0.1.0"
2221
env_logger = "0.11.2"
2322

src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
6666
#[cfg(target_os = "android")]
6767
extern crate android_log_sys as log_ffi;
68-
use once_cell::sync::OnceCell;
6968

7069
use log::{Level, LevelFilter, Log, Metadata, Record};
7170
#[cfg(target_os = "android")]
@@ -74,6 +73,7 @@ use std::ffi::{CStr, CString};
7473
use std::fmt;
7574
use std::mem::{self, MaybeUninit};
7675
use std::ptr;
76+
use std::sync::OnceLock;
7777

7878
pub use env_filter::{Builder as FilterBuilder, Filter};
7979
pub use env_logger::fmt::Formatter;
@@ -162,14 +162,14 @@ fn android_log(_buf_id: Option<LogId>, _priority: Level, _tag: &CStr, _msg: &CSt
162162

163163
/// Underlying android logger backend
164164
pub struct AndroidLogger {
165-
config: OnceCell<Config>,
165+
config: OnceLock<Config>,
166166
}
167167

168168
impl AndroidLogger {
169169
/// Create new logger instance from config
170170
pub fn new(config: Config) -> AndroidLogger {
171171
AndroidLogger {
172-
config: OnceCell::from(config),
172+
config: OnceLock::from(config),
173173
}
174174
}
175175

@@ -178,7 +178,7 @@ impl AndroidLogger {
178178
}
179179
}
180180

181-
static ANDROID_LOGGER: OnceCell<AndroidLogger> = OnceCell::new();
181+
static ANDROID_LOGGER: OnceLock<AndroidLogger> = OnceLock::new();
182182

183183
const LOGGING_TAG_MAX_LEN: usize = 23;
184184
const LOGGING_MSG_MAX_LEN: usize = 4000;
@@ -187,7 +187,7 @@ impl Default for AndroidLogger {
187187
/// Create a new logger with default config
188188
fn default() -> AndroidLogger {
189189
AndroidLogger {
190-
config: OnceCell::from(Config::default()),
190+
config: OnceLock::from(Config::default()),
191191
}
192192
}
193193
}

0 commit comments

Comments
 (0)