leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split next_id() logic into function

Browse source
This commit is contained in:
Ian Douglas Scott 2021-09-02 14:37:32 -07:00
parent cf94792f12
commit 9e8ce5f8d9
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/notifications.rs
View file

@ -74,6 +74,14 @@ impl Notifications {
notifications
}
fn next_id(&self) -> NonZeroU32 {
let mut next_id = self.next_id.lock().unwrap();
let id = *next_id;
*next_id = NonZeroU32::new(u32::from(*next_id).wrapping_add(1))
.unwrap_or(NonZeroU32::new(1).unwrap());
id
}
fn notify(
&self,
_app_name: String,
@ -85,13 +93,7 @@ impl Notifications {
_hints: HashMap<String, glib::Variant>,
_expire_timeout: i32,
) -> NonZeroU32 {
let id = replaces_id.unwrap_or_else(|| {
let mut next_id = self.next_id.lock().unwrap();
let id = *next_id;
*next_id = NonZeroU32::new(u32::from(*next_id).wrapping_add(1))
.unwrap_or(NonZeroU32::new(1).unwrap());
id
});
let id = replaces_id.unwrap_or_else(|| self.next_id());
// TODO