This commit is contained in:
Eugene Pankov 2022-07-27 00:14:46 +02:00
parent 38cc33e87b
commit 8061cdcf9b
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
2 changed files with 16 additions and 16 deletions

View file

@ -83,7 +83,7 @@ impl TerminalRecorder {
}
async fn write_item(&mut self, item: &TerminalRecordingItem) -> Result<()> {
let mut serialized_item = serde_json::to_vec(&item).map_err(|e| Error::Serialization(e))?;
let mut serialized_item = serde_json::to_vec(&item).map_err(Error::Serialization)?;
serialized_item.push(b'\n');
self.writer.write(&serialized_item).await?;
Ok(())

View file

@ -40,7 +40,7 @@ impl TlsCertificateBundle {
.collect::<Vec<Certificate>>()
})?;
if certificates.is_empty() {
return Err(RustlsSetupError::NoCertificates)
return Err(RustlsSetupError::NoCertificates);
}
Ok(Self {
bytes,
@ -77,30 +77,30 @@ impl TlsPrivateKey {
}
}
impl Into<Vec<u8>> for TlsCertificateBundle {
fn into(self) -> Vec<u8> {
self.bytes
impl From<TlsCertificateBundle> for Vec<u8> {
fn from(val: TlsCertificateBundle) -> Self {
val.bytes
}
}
impl Into<Vec<u8>> for TlsPrivateKey {
fn into(self) -> Vec<u8> {
self.bytes
impl From<TlsPrivateKey> for Vec<u8> {
fn from(val: TlsPrivateKey) -> Self {
val.bytes
}
}
impl Into<RustlsCertificate> for TlsCertificateAndPrivateKey {
fn into(self) -> RustlsCertificate {
impl From<TlsCertificateAndPrivateKey> for RustlsCertificate {
fn from(val: TlsCertificateAndPrivateKey) -> Self {
RustlsCertificate::new()
.cert(self.certificate)
.key(self.private_key)
.cert(val.certificate)
.key(val.private_key)
}
}
impl Into<CertifiedKey> for TlsCertificateAndPrivateKey {
fn into(self) -> CertifiedKey {
let cert = self.certificate;
let key = self.private_key;
impl From<TlsCertificateAndPrivateKey> for CertifiedKey {
fn from(val: TlsCertificateAndPrivateKey) -> Self {
let cert = val.certificate;
let key = val.private_key;
CertifiedKey {
cert: cert.certificates,
key: key.key,