From 3aefd155a1ad572bbf50ffe1a9c8edbeadf4c5ee Mon Sep 17 00:00:00 2001 From: Emile Fugulin Date: Fri, 7 Jul 2023 14:13:38 -0400 Subject: [PATCH] fix: add const fn and copy where possible --- caido-convert/src/encoding/base32hex.rs | 6 +++--- caido-convert/src/encoding/base64.rs | 6 +++--- caido-convert/src/encoding/hex.rs | 6 +++--- caido-convert/src/encoding/html.rs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/caido-convert/src/encoding/base32hex.rs b/caido-convert/src/encoding/base32hex.rs index 04269fd..69d066e 100644 --- a/caido-convert/src/encoding/base32hex.rs +++ b/caido-convert/src/encoding/base32hex.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use crate::Operation; use crate::OperationError; -#[derive(Clone)] +#[derive(Clone, Copy)] #[cfg_attr(target_family = "wasm", derive(Serialize, Deserialize))] pub struct Base32HexDecode {} @@ -18,7 +18,7 @@ impl Operation for Base32HexDecode { } impl Base32HexDecode { - pub fn new() -> Self { + pub const fn new() -> Self { Base32HexDecode {} } } @@ -34,7 +34,7 @@ impl Operation for Base32HexEncode { } impl Base32HexEncode { - pub fn new() -> Self { + pub const fn new() -> Self { Base32HexEncode {} } } diff --git a/caido-convert/src/encoding/base64.rs b/caido-convert/src/encoding/base64.rs index 3e79dd8..2b48aa3 100644 --- a/caido-convert/src/encoding/base64.rs +++ b/caido-convert/src/encoding/base64.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use crate::Operation; use crate::OperationError; -#[derive(Clone)] +#[derive(Clone, Copy)] #[cfg_attr(target_family = "wasm", derive(Serialize, Deserialize))] #[cfg_attr(target_family = "wasm", serde(rename_all = "snake_case"))] pub enum Base64Format { @@ -35,7 +35,7 @@ impl Operation for Base64Decode { } impl Base64Decode { - pub fn new(format: Base64Format, pad: bool) -> Self { + pub const fn new(format: Base64Format, pad: bool) -> Self { Base64Decode { format, pad } } } @@ -61,7 +61,7 @@ impl Operation for Base64Encode { } impl Base64Encode { - pub fn new(format: Base64Format, pad: bool) -> Self { + pub const fn new(format: Base64Format, pad: bool) -> Self { Base64Encode { format, pad } } } diff --git a/caido-convert/src/encoding/hex.rs b/caido-convert/src/encoding/hex.rs index ba0cea1..fde1281 100644 --- a/caido-convert/src/encoding/hex.rs +++ b/caido-convert/src/encoding/hex.rs @@ -13,7 +13,7 @@ pub struct HexDecode { delimiter: Option, } -#[derive(Clone)] +#[derive(Clone, Copy)] #[cfg_attr(target_family = "wasm", derive(Serialize, Deserialize))] pub enum HexFormat { Upper, @@ -34,7 +34,7 @@ impl Operation for HexDecode { } impl HexDecode { - pub fn new(prefix: Option, delimiter: Option) -> Self { + pub const fn new(prefix: Option, delimiter: Option) -> Self { HexDecode { prefix, delimiter } } } @@ -79,7 +79,7 @@ impl Operation for HexEncode { } impl HexEncode { - pub fn new(format: HexFormat, prefix: Option, delimiter: Option) -> Self { + pub const fn new(format: HexFormat, prefix: Option, delimiter: Option) -> Self { HexEncode { format, prefix, diff --git a/caido-convert/src/encoding/html.rs b/caido-convert/src/encoding/html.rs index 4261146..8fefa8a 100644 --- a/caido-convert/src/encoding/html.rs +++ b/caido-convert/src/encoding/html.rs @@ -61,7 +61,7 @@ impl Operation for HtmlDecode { } impl HtmlDecode { - pub fn new() -> Self { + pub const fn new() -> Self { HtmlDecode {} } } @@ -88,7 +88,7 @@ impl Operation for HtmlEncode { } impl HtmlEncode { - pub fn new() -> Self { + pub const fn new() -> Self { HtmlEncode {} } }