diff options
| author | Max Audron <audron@cocaine.farm> | 2021-08-17 18:39:25 +0200 |
|---|---|---|
| committer | Max Audron <audron@cocaine.farm> | 2021-09-28 18:15:50 +0200 |
| commit | 47d7ba678d38ad947acbd1e3daefa7cad7e3e70d (patch) | |
| tree | dd214107a34c71927661fcc7ecce76f2b83733b3 | |
| parent | fix trailing semicolon match_variant macro (diff) | |
rename override_type to type
| -rw-r--r-- | src/message/signalproxy/objects/identity.rs | 2 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/ignorelistmanager.rs | 6 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/networkinfo.rs | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/message/signalproxy/objects/identity.rs b/src/message/signalproxy/objects/identity.rs index 744e777..3c05c87 100644 --- a/src/message/signalproxy/objects/identity.rs +++ b/src/message/signalproxy/objects/identity.rs @@ -9,7 +9,7 @@ pub struct Identity { identity_name: String, #[network(rename = "realName")] real_name: String, - #[network(rename = "nicks", override_type = "StringList")] + #[network(rename = "nicks", type = "StringList")] nicks: Vec<String>, #[network(rename = "awayNick")] away_nick: String, diff --git a/src/message/signalproxy/objects/ignorelistmanager.rs b/src/message/signalproxy/objects/ignorelistmanager.rs index cb51f21..f98ed36 100644 --- a/src/message/signalproxy/objects/ignorelistmanager.rs +++ b/src/message/signalproxy/objects/ignorelistmanager.rs @@ -35,15 +35,15 @@ pub struct IgnoreListManager { #[derive(Debug, Clone, PartialEq, Network)] #[network(repr = "maplist")] pub struct IgnoreListItem { - #[network(rename = "ignoreType", network, override_type = "u8")] + #[network(rename = "ignoreType", network, type = "u8")] ignore_type: IgnoreType, #[network(rename = "ignoreRule")] ignore_rule: String, #[network(rename = "isRegEx")] is_reg_ex: bool, - #[network(rename = "strictness", network, override_type = "u8")] + #[network(rename = "strictness", network, type = "u8")] strictness: StrictnessType, - #[network(rename = "scope", network, override_type = "u8")] + #[network(rename = "scope", network, type = "u8")] scope: ScopeType, #[network(rename = "scopeRule")] scope_rule: String, diff --git a/src/message/signalproxy/objects/networkinfo.rs b/src/message/signalproxy/objects/networkinfo.rs index e5aa6ea..49351ad 100644 --- a/src/message/signalproxy/objects/networkinfo.rs +++ b/src/message/signalproxy/objects/networkinfo.rs @@ -26,11 +26,11 @@ pub struct NetworkInfo { pub sasl_password: String, // ByteArray - #[network(rename = "codecForServer", override_type = "ByteArray")] + #[network(rename = "codecForServer", type = "ByteArray")] pub codec_for_server: String, - #[network(rename = "codecForEncoding", override_type = "ByteArray")] + #[network(rename = "codecForEncoding", type = "ByteArray")] pub codec_for_encoding: String, - #[network(rename = "codecForDecoding", override_type = "ByteArray")] + #[network(rename = "codecForDecoding", type = "ByteArray")] pub codec_for_decoding: String, // TODO add these type aliases or usertypes in variants |