Skip to content

Commit b550cd3

Browse files
tarkahtarkah
committed
Rename all payload types to *Record
1 parent 5e15331 commit b550cd3

File tree

24 files changed

+344
-328
lines changed

24 files changed

+344
-328
lines changed

‎boulder/src/package/collect.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use std::{
1212
use fs_err as fs;
1313
use glob::Pattern;
1414
use nix::libc::{S_IFDIR, S_IRGRP, S_IROTH, S_IRWXU, S_IXGRP, S_IXOTH};
15-
use stone::{StoneDigestWriter, StoneDigestWriterHasher, StonePayloadLayout, StonePayloadLayoutEntry};
15+
use stone::{StoneDigestWriter, StoneDigestWriterHasher, StonePayloadLayoutRecord, StonePayloadLayoutFile};
1616
use thiserror::Error;
1717

1818
#[derive(Debug, Clone, Eq, PartialEq)]
@@ -126,7 +126,7 @@ impl Collector {
126126
pub struct PathInfo {
127127
pub path: PathBuf,
128128
pub target_path: PathBuf,
129-
pub layout: StonePayloadLayout,
129+
pub layout: StonePayloadLayoutRecord,
130130
pub size: u64,
131131
pub package: String,
132132
}
@@ -158,7 +158,7 @@ impl PathInfo {
158158
}
159159

160160
pub fn is_file(&self) -> bool {
161-
matches!(self.layout.entry, StonePayloadLayoutEntry::Regular(_, _))
161+
matches!(self.layout.file, StonePayloadLayoutFile::Regular(_, _))
162162
}
163163

164164
pub fn file_name(&self) -> &str {
@@ -180,7 +180,7 @@ fn layout_from_metadata(
180180
target_path: &Path,
181181
metadata: &Metadata,
182182
hasher: &mut StoneDigestWriterHasher,
183-
) -> Result<StonePayloadLayout, Error> {
183+
) -> Result<StonePayloadLayoutRecord, Error> {
184184
// Strip /usr
185185
let target = target_path
186186
.strip_prefix("/usr")
@@ -190,25 +190,25 @@ fn layout_from_metadata(
190190

191191
let file_type = metadata.file_type();
192192

193-
Ok(StonePayloadLayout {
193+
Ok(StonePayloadLayoutRecord {
194194
uid: metadata.uid(),
195195
gid: metadata.gid(),
196196
mode: metadata.mode(),
197197
tag: 0,
198-
entry: if file_type.is_symlink() {
198+
file: if file_type.is_symlink() {
199199
let source = fs::read_link(path)?;
200200

201-
StonePayloadLayoutEntry::Symlink(source.to_string_lossy().to_string(), target)
201+
StonePayloadLayoutFile::Symlink(source.to_string_lossy().to_string(), target)
202202
} else if file_type.is_dir() {
203-
StonePayloadLayoutEntry::Directory(target)
203+
StonePayloadLayoutFile::Directory(target)
204204
} else if file_type.is_char_device() {
205-
StonePayloadLayoutEntry::CharacterDevice(target)
205+
StonePayloadLayoutFile::CharacterDevice(target)
206206
} else if file_type.is_block_device() {
207-
StonePayloadLayoutEntry::BlockDevice(target)
207+
StonePayloadLayoutFile::BlockDevice(target)
208208
} else if file_type.is_fifo() {
209-
StonePayloadLayoutEntry::Fifo(target)
209+
StonePayloadLayoutFile::Fifo(target)
210210
} else if file_type.is_socket() {
211-
StonePayloadLayoutEntry::Socket(target)
211+
StonePayloadLayoutFile::Socket(target)
212212
} else {
213213
hasher.reset();
214214

@@ -221,7 +221,7 @@ fn layout_from_metadata(
221221

222222
let hash = hasher.digest128();
223223

224-
StonePayloadLayoutEntry::Regular(hash, target)
224+
StonePayloadLayoutFile::Regular(hash, target)
225225
},
226226
})
227227
}

‎boulder/src/package/emit/manifest/binary.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ use std::{collections::BTreeSet, path::Path};
66

77
use fs_err::File;
88
use moss::Dependency;
9-
use stone::{StoneHeaderV1FileType, StonePayloadMeta, StonePayloadMetaKind, StonePayloadMetaTag, StoneWriter};
9+
use stone::{
10+
StoneHeaderV1FileType, StonePayloadMetaPrimitive, StonePayloadMetaRecord, StonePayloadMetaTag, StoneWriter,
11+
};
1012

1113
use super::Error;
1214
use crate::package::emit::Package;
@@ -26,9 +28,9 @@ pub fn write(path: &Path, packages: &BTreeSet<&Package>, build_deps: &BTreeSet<S
2628
// Add build deps
2729
for name in build_deps {
2830
if let Ok(dep) = Dependency::from_name(name) {
29-
payload.push(StonePayloadMeta {
31+
payload.push(StonePayloadMetaRecord {
3032
tag: StonePayloadMetaTag::BuildDepends,
31-
kind: StonePayloadMetaKind::Dependency(dep.kind.into(), dep.name),
33+
primitive: StonePayloadMetaPrimitive::Dependency(dep.kind.into(), dep.name),
3234
});
3335
}
3436
}

‎boulder/src/package/emit/manifest/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub fn write(
4242
.analysis
4343
.paths
4444
.iter()
45-
.map(|p| format!("/usr/{}", p.layout.entry.target()))
45+
.map(|p| format!("/usr/{}", p.layout.file.target()))
4646
.sorted()
4747
.collect();
4848

‎crates/stone-ffi/src/payload/attribute.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pub struct StonePayloadAttributeRecord {
77
pub value_buf: *const u8,
88
}
99

10-
impl From<&stone::StonePayloadAttribute> for StonePayloadAttributeRecord {
11-
fn from(record: &stone::StonePayloadAttribute) -> Self {
10+
impl From<&stone::StonePayloadAttributeRecord> for StonePayloadAttributeRecord {
11+
fn from(record: &stone::StonePayloadAttributeRecord) -> Self {
1212
Self {
1313
key_size: record.key.len(),
1414
key_buf: record.key.as_ptr(),

‎crates/stone-ffi/src/payload/index.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ pub struct StonePayloadIndexRecord {
66
pub digest: [u8; 16],
77
}
88

9-
impl From<&stone::StonePayloadIndex> for StonePayloadIndexRecord {
10-
fn from(record: &stone::StonePayloadIndex) -> Self {
9+
impl From<&stone::StonePayloadIndexRecord> for StonePayloadIndexRecord {
10+
fn from(record: &stone::StonePayloadIndexRecord) -> Self {
1111
Self {
1212
start: record.start,
1313
end: record.end,

‎crates/stone-ffi/src/payload/layout.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use stone::{StonePayloadLayout, StonePayloadLayoutEntry, StonePayloadLayoutFileType};
1+
use stone::{StonePayloadLayoutFile, StonePayloadLayoutFileType};
22

33
use crate::StoneString;
44

@@ -13,40 +13,40 @@ pub struct StonePayloadLayoutRecord {
1313
pub file_payload: StonePayloadLayoutFilePayload,
1414
}
1515

16-
impl From<&StonePayloadLayout> for StonePayloadLayoutRecord {
17-
fn from(record: &StonePayloadLayout) -> Self {
16+
impl From<&stone::StonePayloadLayoutRecord> for StonePayloadLayoutRecord {
17+
fn from(record: &stone::StonePayloadLayoutRecord) -> Self {
1818
StonePayloadLayoutRecord {
1919
uid: record.uid,
2020
gid: record.gid,
2121
mode: record.mode,
2222
tag: record.tag,
23-
file_type: record.entry.file_type(),
24-
file_payload: match &record.entry {
25-
StonePayloadLayoutEntry::Regular(hash, name) => StonePayloadLayoutFilePayload {
23+
file_type: record.file.file_type(),
24+
file_payload: match &record.file {
25+
StonePayloadLayoutFile::Regular(hash, name) => StonePayloadLayoutFilePayload {
2626
regular: StonePayloadLayoutFileRegular {
2727
hash: hash.to_be_bytes(),
2828
name: StoneString::new(name),
2929
},
3030
},
31-
StonePayloadLayoutEntry::Symlink(source, target) => StonePayloadLayoutFilePayload {
31+
StonePayloadLayoutFile::Symlink(source, target) => StonePayloadLayoutFilePayload {
3232
symlink: StonePayloadLayoutFileSymlink {
3333
source: StoneString::new(source),
3434
target: StoneString::new(target),
3535
},
3636
},
37-
StonePayloadLayoutEntry::Directory(name) => StonePayloadLayoutFilePayload {
37+
StonePayloadLayoutFile::Directory(name) => StonePayloadLayoutFilePayload {
3838
directory: StoneString::new(name),
3939
},
40-
StonePayloadLayoutEntry::CharacterDevice(name) => StonePayloadLayoutFilePayload {
40+
StonePayloadLayoutFile::CharacterDevice(name) => StonePayloadLayoutFilePayload {
4141
character_device: StoneString::new(name),
4242
},
43-
StonePayloadLayoutEntry::BlockDevice(name) => StonePayloadLayoutFilePayload {
43+
StonePayloadLayoutFile::BlockDevice(name) => StonePayloadLayoutFilePayload {
4444
block_device: StoneString::new(name),
4545
},
46-
StonePayloadLayoutEntry::Fifo(name) => StonePayloadLayoutFilePayload {
46+
StonePayloadLayoutFile::Fifo(name) => StonePayloadLayoutFilePayload {
4747
fifo: StoneString::new(name),
4848
},
49-
StonePayloadLayoutEntry::Socket(name) => StonePayloadLayoutFilePayload {
49+
StonePayloadLayoutFile::Socket(name) => StonePayloadLayoutFilePayload {
5050
socket: StoneString::new(name),
5151
},
5252
},

‎crates/stone-ffi/src/payload/meta.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,42 @@ pub struct StonePayloadMetaRecord {
99
pub primitive_payload: StonePayloadMetaPrimitivePayload,
1010
}
1111

12-
impl From<&stone::StonePayloadMeta> for StonePayloadMetaRecord {
13-
fn from(record: &stone::StonePayloadMeta) -> Self {
12+
impl From<&stone::StonePayloadMetaRecord> for StonePayloadMetaRecord {
13+
fn from(record: &stone::StonePayloadMetaRecord) -> Self {
1414
Self {
1515
tag: record.tag,
16-
primitive_type: match &record.kind {
17-
stone::StonePayloadMetaKind::Int8(_) => StonePayloadMetaPrimitiveType::Int8,
18-
stone::StonePayloadMetaKind::Uint8(_) => StonePayloadMetaPrimitiveType::Uint8,
19-
stone::StonePayloadMetaKind::Int16(_) => StonePayloadMetaPrimitiveType::Int16,
20-
stone::StonePayloadMetaKind::Uint16(_) => StonePayloadMetaPrimitiveType::Uint16,
21-
stone::StonePayloadMetaKind::Int32(_) => StonePayloadMetaPrimitiveType::Int32,
22-
stone::StonePayloadMetaKind::Uint32(_) => StonePayloadMetaPrimitiveType::Uint32,
23-
stone::StonePayloadMetaKind::Int64(_) => StonePayloadMetaPrimitiveType::Int64,
24-
stone::StonePayloadMetaKind::Uint64(_) => StonePayloadMetaPrimitiveType::Uint64,
25-
stone::StonePayloadMetaKind::String(_) => StonePayloadMetaPrimitiveType::String,
26-
stone::StonePayloadMetaKind::Dependency(_, _) => StonePayloadMetaPrimitiveType::Dependency,
27-
stone::StonePayloadMetaKind::Provider(_, _) => StonePayloadMetaPrimitiveType::Provider,
16+
primitive_type: match &record.primitive {
17+
stone::StonePayloadMetaPrimitive::Int8(_) => StonePayloadMetaPrimitiveType::Int8,
18+
stone::StonePayloadMetaPrimitive::Uint8(_) => StonePayloadMetaPrimitiveType::Uint8,
19+
stone::StonePayloadMetaPrimitive::Int16(_) => StonePayloadMetaPrimitiveType::Int16,
20+
stone::StonePayloadMetaPrimitive::Uint16(_) => StonePayloadMetaPrimitiveType::Uint16,
21+
stone::StonePayloadMetaPrimitive::Int32(_) => StonePayloadMetaPrimitiveType::Int32,
22+
stone::StonePayloadMetaPrimitive::Uint32(_) => StonePayloadMetaPrimitiveType::Uint32,
23+
stone::StonePayloadMetaPrimitive::Int64(_) => StonePayloadMetaPrimitiveType::Int64,
24+
stone::StonePayloadMetaPrimitive::Uint64(_) => StonePayloadMetaPrimitiveType::Uint64,
25+
stone::StonePayloadMetaPrimitive::String(_) => StonePayloadMetaPrimitiveType::String,
26+
stone::StonePayloadMetaPrimitive::Dependency(_, _) => StonePayloadMetaPrimitiveType::Dependency,
27+
stone::StonePayloadMetaPrimitive::Provider(_, _) => StonePayloadMetaPrimitiveType::Provider,
2828
},
29-
primitive_payload: match &record.kind {
30-
stone::StonePayloadMetaKind::Int8(a) => StonePayloadMetaPrimitivePayload { int8: *a },
31-
stone::StonePayloadMetaKind::Uint8(a) => StonePayloadMetaPrimitivePayload { uint8: *a },
32-
stone::StonePayloadMetaKind::Int16(a) => StonePayloadMetaPrimitivePayload { int16: *a },
33-
stone::StonePayloadMetaKind::Uint16(a) => StonePayloadMetaPrimitivePayload { uint16: *a },
34-
stone::StonePayloadMetaKind::Int32(a) => StonePayloadMetaPrimitivePayload { int32: *a },
35-
stone::StonePayloadMetaKind::Uint32(a) => StonePayloadMetaPrimitivePayload { uint32: *a },
36-
stone::StonePayloadMetaKind::Int64(a) => StonePayloadMetaPrimitivePayload { int64: *a },
37-
stone::StonePayloadMetaKind::Uint64(a) => StonePayloadMetaPrimitivePayload { uint64: *a },
38-
stone::StonePayloadMetaKind::String(a) => StonePayloadMetaPrimitivePayload {
29+
primitive_payload: match &record.primitive {
30+
stone::StonePayloadMetaPrimitive::Int8(a) => StonePayloadMetaPrimitivePayload { int8: *a },
31+
stone::StonePayloadMetaPrimitive::Uint8(a) => StonePayloadMetaPrimitivePayload { uint8: *a },
32+
stone::StonePayloadMetaPrimitive::Int16(a) => StonePayloadMetaPrimitivePayload { int16: *a },
33+
stone::StonePayloadMetaPrimitive::Uint16(a) => StonePayloadMetaPrimitivePayload { uint16: *a },
34+
stone::StonePayloadMetaPrimitive::Int32(a) => StonePayloadMetaPrimitivePayload { int32: *a },
35+
stone::StonePayloadMetaPrimitive::Uint32(a) => StonePayloadMetaPrimitivePayload { uint32: *a },
36+
stone::StonePayloadMetaPrimitive::Int64(a) => StonePayloadMetaPrimitivePayload { int64: *a },
37+
stone::StonePayloadMetaPrimitive::Uint64(a) => StonePayloadMetaPrimitivePayload { uint64: *a },
38+
stone::StonePayloadMetaPrimitive::String(a) => StonePayloadMetaPrimitivePayload {
3939
string: StoneString::new(a),
4040
},
41-
stone::StonePayloadMetaKind::Dependency(kind, name) => StonePayloadMetaPrimitivePayload {
41+
stone::StonePayloadMetaPrimitive::Dependency(kind, name) => StonePayloadMetaPrimitivePayload {
4242
dependency: StonePayloadMetaDependencyValue {
4343
kind: *kind,
4444
name: StoneString::new(name),
4545
},
4646
},
47-
stone::StonePayloadMetaKind::Provider(kind, name) => StonePayloadMetaPrimitivePayload {
47+
stone::StonePayloadMetaPrimitive::Provider(kind, name) => StonePayloadMetaPrimitivePayload {
4848
provider: StonePayloadMetaProviderValue {
4949
kind: *kind,
5050
name: StoneString::new(name),

‎crates/stone/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ pub use self::header::{
1313
StoneHeaderV1FileType, StoneHeaderVersion, STONE_HEADER_MAGIC,
1414
};
1515
pub use self::payload::{
16-
StonePayload, StonePayloadAttribute, StonePayloadCompression, StonePayloadContent, StonePayloadDecodeError,
17-
StonePayloadEncodeError, StonePayloadHeader, StonePayloadIndex, StonePayloadKind, StonePayloadLayout,
18-
StonePayloadLayoutEntry, StonePayloadLayoutFileType, StonePayloadMeta, StonePayloadMetaDependency,
19-
StonePayloadMetaKind, StonePayloadMetaTag,
16+
StonePayload, StonePayloadAttributeRecord, StonePayloadCompression, StonePayloadContent, StonePayloadDecodeError,
17+
StonePayloadEncodeError, StonePayloadHeader, StonePayloadIndexRecord, StonePayloadKind, StonePayloadLayoutFile,
18+
StonePayloadLayoutFileType, StonePayloadLayoutRecord, StonePayloadMetaDependency, StonePayloadMetaPrimitive,
19+
StonePayloadMetaRecord, StonePayloadMetaTag,
2020
};
2121
pub use self::read::{read, read_bytes, StoneDecodedPayload, StoneReadError, StoneReader};
2222
pub use self::write::{

‎crates/stone/src/payload/attribute.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ use super::{Record, StonePayloadDecodeError, StonePayloadEncodeError};
88
use crate::ext::{ReadExt, WriteExt};
99

1010
#[derive(Debug, Clone)]
11-
pub struct StonePayloadAttribute {
11+
pub struct StonePayloadAttributeRecord {
1212
pub key: Vec<u8>,
1313
pub value: Vec<u8>,
1414
}
1515

16-
impl Record for StonePayloadAttribute {
16+
impl Record for StonePayloadAttributeRecord {
1717
fn decode<R: Read>(mut reader: R) -> Result<Self, StonePayloadDecodeError> {
1818
let key_length = reader.read_u64()?;
1919
let value_length = reader.read_u64()?;

‎crates/stone/src/payload/index.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::ext::{ReadExt, WriteExt};
1313
/// This is used to split the file into the content store on disk before promoting
1414
/// to a transaction.
1515
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
16-
pub struct StonePayloadIndex {
16+
pub struct StonePayloadIndexRecord {
1717
/// Start pf the entry within the ContentPayload
1818
pub start: u64,
1919

@@ -24,7 +24,7 @@ pub struct StonePayloadIndex {
2424
pub digest: u128,
2525
}
2626

27-
impl Record for StonePayloadIndex {
27+
impl Record for StonePayloadIndexRecord {
2828
fn decode<R: Read>(mut reader: R) -> Result<Self, StonePayloadDecodeError> {
2929
let start = reader.read_u64()?;
3030
let end = reader.read_u64()?;

0 commit comments

Comments
 (0)