From 1228ea79e10619e672e8b69085851af106030a99 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 9 Aug 2022 22:15:07 +0800
Subject: [PATCH] Get rid of some phantomdata
---
sshproto/src/behaviour.rs | 5 -----
sshproto/src/kex.rs | 1 -
sshproto/src/packets.rs | 1 -
3 files changed, 7 deletions(-)
diff --git a/sshproto/src/behaviour.rs b/sshproto/src/behaviour.rs
index 8fd0e68..ec34231 100644
--- a/sshproto/src/behaviour.rs
+++ b/sshproto/src/behaviour.rs
@@ -9,7 +9,6 @@ use core::task::{Waker,Poll};
use core::future::Future;
use core::mem;
use core::fmt;
-use core::marker::PhantomData;
use heapless::spsc::{Queue,Producer,Consumer};
@@ -50,8 +49,6 @@ pub struct Behaviour<'a> {
inner: crate::async_behaviour::AsyncCliServ<'a>,
#[cfg(not(feature = "std"))]
inner: crate::block_behaviour::BlockCliServ<'a>,
-
- pub phantom: PhantomData<&'a ()>,
}
#[cfg(feature = "std")]
@@ -59,14 +56,12 @@ impl<'a> Behaviour<'a> {
pub fn new_async_client(b: &'a mut (dyn AsyncCliBehaviour + Send)) -> Self {
Self {
inner: async_behaviour::AsyncCliServ::Client(b),
- phantom: PhantomData::default(),
}
}
pub fn new_async_server(b: &'a mut (dyn AsyncServBehaviour + Send)) -> Self {
Self {
inner: async_behaviour::AsyncCliServ::Server(b),
- phantom: PhantomData::default(),
}
}
diff --git a/sshproto/src/kex.rs b/sshproto/src/kex.rs
index ef3b8e4..fc82b50 100644
--- a/sshproto/src/kex.rs
+++ b/sshproto/src/kex.rs
@@ -7,7 +7,6 @@ use {
};
use core::fmt;
-use core::marker::PhantomData;
use sha2::Sha256;
use digest::Digest;
diff --git a/sshproto/src/packets.rs b/sshproto/src/packets.rs
index ed4b73c..89e2405 100644
--- a/sshproto/src/packets.rs
+++ b/sshproto/src/packets.rs
@@ -4,7 +4,6 @@
use core::borrow::BorrowMut;
use core::cell::Cell;
use core::fmt;
-use core::marker::PhantomData;
#[allow(unused_imports)]
use {
crate::error::{Error, Result, TrapBug},
--
GitLab