Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

#cleanup Drop MapWithKeyOps::Value type in favor of Proxied::View.

Browse Source 
PiperOrigin-RevId: 592497727
pull/15158/head
Jakob Buchgraber 1 year ago committed by Copybara-Service
parent 9d0a30d2e5
commit b539fa9c05
3 changed files with 40 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      rust/cpp.rs
  2. 8
      rust/map.rs
  3. 40
      rust/upb.rs

38
rust/cpp.rs
Unescape View File

@ -9,7 +9,7 @@
use crate::ProtoStr;
use crate::__internal::{Private, PtrAndLen, RawArena, RawMap, RawMessage, RawRepeatedField};
use crate::{Mut, ProxiedInRepeated, Repeated, View};
use crate::{Mut, Proxied, ProxiedInRepeated, Repeated, View};
use core::fmt::Debug;
use paste::paste;
use std::alloc::Layout;
@ -305,14 +305,12 @@ macro_rules! generate_map_with_key_ops_traits {
($($t:ty, $sized_t:ty;)*) => {
paste! {
$(
pub trait [< MapWith $t:camel KeyOps >] {
type Value<'msg>: Sized;
pub trait [< MapWith $t:camel KeyOps >] : Proxied {
fn new_map() -> RawMap;
fn clear(m: RawMap);
fn size(m: RawMap) -> usize;
fn insert(m: RawMap, key: $sized_t, value: Self::Value<'_>) -> bool;
fn get<'msg>(m: RawMap, key: $sized_t) -> Option<Self::Value<'msg>>;
fn insert(m: RawMap, key: $sized_t, value: View<'_, Self>) -> bool;
fn get<'msg>(m: RawMap, key: $sized_t) -> Option<View<'msg, Self>>;
fn remove(m: RawMap, key: $sized_t) -> bool;
}
@ -335,7 +333,7 @@ macro_rules! generate_map_with_key_ops_traits {
V::clear(self.raw)
}
pub fn get<'a>(&self, key: $sized_t) -> Option<V::Value<'a>> {
pub fn get<'a>(&self, key: $sized_t) -> Option<View<'a, V>> {
V::get(self.raw, key)
}
@ -343,7 +341,7 @@ macro_rules! generate_map_with_key_ops_traits {
V::remove(self.raw, key)
}
pub fn insert(&mut self, key: $sized_t, value: V::Value<'_>) -> bool {
pub fn insert(&mut self, key: $sized_t, value: View<'_, V>) -> bool {
V::insert(self.raw, key, value);
true
}
@ -363,7 +361,7 @@ generate_map_with_key_ops_traits!(
);
macro_rules! impl_scalar_map_with_key_op_for_scalar_values {
($key_t:ty, $sized_key_t:ty, $ffi_key_t:ty, $to_ffi_key:expr, $trait:ident for $($t:ty, $sized_t:ty, $ffi_t:ty, $to_ffi_value:expr, $from_ffi_value:expr, $zero_val:literal;)*) => {
($key_t:ty, $sized_key_t:ty, $ffi_key_t:ty, $to_ffi_key:expr, $trait:ident for $($t:ty, $ffi_t:ty, $to_ffi_value:expr, $from_ffi_value:expr, $zero_val:literal;)*) => {
paste! { $(
extern "C" {
fn [< __pb_rust_Map_ $key_t _ $t _new >]() -> RawMap;
@ -374,8 +372,6 @@ macro_rules! impl_scalar_map_with_key_op_for_scalar_values {
fn [< __pb_rust_Map_ $key_t _ $t _remove >](m: RawMap, key: $ffi_key_t, value: *mut $ffi_t) -> bool;
}
impl $trait for $t {
type Value<'msg> = $sized_t;
fn new_map() -> RawMap {
unsafe { [< __pb_rust_Map_ $key_t _ $t _new >]() }
}
@ -388,14 +384,14 @@ macro_rules! impl_scalar_map_with_key_op_for_scalar_values {
unsafe { [< __pb_rust_Map_ $key_t _ $t _size >](m) }
}
fn insert(m: RawMap, key: $sized_key_t, value: Self::Value<'_>) -> bool {
fn insert(m: RawMap, key: $sized_key_t, value: View<'_, Self>) -> bool {
let ffi_key = $to_ffi_key(key);
let ffi_value = $to_ffi_value(value);
unsafe { [< __pb_rust_Map_ $key_t _ $t _insert >](m, ffi_key, ffi_value) }
true
}
fn get<'msg>(m: RawMap, key: $sized_key_t) -> Option<Self::Value<'msg>> {
fn get<'msg>(m: RawMap, key: $sized_key_t) -> Option<View<'msg, Self>> {
let ffi_key = $to_ffi_key(key);
let mut ffi_value = $to_ffi_value($zero_val);
let found = unsafe { [< __pb_rust_Map_ $key_t _ $t _get >](m, ffi_key, &mut ffi_value) };
@ -428,14 +424,14 @@ macro_rules! impl_map_with_key_ops_for_scalar_values {
paste! {
$(
impl_scalar_map_with_key_op_for_scalar_values!($t, $t_sized, $ffi_t, $to_ffi_key, [< MapWith $t:camel KeyOps >] for
f32, f32, f32, identity, identity, 0f32;
f64, f64, f64, identity, identity, 0f64;
i32, i32, i32, identity, identity, 0i32;
u32, u32, u32, identity, identity, 0u32;
i64, i64, i64, identity, identity, 0i64;
u64, u64, u64, identity, identity, 0u64;
bool, bool, bool, identity, identity, false;
ProtoStr, &'msg ProtoStr, PtrAndLen, str_to_ptrlen, ptrlen_to_str, "";
f32, f32, identity, identity, 0f32;
f64, f64, identity, identity, 0f64;
i32, i32, identity, identity, 0i32;
u32, u32, identity, identity, 0u32;
i64, i64, identity, identity, 0i64;
u64, u64, identity, identity, 0u64;
bool, bool, identity, identity, false;
ProtoStr, PtrAndLen, str_to_ptrlen, ptrlen_to_str, "";
);
)*
}

8
rust/map.rs
Unescape View File

@ -155,7 +155,7 @@ macro_rules! impl_scalar_map_keys {
($(key_type $t:ty;)*) => {
paste! { $(
impl<'msg, V: [< MapWith $t:camel KeyOps >] + Proxied + ?Sized + 'msg> MapView<'msg, $t, V> {
pub fn get<'b>(&self, key: $t) -> Option<V::Value<'b>> {
pub fn get<'b>(&self, key: $t) -> Option<View<'b, V>> {
self.inner.get(key)
}
@ -169,7 +169,7 @@ macro_rules! impl_scalar_map_keys {
}
impl<'msg, V: [< MapWith $t:camel KeyOps >] + Proxied + ?Sized + 'msg> MapMut<'msg, $t, V> {
pub fn insert(&mut self, key: $t, value: V::Value<'_>) -> bool {
pub fn insert(&mut self, key: $t, value: View<'_, V>) -> bool {
self.inner.insert(key, value)
}
@ -198,7 +198,7 @@ impl_scalar_map_keys!(
);
impl<'msg, V: MapWithProtoStrKeyOps + Proxied + ?Sized + 'msg> MapView<'msg, ProtoStr, V> {
pub fn get(&self, key: impl Into<&'msg ProtoStr>) -> Option<V::Value<'_>> {
pub fn get(&self, key: impl Into<&'msg ProtoStr>) -> Option<View<'_, V>> {
self.inner.get(key.into())
}
@ -212,7 +212,7 @@ impl<'msg, V: MapWithProtoStrKeyOps + Proxied + ?Sized + 'msg> MapView<'msg, Pro
}
impl<'msg, V: MapWithProtoStrKeyOps + Proxied + ?Sized + 'msg> MapMut<'msg, ProtoStr, V> {
pub fn insert(&mut self, key: impl Into<&'msg ProtoStr>, value: V::Value<'_>) -> bool {
pub fn insert(&mut self, key: impl Into<&'msg ProtoStr>, value: View<'_, V>) -> bool {
self.inner.insert(key.into(), value)
}

40
rust/upb.rs
Unescape View File

@ -9,7 +9,9 @@
use crate::ProtoStr;
use crate::__internal::{Private, PtrAndLen, RawArena, RawMap, RawMessage, RawRepeatedField};
use crate::{Mut, ProxiedInRepeated, Repeated, RepeatedMut, RepeatedView, View, ViewProxy};
use crate::{
Mut, Proxied, ProxiedInRepeated, Repeated, RepeatedMut, RepeatedView, View, ViewProxy,
};
use core::fmt::Debug;
use paste::paste;
use std::alloc;
@ -519,9 +521,7 @@ macro_rules! generate_map_key_ops_traits {
($($t:ty, $sized_t:ty;)*) => {
paste! {
$(
pub trait [< MapWith $t:camel KeyOps >] {
type Value<'msg>: Sized;
pub trait [< MapWith $t:camel KeyOps >] : Proxied {
fn new_map(a: RawArena) -> RawMap;
fn clear(m: RawMap) {
unsafe { upb_Map_Clear(m) }
@ -529,8 +529,8 @@ macro_rules! generate_map_key_ops_traits {
fn size(m: RawMap) -> usize {
unsafe { upb_Map_Size(m) }
}
fn insert(m: RawMap, a: RawArena, key: $sized_t, value: Self::Value<'_>) -> bool;
fn get<'msg>(m: RawMap, key: $sized_t) -> Option<Self::Value<'msg>>;
fn insert(m: RawMap, a: RawArena, key: $sized_t, value: View<'_, Self>) -> bool;
fn get<'msg>(m: RawMap, key: $sized_t) -> Option<View<'msg, Self>>;
fn remove(m: RawMap, key: $sized_t) -> bool;
}
@ -553,7 +553,7 @@ macro_rules! generate_map_key_ops_traits {
V::clear(self.raw)
}
pub fn get<'a>(&self, key: $sized_t) -> Option<V::Value<'a>> {
pub fn get<'a>(&self, key: $sized_t) -> Option<View<'a, V>> {
V::get(self.raw, key)
}
@ -561,7 +561,7 @@ macro_rules! generate_map_key_ops_traits {
V::remove(self.raw, key)
}
pub fn insert(&mut self, key: $sized_t, value: V::Value<'_>) -> bool {
pub fn insert(&mut self, key: $sized_t, value: View<'_, V>) -> bool {
V::insert(self.raw, self.arena.raw(), key, value)
}
}
@ -580,16 +580,14 @@ generate_map_key_ops_traits!(
);
macro_rules! impl_scalar_map_key_op_for_scalar_values {
($key_t:ty, $key_msg_val:expr, $key_upb_tag:expr, $trait:ident for $($t:ty, $sized_t:ty, $msg_val:expr, $from_msg_val:expr, $upb_tag:expr, $zero_val:literal;)*) => {
($key_t:ty, $key_msg_val:expr, $key_upb_tag:expr, $trait:ident for $($t:ty, $msg_val:expr, $from_msg_val:expr, $upb_tag:expr, $zero_val:literal;)*) => {
$(
impl $trait for $t {
type Value<'msg> = $sized_t;
fn new_map(a: RawArena) -> RawMap {
unsafe { upb_Map_New(a, $key_upb_tag, $upb_tag) }
}
fn insert(m: RawMap, a: RawArena, key: $key_t, value: Self::Value<'_>) -> bool {
fn insert(m: RawMap, a: RawArena, key: $key_t, value: View<'_, Self>) -> bool {
unsafe {
upb_Map_Set(
m,
@ -600,7 +598,7 @@ macro_rules! impl_scalar_map_key_op_for_scalar_values {
}
}
fn get<'msg>(m: RawMap, key: $key_t) -> Option<Self::Value<'msg>> {
fn get<'msg>(m: RawMap, key: $key_t) -> Option<View<'msg, Self>> {
let mut val = $msg_val($zero_val);
let found = unsafe {
upb_Map_Get(m, $key_msg_val(key), &mut val)
@ -647,14 +645,14 @@ macro_rules! impl_map_key_ops_for_scalar_values {
paste! {
$(
impl_scalar_map_key_op_for_scalar_values!($t_sized, $key_msg_val, $upb_tag, [< MapWith $t:camel KeyOps >] for
f32, f32, scalar_to_msg!(float_val), scalar_from_msg!(float_val), UpbCType::Float, 0f32;
f64, f64, scalar_to_msg!(double_val), scalar_from_msg!(double_val), UpbCType::Double, 0f64;
i32, i32, scalar_to_msg!(int32_val), scalar_from_msg!(int32_val), UpbCType::Int32, 0i32;
u32, u32, scalar_to_msg!(uint32_val), scalar_from_msg!(uint32_val), UpbCType::UInt32, 0u32;
i64, i64, scalar_to_msg!(int64_val), scalar_from_msg!(int64_val), UpbCType::Int64, 0i64;
u64, u64, scalar_to_msg!(uint64_val), scalar_from_msg!(uint64_val), UpbCType::UInt64, 0u64;
bool, bool, scalar_to_msg!(bool_val), scalar_from_msg!(bool_val), UpbCType::Bool, false;
ProtoStr, &'msg ProtoStr, str_to_msg, msg_to_str, UpbCType::String, "";
f32, scalar_to_msg!(float_val), scalar_from_msg!(float_val), UpbCType::Float, 0f32;
f64, scalar_to_msg!(double_val), scalar_from_msg!(double_val), UpbCType::Double, 0f64;
i32, scalar_to_msg!(int32_val), scalar_from_msg!(int32_val), UpbCType::Int32, 0i32;
u32, scalar_to_msg!(uint32_val), scalar_from_msg!(uint32_val), UpbCType::UInt32, 0u32;
i64, scalar_to_msg!(int64_val), scalar_from_msg!(int64_val), UpbCType::Int64, 0i64;
u64, scalar_to_msg!(uint64_val), scalar_from_msg!(uint64_val), UpbCType::UInt64, 0u64;
bool, scalar_to_msg!(bool_val), scalar_from_msg!(bool_val), UpbCType::Bool, false;
ProtoStr, str_to_msg, msg_to_str, UpbCType::String, "";
);
)*
}

Write Preview
Loading…
Cancel
Save