Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added traits for Repeated #236

Closed
wants to merge 2 commits into from
Closed

Added traits for Repeated #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
448e5e5
Added a few new traits to repeated
valarauca Jul 4, 2017
1fe7f3e
And ran cargo fmt
valarauca Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions protobuf/src/cached_size.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ impl CachedSize {

impl Clone for CachedSize {
fn clone(&self) -> CachedSize {
CachedSize {
size: AtomicUsize::new(self.size.load(Ordering::Relaxed))
}
CachedSize { size: AtomicUsize::new(self.size.load(Ordering::Relaxed)) }
}
}

Expand Down
6 changes: 3 additions & 3 deletions protobuf/src/codegen/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ impl<'a> MessageGen<'a> {
fn fields_except_oneof_and_group(&'a self) -> Vec<&'a FieldGen> {
self.fields
.iter()
.filter(|f| {
!f.is_oneof() && f.proto_type != FieldDescriptorProto_Type::TYPE_GROUP
})
.filter(
|f| !f.is_oneof() && f.proto_type != FieldDescriptorProto_Type::TYPE_GROUP,
)
.collect()
}

Expand Down
9 changes: 6 additions & 3 deletions protobuf/src/codegen/rust_types_values.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,8 @@ fn test_file_last_component() {
}

fn is_descriptor_proto(file: &FileDescriptorProto) -> bool {
file.get_package() == "google.protobuf"
&& file_last_component(file.get_name()) == "descriptor.proto"
file.get_package() == "google.protobuf" &&
file_last_component(file.get_name()) == "descriptor.proto"
}

pub fn type_name_to_rust_relative(
Expand All @@ -440,7 +440,10 @@ pub fn type_name_to_rust_relative(
format!("::protobuf::well_known_types::{}", name)
} else if is_descriptor_proto(message_or_enum.get_file_descriptor()) {
// Messages defined in descriptor.proto
format!("::protobuf::descriptor::{}", message_or_enum.name_to_package())
format!(
"::protobuf::descriptor::{}",
message_or_enum.name_to_package()
)
} else {
if subm {
format!("super::super::{}", message_or_enum.rust_fq_name())
Expand Down
12 changes: 8 additions & 4 deletions protobuf/src/descriptorx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ pub fn proto_path_to_rust_mod(path: &str) -> String {
} else {
ident_continue(c)
};
if valid { c } else { '_' }
if valid {
c
} else {
'_'
}
})
.collect::<String>();

Expand Down Expand Up @@ -543,9 +547,9 @@ impl<'a> OneofWithContext<'a> {
self.message
.fields()
.iter()
.filter(|f| {
f.field.has_oneof_index() && f.field.get_oneof_index() == self.index as i32
})
.filter(
|f| f.field.has_oneof_index() && f.field.get_oneof_index() == self.index as i32,
)
.map(|f| {
OneofVariantWithContext {
oneof: self,
Expand Down
32 changes: 31 additions & 1 deletion protobuf/src/repeated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,42 @@ impl<T : Default + Clear> RepeatedField<T> {
}
}

impl<T> From<Vec<T>> for RepeatedField<T> {
#[inline]
fn from(values: Vec<T>) -> RepeatedField<T> {
RepeatedField::from_vec(values)
}
}

impl<'a, T : Clone> From<&'a [T]> for RepeatedField<T> {
#[inline]
fn from(values: &'a [T]) -> RepeatedField<T> {
RepeatedField::from_slice(values)
}
}

impl<T> Into<Vec<T>> for RepeatedField<T> {
fn into(self) -> Vec<T> {
self.into_vec()
}
}


impl<T : Clone> RepeatedField<T> {
// TODO: implement to_vec()
#[inline]
pub fn from_slice(values: &[T]) -> RepeatedField<T> {
RepeatedField::from_vec(values.to_vec())
}

#[inline]
pub fn from_ref<X : AsRef<[T]>>(values: X) -> RepeatedField<T> {
RepeatedField::from_slice(values.as_ref())
}

#[inline]
pub fn to_vec(&self) -> Vec<T> {
self.as_ref().to_vec()
}
}

impl<T : Clone> Clone for RepeatedField<T> {
Expand Down
36 changes: 30 additions & 6 deletions protobuf/src/singular.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@ impl<T> SingularField<T> {

#[inline]
pub fn into_option(self) -> Option<T> {
if self.set { Some(self.value) } else { None }
if self.set {
Some(self.value)
} else {
None
}
}

#[inline]
pub fn as_ref<'a>(&'a self) -> Option<&'a T> {
if self.set { Some(&self.value) } else { None }
if self.set {
Some(&self.value)
} else {
None
}
}

#[inline]
Expand Down Expand Up @@ -77,15 +85,23 @@ impl<T> SingularField<T> {

#[inline]
pub fn unwrap_or(self, def: T) -> T {
if self.set { self.value } else { def }
if self.set {
self.value
} else {
def
}
}

#[inline]
pub fn unwrap_or_else<F>(self, f: F) -> T
where
F : FnOnce() -> T,
{
if self.set { self.value } else { f() }
if self.set {
self.value
} else {
f()
}
}

#[inline]
Expand Down Expand Up @@ -223,15 +239,23 @@ impl<T> SingularPtrField<T> {

#[inline]
pub fn unwrap_or(self, def: T) -> T {
if self.set { *self.value.unwrap() } else { def }
if self.set {
*self.value.unwrap()
} else {
def
}
}

#[inline]
pub fn unwrap_or_else<F>(self, f: F) -> T
where
F : FnOnce() -> T,
{
if self.set { *self.value.unwrap() } else { f() }
if self.set {
*self.value.unwrap()
} else {
f()
}
}

#[inline]
Expand Down
44 changes: 26 additions & 18 deletions protobuf/src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,12 +1281,16 @@ mod test {
|reader| reader.read_raw_varint64(),
);

test_read_v("ff ff ff ff 0f", 0xffffffff, |reader| {
reader.read_raw_varint32()
});
test_read_v("ff ff ff ff 0f", 0xffffffff, |reader| {
reader.read_raw_varint64()
});
test_read_v(
"ff ff ff ff 0f",
0xffffffff,
|reader| reader.read_raw_varint32(),
);
test_read_v(
"ff ff ff ff 0f",
0xffffffff,
|reader| reader.read_raw_varint64(),
);
}

#[test]
Expand Down Expand Up @@ -1476,23 +1480,26 @@ mod test {
#[test]
fn test_output_stream_write_raw_varint64() {
test_write("96 01", |os| os.write_raw_varint64(150));
test_write("ff ff ff ff ff ff ff ff ff 01", |os| {
os.write_raw_varint64(0xffffffffffffffff)
});
test_write(
"ff ff ff ff ff ff ff ff ff 01",
|os| os.write_raw_varint64(0xffffffffffffffff),
);
}

#[test]
fn test_output_stream_write_int32_no_tag() {
test_write("ff ff ff ff ff ff ff ff ff 01", |os| {
os.write_int32_no_tag(-1)
});
test_write(
"ff ff ff ff ff ff ff ff ff 01",
|os| os.write_int32_no_tag(-1),
);
}

#[test]
fn test_output_stream_write_int64_no_tag() {
test_write("ff ff ff ff ff ff ff ff ff 01", |os| {
os.write_int64_no_tag(-1)
});
test_write(
"ff ff ff ff ff ff ff ff ff 01",
|os| os.write_int64_no_tag(-1),
);
}

#[test]
Expand All @@ -1515,9 +1522,10 @@ mod test {

#[test]
fn test_output_stream_write_raw_little_endian64() {
test_write("f1 e2 d3 c4 b5 a6 07 f8", |os| {
os.write_raw_little_endian64(0xf807a6b5c4d3e2f1)
});
test_write(
"f1 e2 d3 c4 b5 a6 07 f8",
|os| os.write_raw_little_endian64(0xf807a6b5c4d3e2f1),
);
}

#[test]
Expand Down