SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PrimInt in map feedback and observer (#606)

Browse Source 
* Remove PrimInt

* Use core instead of std

Co-authored-by: Andrea Fioraldi <andreafioraldi@gmail.com>
This commit is contained in:
Shengtuo Hu 2022-05-06 04:29:07 -04:00 committed by GitHub
parent 2ba32c0173
commit 1c97a5fd2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 215 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libafl/src/feedbacks/map.rs
View File

@ -4,6 +4,7 @@ use alloc::{
string::{String, ToString}, string::{String, ToString},
vec::Vec, vec::Vec,
}; };
use core::ops::{BitAnd, BitOr};
use core::{fmt::Debug, marker::PhantomData}; use core::{fmt::Debug, marker::PhantomData};
use num_traits::PrimInt; use num_traits::PrimInt;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -43,7 +44,7 @@ pub type MaxMapOneOrFilledFeedback<I, O, S, T> =
/// A `Reducer` function is used to aggregate values for the novelty search /// A `Reducer` function is used to aggregate values for the novelty search
pub trait Reducer<T>: 'static + Debug pub trait Reducer<T>: 'static + Debug
where where
T: PrimInt + Default + Copy + 'static, T: Default + Copy + 'static,
{ {
/// Reduce two values to one value, with the current [`Reducer`]. /// Reduce two values to one value, with the current [`Reducer`].
fn reduce(first: T, second: T) -> T; fn reduce(first: T, second: T) -> T;
@ -55,7 +56,7 @@ pub struct OrReducer {}
impl<T> Reducer<T> for OrReducer impl<T> Reducer<T> for OrReducer
where where
T: PrimInt + Default + Copy + 'static + PartialOrd, T: BitOr<Output = T> + Default + Copy + 'static + PartialOrd,
{ {
#[inline] #[inline]
fn reduce(history: T, new: T) -> T { fn reduce(history: T, new: T) -> T {
@ -69,7 +70,7 @@ pub struct AndReducer {}
impl<T> Reducer<T> for AndReducer impl<T> Reducer<T> for AndReducer
where where
T: PrimInt + Default + Copy + 'static + PartialOrd, T: BitAnd<Output = T> + Default + Copy + 'static + PartialOrd,
{ {
#[inline] #[inline]
fn reduce(history: T, new: T) -> T { fn reduce(history: T, new: T) -> T {
@ -83,7 +84,7 @@ pub struct MaxReducer {}
impl<T> Reducer<T> for MaxReducer impl<T> Reducer<T> for MaxReducer
where where
T: PrimInt + Default + Copy + 'static + PartialOrd, T: Default + Copy + 'static + PartialOrd,
{ {
#[inline] #[inline]
fn reduce(first: T, second: T) -> T { fn reduce(first: T, second: T) -> T {
@ -101,7 +102,7 @@ pub struct MinReducer {}
impl<T> Reducer<T> for MinReducer impl<T> Reducer<T> for MinReducer
where where
T: PrimInt + Default + Copy + 'static + PartialOrd, T: Default + Copy + 'static + PartialOrd,
{ {
#[inline] #[inline]
fn reduce(first: T, second: T) -> T { fn reduce(first: T, second: T) -> T {
@ -116,7 +117,7 @@ where
/// A `IsNovel` function is used to discriminate if a reduced value is considered novel. /// A `IsNovel` function is used to discriminate if a reduced value is considered novel.
pub trait IsNovel<T>: 'static + Debug pub trait IsNovel<T>: 'static + Debug
where where
T: PrimInt + Default + Copy + 'static, T: Default + Copy + 'static,
{ {
/// If a new value in the [`MapFeedback`] was found, /// If a new value in the [`MapFeedback`] was found,
/// this filter can decide if the result is considered novel or not. /// this filter can decide if the result is considered novel or not.
@ -129,7 +130,7 @@ pub struct AllIsNovel {}
impl<T> IsNovel<T> for AllIsNovel impl<T> IsNovel<T> for AllIsNovel
where where
T: PrimInt + Default + Copy + 'static, T: Default + Copy + 'static,
{ {
#[inline] #[inline]
fn is_novel(_old: T, _new: T) -> bool { fn is_novel(_old: T, _new: T) -> bool {
@ -156,7 +157,7 @@ fn saturating_next_power_of_two<T: PrimInt>(n: T) -> T {
pub struct DifferentIsNovel {} pub struct DifferentIsNovel {}
impl<T> IsNovel<T> for DifferentIsNovel impl<T> IsNovel<T> for DifferentIsNovel
where where
T: PrimInt + Default + Copy + 'static, T: PartialEq + Default + Copy + 'static,
{ {
#[inline] #[inline]
fn is_novel(old: T, new: T) -> bool { fn is_novel(old: T, new: T) -> bool {
@ -275,7 +276,7 @@ impl MapNoveltiesMetadata {
#[serde(bound = "T: serde::de::DeserializeOwned")] #[serde(bound = "T: serde::de::DeserializeOwned")]
pub struct MapFeedbackState<T> pub struct MapFeedbackState<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize, T: Default + Copy + 'static + Serialize,
{ {
/// Contains information about untouched entries /// Contains information about untouched entries
pub history_map: Vec<T>, pub history_map: Vec<T>,
@ -285,19 +286,17 @@ where
impl<T> FeedbackState for MapFeedbackState<T> impl<T> FeedbackState for MapFeedbackState<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
fn reset(&mut self) -> Result<(), Error> { fn reset(&mut self) -> Result<(), Error> {
self.history_map self.history_map.iter_mut().for_each(|x| *x = T::default());
.iter_mut()
.for_each(|x| *x = T::min_value());
Ok(()) Ok(())
} }
} }
impl<T> Named for MapFeedbackState<T> impl<T> Named for MapFeedbackState<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn name(&self) -> &str { fn name(&self) -> &str {
@ -307,13 +306,13 @@ where
impl<T> MapFeedbackState<T> impl<T> MapFeedbackState<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
/// Create new `MapFeedbackState` /// Create new `MapFeedbackState`
#[must_use] #[must_use]
pub fn new(name: &'static str, map_size: usize) -> Self { pub fn new(name: &'static str, map_size: usize) -> Self {
Self { Self {
history_map: vec![T::min_value(); map_size], history_map: vec![T::default(); map_size],
name: name.to_string(), name: name.to_string(),
} }
} }
@ -322,10 +321,10 @@ where
pub fn with_observer<O>(map_observer: &O) -> Self pub fn with_observer<O>(map_observer: &O) -> Self
where where
O: MapObserver<Entry = T>, O: MapObserver<Entry = T>,
T: Debug, T: PartialEq + Debug,
{ {
Self { Self {
history_map: vec![T::min_value(); map_observer.len()], history_map: vec![map_observer.initial(); map_observer.len()],
name: map_observer.name().to_string(), name: map_observer.name().to_string(),
} }
} }
@ -345,7 +344,7 @@ where
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct MapFeedback<I, N, O, R, S, T> pub struct MapFeedback<I, N, O, R, S, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: PartialEq + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
R: Reducer<T>, R: Reducer<T>,
O: MapObserver<Entry = T>, O: MapObserver<Entry = T>,
for<'it> O: AsRefIterator<'it, Item = T>, for<'it> O: AsRefIterator<'it, Item = T>,
@ -366,7 +365,7 @@ where
impl<I, N, O, R, S, T> Feedback<I, S> for MapFeedback<I, N, O, R, S, T> impl<I, N, O, R, S, T> Feedback<I, S> for MapFeedback<I, N, O, R, S, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: PartialEq + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
R: Reducer<T>, R: Reducer<T>,
O: MapObserver<Entry = T>, O: MapObserver<Entry = T>,
for<'it> O: AsRefIterator<'it, Item = T>, for<'it> O: AsRefIterator<'it, Item = T>,
@ -472,7 +471,7 @@ where
impl<I, N, O, R, S, T> Named for MapFeedback<I, N, O, R, S, T> impl<I, N, O, R, S, T> Named for MapFeedback<I, N, O, R, S, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: PartialEq + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
R: Reducer<T>, R: Reducer<T>,
N: IsNovel<T>, N: IsNovel<T>,
O: MapObserver<Entry = T>, O: MapObserver<Entry = T>,
@ -487,14 +486,7 @@ where
impl<I, N, O, R, S, T> MapFeedback<I, N, O, R, S, T> impl<I, N, O, R, S, T> MapFeedback<I, N, O, R, S, T>
where where
T: PrimInt T: PartialEq + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ PartialOrd
+ Debug,
R: Reducer<T>, R: Reducer<T>,
N: IsNovel<T>, N: IsNovel<T>,
O: MapObserver<Entry = T>, O: MapObserver<Entry = T>,

255
libafl/src/observers/map.rs
View File

@ -13,7 +13,7 @@ use core::{
slice::{from_raw_parts, Iter, IterMut}, slice::{from_raw_parts, Iter, IterMut},
}; };
use intervaltree::IntervalTree; use intervaltree::IntervalTree;
use num_traits::PrimInt; use num_traits::Bounded;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::{ use crate::{
@ -28,7 +28,7 @@ use crate::{
}; };
/// Compute the hash of a slice /// Compute the hash of a slice
fn hash_slice<T: PrimInt>(slice: &[T]) -> u64 { fn hash_slice<T>(slice: &[T]) -> u64 {
let mut hasher = AHasher::new_with_keys(0, 0); let mut hasher = AHasher::new_with_keys(0, 0);
let ptr = slice.as_ptr() as *const u8; let ptr = slice.as_ptr() as *const u8;
let map_size = slice.len() / core::mem::size_of::<T>(); let map_size = slice.len() / core::mem::size_of::<T>();
@ -46,7 +46,7 @@ pub trait MapObserver: HasLen + Named + Serialize + serde::de::DeserializeOwned
// for<'it> &'it Self: IntoIterator<Item = &'it Self::Entry> // for<'it> &'it Self: IntoIterator<Item = &'it Self::Entry>
{ {
/// Type of each entry in this map /// Type of each entry in this map
type Entry: PrimInt + Default + Copy + Debug + 'static; type Entry: Bounded + PartialEq + Default + Copy + Debug + 'static;
/// Get the value at `idx` /// Get the value at `idx`
fn get(&self, idx: usize) -> &Self::Entry; fn get(&self, idx: usize) -> &Self::Entry;
@ -186,7 +186,7 @@ where
#[allow(clippy::unsafe_derive_deserialize)] #[allow(clippy::unsafe_derive_deserialize)]
pub struct StdMapObserver<'a, T> pub struct StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize, T: Default + Copy + 'static + Serialize,
{ {
map: OwnedSliceMut<'a, T>, map: OwnedSliceMut<'a, T>,
initial: T, initial: T,
@ -195,7 +195,14 @@ where
impl<'a, I, S, T> Observer<I, S> for StdMapObserver<'a, T> impl<'a, I, S, T> Observer<I, S> for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
#[inline] #[inline]
fn pre_exec(&mut self, _state: &mut S, _input: &I) -> Result<(), Error> { fn pre_exec(&mut self, _state: &mut S, _input: &I) -> Result<(), Error> {
@ -205,7 +212,7 @@ where
impl<'a, T> Named for StdMapObserver<'a, T> impl<'a, T> Named for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn name(&self) -> &str { fn name(&self) -> &str {
@ -215,7 +222,7 @@ where
impl<'a, T> HasLen for StdMapObserver<'a, T> impl<'a, T> HasLen for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn len(&self) -> usize { fn len(&self) -> usize {
@ -225,7 +232,14 @@ where
impl<'a, 'it, T> AsRefIterator<'it> for StdMapObserver<'a, T> impl<'a, 'it, T> AsRefIterator<'it> for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = T; type Item = T;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -238,7 +252,14 @@ where
impl<'a, 'it, T> AsMutIterator<'it> for StdMapObserver<'a, T> impl<'a, 'it, T> AsMutIterator<'it> for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = T; type Item = T;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -251,7 +272,14 @@ where
impl<'a, 'it, T> IntoIterator for &'it StdMapObserver<'a, T> impl<'a, 'it, T> IntoIterator for &'it StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = <Iter<'it, T> as Iterator>::Item; type Item = <Iter<'it, T> as Iterator>::Item;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -264,7 +292,14 @@ where
impl<'a, 'it, T> IntoIterator for &'it mut StdMapObserver<'a, T> impl<'a, 'it, T> IntoIterator for &'it mut StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = <IterMut<'it, T> as Iterator>::Item; type Item = <IterMut<'it, T> as Iterator>::Item;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -277,7 +312,14 @@ where
impl<'a, T> MapObserver for StdMapObserver<'a, T> impl<'a, T> MapObserver for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Entry = T; type Entry = T;
@ -317,7 +359,7 @@ where
impl<'a, T> AsSlice<T> for StdMapObserver<'a, T> impl<'a, T> AsSlice<T> for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[must_use] #[must_use]
#[inline] #[inline]
@ -327,7 +369,7 @@ where
} }
impl<'a, T> AsMutSlice<T> for StdMapObserver<'a, T> impl<'a, T> AsMutSlice<T> for StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[must_use] #[must_use]
#[inline] #[inline]
@ -338,7 +380,7 @@ where
impl<'a, T> StdMapObserver<'a, T> impl<'a, T> StdMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
/// Creates a new [`MapObserver`] /// Creates a new [`MapObserver`]
#[must_use] #[must_use]
@ -393,7 +435,7 @@ where
#[allow(clippy::unsafe_derive_deserialize)] #[allow(clippy::unsafe_derive_deserialize)]
pub struct ConstMapObserver<'a, T, const N: usize> pub struct ConstMapObserver<'a, T, const N: usize>
where where
T: PrimInt + Default + Copy + 'static + Serialize, T: Default + Copy + 'static + Serialize,
{ {
map: OwnedSliceMut<'a, T>, map: OwnedSliceMut<'a, T>,
initial: T, initial: T,
@ -402,7 +444,7 @@ where
impl<'a, I, S, T, const N: usize> Observer<I, S> for ConstMapObserver<'a, T, N> impl<'a, I, S, T, const N: usize> Observer<I, S> for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
Self: MapObserver, Self: MapObserver,
{ {
#[inline] #[inline]
@ -413,7 +455,7 @@ where
impl<'a, T, const N: usize> Named for ConstMapObserver<'a, T, N> impl<'a, T, const N: usize> Named for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn name(&self) -> &str { fn name(&self) -> &str {
@ -423,7 +465,7 @@ where
impl<'a, T, const N: usize> HasLen for ConstMapObserver<'a, T, N> impl<'a, T, const N: usize> HasLen for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn len(&self) -> usize { fn len(&self) -> usize {
@ -433,7 +475,14 @@ where
impl<'a, 'it, T, const N: usize> AsRefIterator<'it> for ConstMapObserver<'a, T, N> impl<'a, 'it, T, const N: usize> AsRefIterator<'it> for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = T; type Item = T;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -446,7 +495,14 @@ where
impl<'a, 'it, T, const N: usize> AsMutIterator<'it> for ConstMapObserver<'a, T, N> impl<'a, 'it, T, const N: usize> AsMutIterator<'it> for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = T; type Item = T;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -459,7 +515,14 @@ where
impl<'a, 'it, T, const N: usize> IntoIterator for &'it ConstMapObserver<'a, T, N> impl<'a, 'it, T, const N: usize> IntoIterator for &'it ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = <Iter<'it, T> as Iterator>::Item; type Item = <Iter<'it, T> as Iterator>::Item;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -472,7 +535,14 @@ where
impl<'a, 'it, T, const N: usize> IntoIterator for &'it mut ConstMapObserver<'a, T, N> impl<'a, 'it, T, const N: usize> IntoIterator for &'it mut ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = <IterMut<'it, T> as Iterator>::Item; type Item = <IterMut<'it, T> as Iterator>::Item;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -485,7 +555,14 @@ where
impl<'a, T, const N: usize> MapObserver for ConstMapObserver<'a, T, N> impl<'a, T, const N: usize> MapObserver for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Entry = T; type Entry = T;
@ -524,7 +601,7 @@ where
impl<'a, T, const N: usize> AsSlice<T> for ConstMapObserver<'a, T, N> impl<'a, T, const N: usize> AsSlice<T> for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[inline] #[inline]
fn as_slice(&self) -> &[T] { fn as_slice(&self) -> &[T] {
@ -533,7 +610,7 @@ where
} }
impl<'a, T, const N: usize> AsMutSlice<T> for ConstMapObserver<'a, T, N> impl<'a, T, const N: usize> AsMutSlice<T> for ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[inline] #[inline]
fn as_mut_slice(&mut self) -> &mut [T] { fn as_mut_slice(&mut self) -> &mut [T] {
@ -543,7 +620,7 @@ where
impl<'a, T, const N: usize> ConstMapObserver<'a, T, N> impl<'a, T, const N: usize> ConstMapObserver<'a, T, N>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
/// Creates a new [`MapObserver`] /// Creates a new [`MapObserver`]
#[must_use] #[must_use]
@ -587,7 +664,7 @@ where
#[allow(clippy::unsafe_derive_deserialize)] #[allow(clippy::unsafe_derive_deserialize)]
pub struct VariableMapObserver<'a, T> pub struct VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize, T: Default + Copy + 'static + Serialize,
{ {
map: OwnedSliceMut<'a, T>, map: OwnedSliceMut<'a, T>,
size: OwnedRefMut<'a, usize>, size: OwnedRefMut<'a, usize>,
@ -597,7 +674,7 @@ where
impl<'a, I, S, T> Observer<I, S> for VariableMapObserver<'a, T> impl<'a, I, S, T> Observer<I, S> for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
Self: MapObserver, Self: MapObserver,
{ {
#[inline] #[inline]
@ -608,7 +685,7 @@ where
impl<'a, T> Named for VariableMapObserver<'a, T> impl<'a, T> Named for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn name(&self) -> &str { fn name(&self) -> &str {
@ -618,7 +695,7 @@ where
impl<'a, T> HasLen for VariableMapObserver<'a, T> impl<'a, T> HasLen for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn len(&self) -> usize { fn len(&self) -> usize {
@ -628,7 +705,14 @@ where
impl<'a, 'it, T> AsRefIterator<'it> for VariableMapObserver<'a, T> impl<'a, 'it, T> AsRefIterator<'it> for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = T; type Item = T;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -641,7 +725,14 @@ where
impl<'a, 'it, T> AsMutIterator<'it> for VariableMapObserver<'a, T> impl<'a, 'it, T> AsMutIterator<'it> for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = T; type Item = T;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -654,7 +745,14 @@ where
impl<'a, 'it, T> IntoIterator for &'it VariableMapObserver<'a, T> impl<'a, 'it, T> IntoIterator for &'it VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = <Iter<'it, T> as Iterator>::Item; type Item = <Iter<'it, T> as Iterator>::Item;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -667,7 +765,14 @@ where
impl<'a, 'it, T> IntoIterator for &'it mut VariableMapObserver<'a, T> impl<'a, 'it, T> IntoIterator for &'it mut VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Item = <IterMut<'it, T> as Iterator>::Item; type Item = <IterMut<'it, T> as Iterator>::Item;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -680,7 +785,14 @@ where
impl<'a, T> MapObserver for VariableMapObserver<'a, T> impl<'a, T> MapObserver for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Entry = T; type Entry = T;
@ -717,7 +829,14 @@ where
impl<'a, T> AsSlice<T> for VariableMapObserver<'a, T> impl<'a, T> AsSlice<T> for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
#[inline] #[inline]
fn as_slice(&self) -> &[T] { fn as_slice(&self) -> &[T] {
@ -727,7 +846,7 @@ where
} }
impl<'a, T> AsMutSlice<T> for VariableMapObserver<'a, T> impl<'a, T> AsMutSlice<T> for VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[inline] #[inline]
fn as_mut_slice(&mut self) -> &mut [T] { fn as_mut_slice(&mut self) -> &mut [T] {
@ -737,7 +856,7 @@ where
impl<'a, T> VariableMapObserver<'a, T> impl<'a, T> VariableMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
/// Creates a new [`MapObserver`] /// Creates a new [`MapObserver`]
pub fn new(name: &'static str, map: &'a mut [T], size: &'a mut usize) -> Self { pub fn new(name: &'static str, map: &'a mut [T], size: &'a mut usize) -> Self {
@ -957,7 +1076,7 @@ where
#[allow(clippy::unsafe_derive_deserialize)] #[allow(clippy::unsafe_derive_deserialize)]
pub struct MultiMapObserver<'a, T> pub struct MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + Debug, T: Default + Copy + 'static + Serialize + Debug,
{ {
maps: Vec<OwnedSliceMut<'a, T>>, maps: Vec<OwnedSliceMut<'a, T>>,
intervals: IntervalTree<usize, usize>, intervals: IntervalTree<usize, usize>,
@ -969,7 +1088,7 @@ where
impl<'a, I, S, T> Observer<I, S> for MultiMapObserver<'a, T> impl<'a, I, S, T> Observer<I, S> for MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
Self: MapObserver, Self: MapObserver,
{ {
#[inline] #[inline]
@ -980,7 +1099,7 @@ where
impl<'a, T> Named for MultiMapObserver<'a, T> impl<'a, T> Named for MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[inline] #[inline]
fn name(&self) -> &str { fn name(&self) -> &str {
@ -990,7 +1109,7 @@ where
impl<'a, T> HasLen for MultiMapObserver<'a, T> impl<'a, T> HasLen for MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[inline] #[inline]
fn len(&self) -> usize { fn len(&self) -> usize {
@ -1000,7 +1119,14 @@ where
impl<'a, T> MapObserver for MultiMapObserver<'a, T> impl<'a, T> MapObserver for MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Entry = T; type Entry = T;
@ -1073,7 +1199,7 @@ where
impl<'a, T> MultiMapObserver<'a, T> impl<'a, T> MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
/// Creates a new [`MultiMapObserver`] /// Creates a new [`MultiMapObserver`]
#[must_use] #[must_use]
@ -1132,7 +1258,7 @@ where
impl<'a, 'it, T> AsRefIterator<'it> for MultiMapObserver<'a, T> impl<'a, 'it, T> AsRefIterator<'it> for MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
'a: 'it, 'a: 'it,
{ {
type Item = T; type Item = T;
@ -1145,7 +1271,7 @@ where
impl<'a, 'it, T> AsMutIterator<'it> for MultiMapObserver<'a, T> impl<'a, 'it, T> AsMutIterator<'it> for MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
'a: 'it, 'a: 'it,
{ {
type Item = T; type Item = T;
@ -1158,7 +1284,7 @@ where
impl<'a, 'it, T> IntoIterator for &'it MultiMapObserver<'a, T> impl<'a, 'it, T> IntoIterator for &'it MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
type Item = <Iter<'it, T> as Iterator>::Item; type Item = <Iter<'it, T> as Iterator>::Item;
type IntoIter = Flatten<Iter<'it, OwnedSliceMut<'a, T>>>; type IntoIter = Flatten<Iter<'it, OwnedSliceMut<'a, T>>>;
@ -1170,7 +1296,7 @@ where
impl<'a, 'it, T> IntoIterator for &'it mut MultiMapObserver<'a, T> impl<'a, 'it, T> IntoIterator for &'it mut MultiMapObserver<'a, T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
type Item = <IterMut<'it, T> as Iterator>::Item; type Item = <IterMut<'it, T> as Iterator>::Item;
type IntoIter = Flatten<IterMut<'it, OwnedSliceMut<'a, T>>>; type IntoIter = Flatten<IterMut<'it, OwnedSliceMut<'a, T>>>;
@ -1187,7 +1313,7 @@ where
#[allow(clippy::unsafe_derive_deserialize)] #[allow(clippy::unsafe_derive_deserialize)]
pub struct OwnedMapObserver<T> pub struct OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize, T: Default + Copy + 'static + Serialize,
{ {
map: Vec<T>, map: Vec<T>,
initial: T, initial: T,
@ -1196,7 +1322,7 @@ where
impl<I, S, T> Observer<I, S> for OwnedMapObserver<T> impl<I, S, T> Observer<I, S> for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
Self: MapObserver, Self: MapObserver,
{ {
#[inline] #[inline]
@ -1207,7 +1333,7 @@ where
impl<T> Named for OwnedMapObserver<T> impl<T> Named for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn name(&self) -> &str { fn name(&self) -> &str {
@ -1217,7 +1343,7 @@ where
impl<T> HasLen for OwnedMapObserver<T> impl<T> HasLen for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
#[inline] #[inline]
fn len(&self) -> usize { fn len(&self) -> usize {
@ -1227,7 +1353,7 @@ where
impl<'a, 'it, T> AsRefIterator<'it> for OwnedMapObserver<T> impl<'a, 'it, T> AsRefIterator<'it> for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
type Item = T; type Item = T;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -1239,7 +1365,7 @@ where
impl<'a, 'it, T> AsMutIterator<'it> for OwnedMapObserver<T> impl<'a, 'it, T> AsMutIterator<'it> for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
type Item = T; type Item = T;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -1251,7 +1377,7 @@ where
impl<'it, T> IntoIterator for &'it OwnedMapObserver<T> impl<'it, T> IntoIterator for &'it OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
type Item = <Iter<'it, T> as Iterator>::Item; type Item = <Iter<'it, T> as Iterator>::Item;
type IntoIter = Iter<'it, T>; type IntoIter = Iter<'it, T>;
@ -1263,7 +1389,7 @@ where
impl<'it, T> IntoIterator for &'it mut OwnedMapObserver<T> impl<'it, T> IntoIterator for &'it mut OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
type Item = <IterMut<'it, T> as Iterator>::Item; type Item = <IterMut<'it, T> as Iterator>::Item;
type IntoIter = IterMut<'it, T>; type IntoIter = IterMut<'it, T>;
@ -1275,7 +1401,14 @@ where
impl<T> MapObserver for OwnedMapObserver<T> impl<T> MapObserver for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Bounded
+ PartialEq
+ Default
+ Copy
+ 'static
+ Serialize
+ serde::de::DeserializeOwned
+ Debug,
{ {
type Entry = T; type Entry = T;
@ -1320,7 +1453,7 @@ where
impl<T> AsSlice<T> for OwnedMapObserver<T> impl<T> AsSlice<T> for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[must_use] #[must_use]
#[inline] #[inline]
@ -1330,7 +1463,7 @@ where
} }
impl<T> AsMutSlice<T> for OwnedMapObserver<T> impl<T> AsMutSlice<T> for OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned + Debug,
{ {
#[must_use] #[must_use]
#[inline] #[inline]
@ -1341,7 +1474,7 @@ where
impl<T> OwnedMapObserver<T> impl<T> OwnedMapObserver<T>
where where
T: PrimInt + Default + Copy + 'static + Serialize + serde::de::DeserializeOwned, T: Default + Copy + 'static + Serialize + serde::de::DeserializeOwned,
{ {
/// Creates a new [`MapObserver`] with an owned map /// Creates a new [`MapObserver`] with an owned map
#[must_use] #[must_use]