-
Notifications
You must be signed in to change notification settings - Fork 14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Don't use once_cell #61
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,27 @@ | ||
use std::ffi::CStr; | ||
use std::sync::Once; | ||
|
||
use android_system_properties::AndroidSystemProperties; | ||
use once_cell::sync::OnceCell; | ||
|
||
static INITALIZED: Once = Once::new(); | ||
static mut PROPERTIES: Option<AndroidSystemProperties> = None; | ||
|
||
// From https://android.googlesource.com/platform/ndk/+/android-4.2.2_r1.2/docs/system/libc/OVERVIEW.html | ||
// The system property named 'persist.sys.timezone' contains the name of the current timezone. | ||
|
||
static PROPERTIES: OnceCell<AndroidSystemProperties> = OnceCell::new(); | ||
// SAFETY: the key is NUL-terminated and there are no other NULs | ||
const KEY: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"persist.sys.timezone\0") }; | ||
|
||
pub(crate) fn get_timezone_inner() -> Result<String, crate::GetTimezoneError> { | ||
PROPERTIES | ||
.get_or_init(AndroidSystemProperties::new) | ||
.get_from_cstr(unsafe { CStr::from_bytes_with_nul_unchecked(b"persist.sys.timezone\0") }) | ||
INITALIZED.call_once(|| { | ||
let properties = AndroidSystemProperties::new(); | ||
// SAFETY: `INITALIZED` is synchronizing. The variable is only assigned to once. | ||
unsafe { PROPERTIES = Some(properties) }; | ||
}); | ||
|
||
// SAFETY: `INITALIZED` is synchronizing. The variable is only assigned to once. | ||
let properties = unsafe { PROPERTIES.as_ref() }; | ||
|
||
properties | ||
.and_then(|properties| properties.get_from_cstr(KEY)) | ||
.ok_or(crate::GetTimezoneError::OsError) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CStr::from_bytes_with_nul_unchecked
is only usable in const contexts since Rust 1.59.0, so this PR actually raises the MSRV from whereonce_cell
would have bumped it to.https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul_unchecked
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, that would be in line with our MSRV policy not to care about tier 2 targets. :) The MSRV for tier 1 targets was still reduced.
But yes, rising it for Android was an accident. Do you want to open a PR to fix that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would rather open a PR to revert this change and have 0.1.49 yanked on crates.io