Skip to content

Commit f633d2a

Browse files
Use fully scoped names in derive macros (#96)
1 parent 7729886 commit f633d2a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

columnar_derive/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ fn derive_struct(name: &syn::Ident, generics: &syn::Generics, data_struct: syn::
326326
fn from_store(store: &::columnar::bytes::indexed::DecodedStore<'columnar>, offset: &mut usize) -> Self {
327327
Self { #(#names: ::columnar::FromBytes::from_store(store, offset),)* }
328328
}
329-
fn element_sizes(sizes: &mut Vec<usize>) -> Result<(), String> {
329+
fn element_sizes(sizes: &mut Vec<usize>) -> ::core::result::Result<(), String> {
330330
#(<#container_types>::element_sizes(sizes)?;)*
331331
Ok(())
332332
}
@@ -504,7 +504,7 @@ fn derive_unit_struct(name: &syn::Ident, _generics: &syn::Generics, vis: syn::Vi
504504
// type Borrowed<'columnar> = #c_ident;
505505
#[inline(always)]
506506
fn as_bytes(&self) -> impl Iterator<Item=(u64, &'a [u8])> {
507-
std::iter::once((8, ::columnar::bytemuck::cast_slice(std::slice::from_ref(self.count))))
507+
::core::iter::once((8, ::columnar::bytemuck::cast_slice(::core::slice::from_ref(self.count))))
508508
}
509509
}
510510

@@ -520,7 +520,7 @@ fn derive_unit_struct(name: &syn::Ident, _generics: &syn::Generics, vis: syn::Vi
520520
*offset += 1;
521521
Self { count: w.first().unwrap_or(&0) }
522522
}
523-
fn element_sizes(sizes: &mut Vec<usize>) -> Result<(), String> {
523+
fn element_sizes(sizes: &mut Vec<usize>) -> ::core::result::Result<(), String> {
524524
sizes.push(8);
525525
Ok(())
526526
}
@@ -925,7 +925,7 @@ fn derive_enum(name: &syn::Ident, generics: &syn:: Generics, data_enum: syn::Dat
925925
indexes: ::columnar::FromBytes::from_store(store, offset),
926926
}
927927
}
928-
fn element_sizes(sizes: &mut Vec<usize>) -> Result<(), String> {
928+
fn element_sizes(sizes: &mut Vec<usize>) -> ::core::result::Result<(), String> {
929929
#(<#container_types>::element_sizes(sizes)?;)*
930930
<::columnar::Discriminant<CVar, COff>>::element_sizes(sizes)?;
931931
Ok(())
@@ -1270,7 +1270,7 @@ fn derive_tags(name: &syn::Ident, _generics: &syn:: Generics, data_enum: syn::Da
12701270
fn from_store(store: &::columnar::bytes::indexed::DecodedStore<'columnar>, offset: &mut usize) -> Self {
12711271
Self { variant: ::columnar::FromBytes::from_store(store, offset) }
12721272
}
1273-
fn element_sizes(sizes: &mut Vec<usize>) -> Result<(), String> {
1273+
fn element_sizes(sizes: &mut Vec<usize>) -> ::core::result::Result<(), String> {
12741274
CVar::element_sizes(sizes)
12751275
}
12761276
}

0 commit comments

Comments
 (0)