vmario/fabaccess-bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2024-11-21 22:47:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make clion complain less

Browse Source
This commit is contained in:
Nadja Reitzenstein 2021-10-27 21:37:54 +02:00
parent b95d21a092
commit a336f83e75
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/state.rs
View File

@ -28,8 +28,7 @@ use serde::ser::SerializeMap;
use std::ops::Deref; use std::ops::Deref;
use std::fmt::Formatter; use std::fmt::Formatter;
use serde::Deserializer; use serde::Deserializer;
use serde::de::MapAccess; use serde::de::{Error, MapAccess};
use serde::de::Error as _;
#[derive(serde::Serialize, serde::Deserialize)] #[derive(serde::Serialize, serde::Deserialize)]
#[derive(Archive, Serialize, Deserialize)] #[derive(Archive, Serialize, Deserialize)]

25
src/state/value.rs
View File

@ -20,10 +20,10 @@ use std::collections::HashMap;
use std::alloc::Layout; use std::alloc::Layout;
use serde::ser::SerializeMap; use serde::ser::SerializeMap;
use std::fmt::Formatter; use std::fmt::Formatter;
use serde::de::Error as _; use serde::de::Error as SerdeError;
use std::mem::MaybeUninit; use std::mem::MaybeUninit;
/// Adding a custom type to BFFH state managenment: /// Adding a custom type to BFFH state management:
/// ///
/// 1. Implement `serde`'s [`Serialize`](serde::Serialize) and [`Deserialize`](serde::Deserialize) /// 1. Implement `serde`'s [`Serialize`](serde::Serialize) and [`Deserialize`](serde::Deserialize)
/// - `derive()`d instances work just fine, but keep stability over releases in mind. /// - `derive()`d instances work just fine, but keep stability over releases in mind.
@ -72,11 +72,11 @@ impl<T> Value for T
other.as_any().downcast_ref().map_or(false, |other: &T| other == self) other.as_any().downcast_ref().map_or(false, |other: &T| other == self)
} }
fn as_any(&self) -> &dyn Any { fn as_value(&self) -> &dyn Value {
self self
} }
fn as_value(&self) -> &dyn Value { fn as_any(&self) -> &dyn Any {
self self
} }
} }
@ -122,7 +122,7 @@ impl<'de> serde::de::Visitor<'de> for DynValVisitor {
{ {
// Bad magic code. Problem we have to solve: We only know how to parse whatever comes // Bad magic code. Problem we have to solve: We only know how to parse whatever comes
// after the OID after having looked at the OID. We have zero static type info available // after the OID after having looked at the OID. We have zero static type info available
// during deserialization. Soooooo: // during deserialization. So:
// Get OID first. That's easy, we know it's the key, we know how to read it. // Get OID first. That's easy, we know it's the key, we know how to read it.
let oid: ObjectIdentifier = map.next_key()? let oid: ObjectIdentifier = map.next_key()?
@ -193,9 +193,9 @@ impl<'de> serde::de::DeserializeSeed<'de> for InitIntoSelf {
} }
pub trait TypeOid { pub trait TypeOid {
fn get_type_oid() -> &'static ObjectIdentifier; fn type_oid() -> &'static ObjectIdentifier;
fn get_type_name() -> &'static str; fn type_name() -> &'static str;
fn get_type_desc() -> &'static str; fn type_desc() -> &'static str;
} }
impl<S: ScratchSpace + Serializer + ?Sized> SerializeUnsized<S> for dyn SerializeValue { impl<S: ScratchSpace + Serializer + ?Sized> SerializeUnsized<S> for dyn SerializeValue {
@ -312,7 +312,8 @@ pub struct ArchivedValueMetadata {
impl ArchivedValueMetadata { impl ArchivedValueMetadata {
pub unsafe fn emplace(type_oid: Archived<ObjectIdentifier>, out: *mut Self) { pub unsafe fn emplace(type_oid: Archived<ObjectIdentifier>, out: *mut Self) {
ptr::addr_of_mut!((*out).type_oid).write(type_oid); let p = ptr::addr_of_mut!((*out).type_oid);
ptr::write(p, type_oid);
} }
pub fn vtable(&self) -> usize { pub fn vtable(&self) -> usize {
@ -343,7 +344,7 @@ impl<'a> ImplId<'a> {
impl ImplId<'static> { impl ImplId<'static> {
fn new<T: TypeOid>() -> Self { fn new<T: TypeOid>() -> Self {
Self { Self {
type_oid: &T::get_type_oid() type_oid: &T::type_oid()
} }
} }
} }
@ -392,8 +393,8 @@ impl ImplEntry<'_> {
id: ImplId::new::<T>(), id: ImplId::new::<T>(),
data: ImplData { data: ImplData {
vtable: <T as RegisteredImpl>::vtable(), vtable: <T as RegisteredImpl>::vtable(),
name: <T as TypeOid>::get_type_name(), name: <T as TypeOid>::type_name(),
desc: <T as TypeOid>::get_type_desc(), desc: <T as TypeOid>::type_desc(),
info: <T as RegisteredImpl>::debug_info(), info: <T as RegisteredImpl>::debug_info(),
}, },
} }