Skip to content

Commit 8a80477

Browse files
committed
Fix from comment @mkj comment on Name
Fixed according to the indications in the next discussion: mkj#29 (comment) Adding the expanded version for reference too Thanks
1 parent af2e05a commit 8a80477

2 files changed

Lines changed: 14 additions & 31 deletions

File tree

sftp/out/cargo-expand-sftp.rs

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ extern crate std;
66
mod proto {
77
use num_enum::FromPrimitive;
88
use paste::paste;
9-
use sunset::error;
10-
use sunset::error::Error as SunsetError;
11-
use sunset::packets::{MessageNumber, Packet, Unknown};
129
use sunset::sshwire::{
1310
BinString, SSHDecode, SSHEncode, SSHSink, SSHSource, TextString, WireError,
1411
WireResult,
@@ -41,7 +38,7 @@ mod proto {
4138
Ok(Self(::sunset::sshwire::SSHDecode::dec(s)?))
4239
}
4340
}
44-
struct FileHandle<'a>(pub BinString<'a>);
41+
pub struct FileHandle<'a>(pub BinString<'a>);
4542
#[automatically_derived]
4643
impl<'a> ::core::fmt::Debug for FileHandle<'a> {
4744
#[inline]
@@ -502,15 +499,18 @@ mod proto {
502499
})
503500
}
504501
}
505-
pub struct Name<'de>(pub Vec<NameEntry<'de>>);
502+
pub struct Name<'a>(pub Vec<NameEntry<'a>>);
506503
#[automatically_derived]
507-
impl<'de> ::core::fmt::Debug for Name<'de> {
504+
impl<'a> ::core::fmt::Debug for Name<'a> {
508505
#[inline]
509506
fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
510507
::core::fmt::Formatter::debug_tuple_field1_finish(f, "Name", &&self.0)
511508
}
512509
}
513-
impl<'de> SSHDecode<'de> for Name<'de> {
510+
impl<'a: 'de, 'de> SSHDecode<'de> for Name<'a>
511+
where
512+
'de: 'a,
513+
{
514514
fn dec<S>(s: &mut S) -> WireResult<Self>
515515
where
516516
S: SSHSource<'de>,
@@ -523,7 +523,7 @@ mod proto {
523523
Ok(Name(names))
524524
}
525525
}
526-
impl SSHEncode for Name<'_> {
526+
impl<'a> SSHEncode for Name<'a> {
527527
fn enc(&self, s: &mut dyn SSHSink) -> WireResult<()> {
528528
(self.0.len() as u32).enc(s)?;
529529
for element in self.0.iter() {
@@ -930,26 +930,6 @@ mod proto {
930930
Ok(attrs)
931931
}
932932
}
933-
pub enum Error {
934-
UnknownPacket { number: u8 },
935-
}
936-
#[automatically_derived]
937-
impl ::core::fmt::Debug for Error {
938-
#[inline]
939-
fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
940-
match self {
941-
Error::UnknownPacket { number: __self_0 } => {
942-
::core::fmt::Formatter::debug_struct_field1_finish(
943-
f,
944-
"UnknownPacket",
945-
"number",
946-
&__self_0,
947-
)
948-
}
949-
}
950-
}
951-
}
952-
pub type Result<T, E = Error> = core::result::Result<T, E>;
953933
#[repr(u8)]
954934
#[allow(non_camel_case_types)]
955935
pub enum SftpNum {

sftp/src/proto.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,12 @@ pub struct NameEntry<'a> {
9090
}
9191

9292
#[derive(Debug)]
93-
pub struct Name<'de>(pub Vec<NameEntry<'de>>);
93+
pub struct Name<'a>(pub Vec<NameEntry<'a>>);
9494

95-
impl<'de> SSHDecode<'de> for Name<'de> {
95+
impl<'a: 'de, 'de> SSHDecode<'de> for Name<'a>
96+
where
97+
'de: 'a,
98+
{
9699
fn dec<S>(s: &mut S) -> WireResult<Self>
97100
where
98101
S: SSHSource<'de>,
@@ -109,7 +112,7 @@ impl<'de> SSHDecode<'de> for Name<'de> {
109112
}
110113
}
111114

112-
impl SSHEncode for Name<'_> {
115+
impl<'a> SSHEncode for Name<'a> {
113116
fn enc(&self, s: &mut dyn SSHSink) -> WireResult<()> {
114117
(self.0.len() as u32).enc(s)?;
115118

0 commit comments

Comments
 (0)