From 8465010f3cb51d672b60df39a7dfd34624ab5c7c Mon Sep 17 00:00:00 2001 From: Max Audron Date: Fri, 1 Oct 2021 18:13:43 +0200 Subject: migrate to separated NetworkMap and NetworkList macros --- src/message/signalproxy/objects/ircuser.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/message/signalproxy/objects/ircuser.rs') diff --git a/src/message/signalproxy/objects/ircuser.rs b/src/message/signalproxy/objects/ircuser.rs index 85fea81..6b14c70 100644 --- a/src/message/signalproxy/objects/ircuser.rs +++ b/src/message/signalproxy/objects/ircuser.rs @@ -2,10 +2,10 @@ use crate::primitive::{DateTime, StringList}; #[allow(unused_imports)] use crate::message::signalproxy::Network; -use libquassel_derive::Network; +use libquassel_derive::NetworkMap; #[allow(dead_code)] -#[derive(Debug, Clone, PartialEq, Network)] +#[derive(Debug, Clone, PartialEq, NetworkMap)] #[network(repr = "maplist")] pub struct IrcUser { pub user: String, @@ -38,6 +38,7 @@ pub struct IrcUser { #[cfg(test)] mod tests { + use crate::message::signalproxy::NetworkMap; use crate::primitive::{Variant, VariantMap}; use time::OffsetDateTime; @@ -191,16 +192,16 @@ mod tests { #[test] fn ircuser_to_network() { - assert_eq!(get_runtime().to_network(), get_network()) + assert_eq!(get_runtime().to_network_map(), get_network()) } #[test] fn ircuser_from_network() { - assert_eq!(IrcUser::from_network(&mut get_network()), get_runtime()) + assert_eq!(IrcUser::from_network_map(&mut get_network()), get_runtime()) } #[test] fn vec_ircuser_to_network() { - assert_eq!(get_runtime().to_network(), get_network()) + assert_eq!(get_runtime().to_network_map(), get_network()) } } -- cgit v1.2.3