aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.toml2
-rw-r--r--derive/Cargo.toml2
-rw-r--r--derive/src/sync/mod.rs8
-rw-r--r--examples/statetracker/Cargo.toml2
-rw-r--r--src/frame/mod.rs1
-rw-r--r--src/message/handshake/sessioninit.rs2
-rw-r--r--src/message/handshake/types.rs1
-rw-r--r--src/message/signalproxy/mod.rs3
-rw-r--r--src/message/signalproxy/objects/aliasmanager.rs3
-rw-r--r--src/message/signalproxy/objects/buffersyncer.rs10
-rw-r--r--src/message/signalproxy/objects/bufferviewconfig.rs2
-rw-r--r--src/message/signalproxy/objects/bufferviewmanager.rs8
-rw-r--r--src/message/signalproxy/objects/ignorelistmanager.rs2
-rw-r--r--src/message/signalproxy/objects/ircchannel.rs2
-rw-r--r--src/message/signalproxy/objects/mod.rs2
-rw-r--r--src/message/signalproxy/objects/network.rs1
-rw-r--r--src/message/signalproxy/translation/mod.rs2
-rw-r--r--src/primitive/message.rs2
-rw-r--r--src/primitive/stringlist.rs1
-rw-r--r--src/primitive/variantlist.rs1
-rw-r--r--src/primitive/variantmap.rs2
-rw-r--r--src/util.rs1
22 files changed, 19 insertions, 41 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 5c7749f..e6ee427 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Max Audron <audron@cocaine.farm>"]
license = "ISC"
homepage = "https://gitlab.com/cocainefarm/libquassel"
repository = "https://gitlab.com/cocainefarm/libquassel"
-edition = "2018"
+edition = "2021"
autobins = true
include = ["src/**/*", "LICENSE", "README.md"]
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
index bc4ed2f..53b910d 100644
--- a/derive/Cargo.toml
+++ b/derive/Cargo.toml
@@ -2,7 +2,7 @@
name = "libquassel-derive"
version = "0.1.0"
authors = ["Max Audron <audron@cocaine.farm>"]
-edition = "2018"
+edition = "2021"
[lib]
proc-macro = true
diff --git a/derive/src/sync/mod.rs b/derive/src/sync/mod.rs
index 40dea74..2e1df4f 100644
--- a/derive/src/sync/mod.rs
+++ b/derive/src/sync/mod.rs
@@ -10,8 +10,8 @@ use syn::{
#[derive(Debug)]
struct Sync {
name: Expr,
- token: Token![,],
- brace_token: token::Bracket,
+ _token: Token![,],
+ _brace_token: token::Bracket,
fields: Punctuated<Expr, Token![,]>,
}
@@ -20,8 +20,8 @@ impl Parse for Sync {
let content;
Ok(Sync {
name: input.parse()?,
- token: input.parse()?,
- brace_token: bracketed!(content in input),
+ _token: input.parse()?,
+ _brace_token: bracketed!(content in input),
fields: content.parse_terminated(Expr::parse)?,
})
}
diff --git a/examples/statetracker/Cargo.toml b/examples/statetracker/Cargo.toml
index fd86a7c..064b222 100644
--- a/examples/statetracker/Cargo.toml
+++ b/examples/statetracker/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "statetracker"
version = "0.1.0"
-edition = "2018"
+edition = "2021"
[dependencies]
libquassel = { path = "../../", features = ["framing", "all-quassel-features", "client", "server"] }
diff --git a/src/frame/mod.rs b/src/frame/mod.rs
index 34a8514..1c2f859 100644
--- a/src/frame/mod.rs
+++ b/src/frame/mod.rs
@@ -1,4 +1,3 @@
-use std::convert::TryInto;
use std::error::Error as StdError;
use std::fmt;
use std::io::{self, Cursor};
diff --git a/src/message/handshake/sessioninit.rs b/src/message/handshake/sessioninit.rs
index fa99f32..04f3cff 100644
--- a/src/message/handshake/sessioninit.rs
+++ b/src/message/handshake/sessioninit.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use crate::message::objects::Identity;
use crate::primitive::{BufferInfo, Variant, VariantMap};
use crate::HandshakeSerialize;
diff --git a/src/message/handshake/types.rs b/src/message/handshake/types.rs
index e9e6469..6d4960d 100644
--- a/src/message/handshake/types.rs
+++ b/src/message/handshake/types.rs
@@ -1,4 +1,3 @@
-use std::convert::TryInto;
use std::result::Result;
use std::vec::Vec;
diff --git a/src/message/signalproxy/mod.rs b/src/message/signalproxy/mod.rs
index ac84fcb..6b96909 100644
--- a/src/message/signalproxy/mod.rs
+++ b/src/message/signalproxy/mod.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use crate::{
deserialize::Deserialize,
primitive::{Variant, VariantList},
@@ -30,6 +28,7 @@ use once_cell::sync::OnceCell;
pub static SYNC_PROXY: OnceCell<SyncProxy> = OnceCell::new();
#[derive(Debug, Clone)]
+#[allow(dead_code)]
pub struct SyncProxy {
sync_channel: crossbeam_channel::Sender<SyncMessage>,
rpc_channel: crossbeam_channel::Sender<RpcCall>,
diff --git a/src/message/signalproxy/objects/aliasmanager.rs b/src/message/signalproxy/objects/aliasmanager.rs
index b24ff87..6aa7b06 100644
--- a/src/message/signalproxy/objects/aliasmanager.rs
+++ b/src/message/signalproxy/objects/aliasmanager.rs
@@ -1,4 +1,3 @@
-
use libquassel_derive::{NetworkList, NetworkMap};
#[allow(unused_imports)]
@@ -12,8 +11,6 @@ use crate::message::signalproxy::translation::NetworkMap;
#[allow(unused_imports)]
use crate::primitive::VariantMap;
-#[allow(unused_imports)]
-use std::convert::TryFrom;
/// AliasManager
/// keeps a list of all registered aliases
diff --git a/src/message/signalproxy/objects/buffersyncer.rs b/src/message/signalproxy/objects/buffersyncer.rs
index c40091e..ca68ade 100644
--- a/src/message/signalproxy/objects/buffersyncer.rs
+++ b/src/message/signalproxy/objects/buffersyncer.rs
@@ -1,11 +1,12 @@
-use std::{collections::HashMap, convert::TryInto};
+use std::collections::HashMap;
-use crate::{message::Syncable, primitive::MessageType};
+use crate::{
+ message::{signalproxy::translation::Network, Syncable},
+ primitive::MessageType,
+};
use libquassel_derive::{sync, NetworkList, NetworkMap};
-use crate::message::signalproxy::translation::Network;
-
#[derive(Debug, Clone, PartialEq, NetworkList, NetworkMap)]
pub struct BufferSyncer {
#[network(rename = "Activities", network, variant = "VariantList")]
@@ -97,6 +98,7 @@ impl BufferSyncer {
// TODO actually rename the buffer in whereever we should store buffers
// and the BufferView
+ #[allow(unused_variables)]
pub fn rename_buffer(&mut self, id: i32, name: String) {
#[cfg(feature = "server")]
sync!("renameBuffer", [id, name]);
diff --git a/src/message/signalproxy/objects/bufferviewconfig.rs b/src/message/signalproxy/objects/bufferviewconfig.rs
index 3b82e7e..e413a5f 100644
--- a/src/message/signalproxy/objects/bufferviewconfig.rs
+++ b/src/message/signalproxy/objects/bufferviewconfig.rs
@@ -1,5 +1,3 @@
-use std::{convert::TryFrom, convert::TryInto};
-
use libquassel_derive::sync;
use libquassel_derive::{NetworkList, NetworkMap};
diff --git a/src/message/signalproxy/objects/bufferviewmanager.rs b/src/message/signalproxy/objects/bufferviewmanager.rs
index 182fa1d..63c48e4 100644
--- a/src/message/signalproxy/objects/bufferviewmanager.rs
+++ b/src/message/signalproxy/objects/bufferviewmanager.rs
@@ -1,9 +1,6 @@
-use std::{collections::HashMap, convert::TryFrom, convert::TryInto};
+use std::collections::HashMap;
use libquassel_derive::sync;
-use libquassel_derive::{NetworkList, NetworkMap};
-
-use crate::message::signalproxy::translation::Network;
#[allow(unused_imports)]
use crate::message::StatefulSyncableClient;
@@ -49,6 +46,7 @@ impl BufferViewManager {
}
#[cfg(feature = "client")]
+ #[allow(unused_variables)]
pub fn add_buffer_view_config(&mut self, id: i32) {
// TODO init!("BufferViewConfig", id);
}
@@ -165,7 +163,7 @@ impl super::NetworkMap for BufferViewManager {
return res;
}
- fn from_network_map(input: &mut Self::Item) -> Self {
+ fn from_network_map(_input: &mut Self::Item) -> Self {
// TODO Somehow do the initrequests for all the IDs we get here
Self {
buffer_view_configs: HashMap::new(),
diff --git a/src/message/signalproxy/objects/ignorelistmanager.rs b/src/message/signalproxy/objects/ignorelistmanager.rs
index a3d9798..afbde5b 100644
--- a/src/message/signalproxy/objects/ignorelistmanager.rs
+++ b/src/message/signalproxy/objects/ignorelistmanager.rs
@@ -1,8 +1,6 @@
use crate::message::signalproxy::translation::{Network, NetworkMap};
use libquassel_derive::{NetworkList, NetworkMap};
-use std::convert::TryFrom;
-
#[derive(Debug, Clone, PartialEq, NetworkList)]
pub struct IgnoreListManager {
#[network(rename = "IgnoreList", variant = "VariantMap", network, map)]
diff --git a/src/message/signalproxy/objects/ircchannel.rs b/src/message/signalproxy/objects/ircchannel.rs
index 16f1f10..a977a2e 100644
--- a/src/message/signalproxy/objects/ircchannel.rs
+++ b/src/message/signalproxy/objects/ircchannel.rs
@@ -1,6 +1,4 @@
use std::collections::HashMap;
-use std::convert::TryFrom;
-use std::convert::TryInto;
use crate::message::NetworkMap;
use crate::primitive::{StringList, Variant, VariantList, VariantMap};
diff --git a/src/message/signalproxy/objects/mod.rs b/src/message/signalproxy/objects/mod.rs
index 743392f..664d46c 100644
--- a/src/message/signalproxy/objects/mod.rs
+++ b/src/message/signalproxy/objects/mod.rs
@@ -12,8 +12,6 @@ mod ircuser;
mod network;
mod networkinfo;
-use std::convert::TryInto;
-
pub use aliasmanager::*;
pub use buffersyncer::*;
pub use bufferviewmanager::*;
diff --git a/src/message/signalproxy/objects/network.rs b/src/message/signalproxy/objects/network.rs
index 2fa4c49..9b6a7d1 100644
--- a/src/message/signalproxy/objects/network.rs
+++ b/src/message/signalproxy/objects/network.rs
@@ -1,5 +1,4 @@
use std::collections::HashMap;
-use std::convert::TryInto;
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::FromPrimitive;
diff --git a/src/message/signalproxy/translation/mod.rs b/src/message/signalproxy/translation/mod.rs
index a6e26b4..ae1adce 100644
--- a/src/message/signalproxy/translation/mod.rs
+++ b/src/message/signalproxy/translation/mod.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
/**
Quassel has 3 main ways to represent an object over the Network:
diff --git a/src/primitive/message.rs b/src/primitive/message.rs
index e73f3dd..ff992e3 100644
--- a/src/primitive/message.rs
+++ b/src/primitive/message.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, convert::TryInto, vec::Vec};
+use std::{collections::HashMap, vec::Vec};
use failure::Error;
diff --git a/src/primitive/stringlist.rs b/src/primitive/stringlist.rs
index ceea63e..434f2f2 100644
--- a/src/primitive/stringlist.rs
+++ b/src/primitive/stringlist.rs
@@ -1,6 +1,5 @@
extern crate byteorder;
-use std::convert::TryInto;
use std::result::Result;
use std::vec::Vec;
diff --git a/src/primitive/variantlist.rs b/src/primitive/variantlist.rs
index 2d20ae2..b3ca720 100644
--- a/src/primitive/variantlist.rs
+++ b/src/primitive/variantlist.rs
@@ -1,4 +1,3 @@
-use std::convert::TryInto;
use std::vec::Vec;
use failure::Error;
diff --git a/src/primitive/variantmap.rs b/src/primitive/variantmap.rs
index 8c1032d..1eeb006 100644
--- a/src/primitive/variantmap.rs
+++ b/src/primitive/variantmap.rs
@@ -1,5 +1,5 @@
use std::collections::HashMap;
-use std::{convert::TryInto, vec::Vec};
+use std::vec::Vec;
use failure::Error;
diff --git a/src/util.rs b/src/util.rs
index 5f52573..251e089 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -22,7 +22,6 @@ macro_rules! match_variant {
/// Prepend the length of `buf` to `buf`
pub fn prepend_byte_len(buf: &mut Vec<u8>) {
- use std::convert::TryInto;
let len: i32 = buf.len().try_into().unwrap();
let ulen: &[u8] = &len.to_be_bytes();
buf.insert(0, ulen[3]);
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-02 13:18:37 +0000