Skip to content

Commit 3ae474a

Browse files
committed
chore: rename fns
1 parent dc2b714 commit 3ae474a

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

rust/examples/basic/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ pub enum AppVersioned {
1919
impl vbare::OwnedVersionedData for AppVersioned {
2020
type Latest = schemas::v3::App;
2121

22-
fn latest(latest: Self::Latest) -> Self {
22+
fn wrap_latest(latest: Self::Latest) -> Self {
2323
AppVersioned::V3(latest)
2424
}
2525

26-
fn into_latest(self) -> Result<Self::Latest> {
26+
fn unwrap_latest(self) -> Result<Self::Latest> {
2727
match self {
2828
AppVersioned::V3(app) => Ok(app),
2929
_ => bail!("version not latest"),

rust/vbare/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use anyhow::{bail, Result};
33
pub trait VersionedData<'a>: Sized {
44
type Latest;
55

6-
fn latest(latest: Self::Latest) -> Self;
7-
fn into_latest(self) -> Result<Self::Latest>;
6+
fn wrap_latest(latest: Self::Latest) -> Self;
7+
fn unwrap_latest(self) -> Result<Self::Latest>;
88
fn deserialize_version(payload: &'a [u8], version: u16) -> Result<Self>;
99
fn serialize_version(self, version: u16) -> Result<Vec<u8>>;
1010

@@ -36,7 +36,7 @@ pub trait VersionedData<'a>: Sized {
3636
data = converter(data)?;
3737
}
3838

39-
data.into_latest()
39+
data.unwrap_latest()
4040
}
4141

4242
fn serialize(self, version: u16) -> Result<Vec<u8>> {
@@ -77,8 +77,8 @@ pub trait VersionedData<'a>: Sized {
7777
pub trait OwnedVersionedData: Sized {
7878
type Latest;
7979

80-
fn latest(latest: Self::Latest) -> Self;
81-
fn into_latest(self) -> Result<Self::Latest>;
80+
fn wrap_latest(latest: Self::Latest) -> Self;
81+
fn unwrap_latest(self) -> Result<Self::Latest>;
8282
fn deserialize_version(payload: &[u8], version: u16) -> Result<Self>;
8383
fn serialize_version(self, version: u16) -> Result<Vec<u8>>;
8484

@@ -110,7 +110,7 @@ pub trait OwnedVersionedData: Sized {
110110
data = converter(data)?;
111111
}
112112

113-
data.into_latest()
113+
data.unwrap_latest()
114114
}
115115

116116
fn serialize(self, version: u16) -> Result<Vec<u8>> {

rust/vbare/tests/test.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ enum TestData {
2424
impl OwnedVersionedData for TestData {
2525
type Latest = TestDataV2;
2626

27-
fn latest(latest: TestDataV2) -> Self {
27+
fn wrap_latest(latest: TestDataV2) -> Self {
2828
TestData::V2(latest)
2929
}
3030

31-
fn into_latest(self) -> Result<Self::Latest> {
31+
fn unwrap_latest(self) -> Result<Self::Latest> {
3232
#[allow(irrefutable_let_patterns)]
3333
if let TestData::V2(data) = self {
3434
Ok(data)
@@ -75,11 +75,11 @@ enum TestDataNoConverters {
7575
impl OwnedVersionedData for TestDataNoConverters {
7676
type Latest = TestDataNoConvertersV1;
7777

78-
fn latest(latest: TestDataNoConvertersV1) -> Self {
78+
fn wrap_latest(latest: TestDataNoConvertersV1) -> Self {
7979
TestDataNoConverters::V1(latest)
8080
}
8181

82-
fn into_latest(self) -> Result<Self::Latest> {
82+
fn unwrap_latest(self) -> Result<Self::Latest> {
8383
#[allow(irrefutable_let_patterns)]
8484
if let TestDataNoConverters::V1(data) = self {
8585
Ok(data)

0 commit comments

Comments
 (0)