rust: update prost to 0.11.5

Author: benma

src/rust/Cargo.lock

@@ -56,7 +56,7 @@ default-features = false
 
 [dependencies.prost]
 # keep version in sync with tools/prost-build/Cargo.toml.
-version = "0.10.1"
+version = "0.11.5"
 default-features = false
 features = ["prost-derive"]
 

src/rust/bitbox02-rust/Cargo.toml

@@ -1 +1 @@
-{"files":{"Cargo.toml":"a524746072dd109475e1683f3affa057a0213d5d53f6742fa4317237a98a4259","LICENSE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","README.md":"6c67fa1e48f14adfaf834f520f798ddfb79f90804f46cc215ee391a7d57913a4","src/field/group.rs":"0370fda09a6dc7e8e91cfab1a6638c0117f0b968bcc7d1a8f397c2bf00042481","src/field/map.rs":"59a53d7d8391452d4d32f077a385e5eeeb8777482041194490f2494117cb39a1","src/field/message.rs":"a5672412435bb9fafbd4a99b1a6c6d5bbf636a571959358a44196bfd69efc2d1","src/field/mod.rs":"ca917a3f673623f0946e9e37ebad2916f3c1f8d163a1844143ef7d21d245394c","src/field/oneof.rs":"4fc488445b05e464070fadd8799cafb806db5c23d1494c4300cb293394863012","src/field/scalar.rs":"687617fd54f1acfe55bc2d9f11d36552b8a546b5dd43b1bccdfd2c14bf8850e5","src/lib.rs":"4dbc81036c4641c0d8e24c6f978623e205a74ec7b79a3475f0996b5f8fc666d4"},"package":"7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"}
+{"files":{"Cargo.toml":"830ca416b545d756142214029e79dd0def97b991527623943fce4275667628d4","LICENSE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","README.md":"6c67fa1e48f14adfaf834f520f798ddfb79f90804f46cc215ee391a7d57913a4","src/field/group.rs":"0370fda09a6dc7e8e91cfab1a6638c0117f0b968bcc7d1a8f397c2bf00042481","src/field/map.rs":"30b678fbbeca1411e7e16f2dfeadf38860ba654266ad66da16019369153618f2","src/field/message.rs":"a5672412435bb9fafbd4a99b1a6c6d5bbf636a571959358a44196bfd69efc2d1","src/field/mod.rs":"5265820ea953a100ee33db71c416f72bac5e1dd375a98ebdd6755a334f5bed0f","src/field/oneof.rs":"4fc488445b05e464070fadd8799cafb806db5c23d1494c4300cb293394863012","src/field/scalar.rs":"6859f9910a12a2864397f7f6fa36541c992c43b3ff8d15d4191aa93e92f5b078","src/lib.rs":"8ba979a94503dcd8d487237e856367a0a345b4873de7a73135c1b577ecb16bd9"},"package":"c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720"}

src/rust/vendor/prost-derive/.cargo-checksum.json

@@ -10,11 +10,13 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 name = "prost-derive"
-version = "0.10.1"
+version = "0.11.5"
 authors = [
     "Dan Burkert <[email protected]>",
+    "Lucio Franco <[email protected]>",
     "Tokio Contributors <[email protected]>",
 ]
 description = "A Protocol Buffers implementation for the Rust Language."
@@ -27,10 +29,12 @@ repository = "https://github.com/tokio-rs/prost"
 proc_macro = true
 
 [dependencies.anyhow]
-version = "1"
+version = "1.0.1"
 
 [dependencies.itertools]
 version = "0.10"
+features = ["use_alloc"]
+default-features = false
 
 [dependencies.proc-macro2]
 version = "1"
@@ -39,5 +43,5 @@ version = "1"
 version = "1"
 
 [dependencies.syn]
-version = "1"
+version = "1.0.3"
 features = ["extra-traits"]

src/rust/vendor/prost-derive/Cargo.toml

@@ -65,7 +65,7 @@ impl Field {
                 .get_ident()
                 .and_then(|i| MapTy::from_str(&i.to_string()))
             {
-                let (k, v): (String, String) = match &*attr {
+                let (k, v): (String, String) = match attr {
                     Meta::NameValue(MetaNameValue {
                         lit: Lit::Str(lit), ..
                     }) => {
@@ -257,7 +257,7 @@ impl Field {
     }
 
     /// Returns methods to embed in the message.
-    pub fn methods(&self, ident: &Ident) -> Option<TokenStream> {
+    pub fn methods(&self, ident: &TokenStream) -> Option<TokenStream> {
         if let ValueTy::Scalar(scalar::Ty::Enumeration(ty)) = &self.value_ty {
             let key_ty = self.key_ty.rust_type();
             let key_ref_ty = self.key_ty.rust_ref_type();

src/rust/vendor/prost-derive/src/field/map.rs

@@ -10,7 +10,7 @@ use std::slice;
 use anyhow::{bail, Error};
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::{Attribute, Ident, Lit, LitBool, Meta, MetaList, MetaNameValue, NestedMeta};
+use syn::{Attribute, Lit, LitBool, Meta, MetaList, MetaNameValue, NestedMeta};
 
 #[derive(Clone)]
 pub enum Field {
@@ -164,7 +164,7 @@ impl Field {
         }
     }
 
-    pub fn methods(&self, ident: &Ident) -> Option<TokenStream> {
+    pub fn methods(&self, ident: &TokenStream) -> Option<TokenStream> {
         match *self {
             Field::Scalar(ref scalar) => scalar.methods(ident),
             Field::Map(ref map) => map.methods(ident),

src/rust/vendor/prost-derive/src/field/mod.rs

@@ -4,7 +4,9 @@ use std::fmt;
 use anyhow::{anyhow, bail, Error};
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens, TokenStreamExt};
-use syn::{parse_str, Ident, Lit, LitByteStr, Meta, MetaList, MetaNameValue, NestedMeta, Path};
+use syn::{
+    parse_str, Ident, Index, Lit, LitByteStr, Meta, MetaList, MetaNameValue, NestedMeta, Path,
+};
 
 use crate::field::{bool_attr, set_option, tag_attr, Label};
 
@@ -267,12 +269,21 @@ impl Field {
     }
 
     /// Returns methods to embed in the message.
-    pub fn methods(&self, ident: &Ident) -> Option<TokenStream> {
+    pub fn methods(&self, ident: &TokenStream) -> Option<TokenStream> {
         let mut ident_str = ident.to_string();
         if ident_str.starts_with("r#") {
             ident_str = ident_str[2..].to_owned();
         }
 
+        // Prepend `get_` for getter methods of tuple structs.
+        let get = match syn::parse_str::<Index>(&ident_str) {
+            Ok(index) => {
+                let get = Ident::new(&format!("get_{}", index.index), Span::call_site());
+                quote!(#get)
+            }
+            Err(_) => quote!(#ident),
+        };
+
         if let Ty::Enumeration(ref ty) = self.ty {
             let set = Ident::new(&format!("set_{}", ident_str), Span::call_site());
             let set_doc = format!("Sets `{}` to the provided enum value.", ident_str);
@@ -285,7 +296,7 @@ impl Field {
                     );
                     quote! {
                         #[doc=#get_doc]
-                        pub fn #ident(&self) -> #ty {
+                        pub fn #get(&self) -> #ty {
                             #ty::from_i32(self.#ident).unwrap_or(#default)
                         }
 
@@ -303,7 +314,7 @@ impl Field {
                     );
                     quote! {
                         #[doc=#get_doc]
-                        pub fn #ident(&self) -> #ty {
+                        pub fn #get(&self) -> #ty {
                             self.#ident.and_then(#ty::from_i32).unwrap_or(#default)
                         }
 
@@ -322,7 +333,7 @@ impl Field {
                     let push_doc = format!("Appends the provided enum value to `{}`.", ident_str);
                     quote! {
                         #[doc=#iter_doc]
-                        pub fn #ident(&self) -> ::core::iter::FilterMap<
+                        pub fn #get(&self) -> ::core::iter::FilterMap<
                             ::core::iter::Cloned<::core::slice::Iter<i32>>,
                             fn(i32) -> ::core::option::Option<#ty>,
                         > {
@@ -351,7 +362,7 @@ impl Field {
 
             Some(quote! {
                 #[doc=#get_doc]
-                pub fn #ident(&self) -> #ty {
+                pub fn #get(&self) -> #ty {
                     match self.#ident {
                         #match_some
                         ::core::option::Option::None => #default,

src/rust/vendor/prost-derive/src/field/scalar.rs

@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/prost-derive/0.10.1")]
+#![doc(html_root_url = "https://docs.rs/prost-derive/0.11.5")]
 // The `quote!` macro requires deep recursion.
 #![recursion_limit = "4096"]
 
@@ -12,7 +12,7 @@ use proc_macro2::Span;
 use quote::quote;
 use syn::{
     punctuated::Punctuated, Data, DataEnum, DataStruct, DeriveInput, Expr, Fields, FieldsNamed,
-    FieldsUnnamed, Ident, Variant,
+    FieldsUnnamed, Ident, Index, Variant,
 };
 
 mod field;
@@ -32,32 +32,36 @@ fn try_message(input: TokenStream) -> Result<TokenStream, Error> {
     let generics = &input.generics;
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
-    let fields = match variant_data {
+    let (is_struct, fields) = match variant_data {
         DataStruct {
             fields: Fields::Named(FieldsNamed { named: fields, .. }),
             ..
-        }
-        | DataStruct {
+        } => (true, fields.into_iter().collect()),
+        DataStruct {
             fields:
                 Fields::Unnamed(FieldsUnnamed {
                     unnamed: fields, ..
                 }),
             ..
-        } => fields.into_iter().collect(),
+        } => (false, fields.into_iter().collect()),
         DataStruct {
             fields: Fields::Unit,
             ..
-        } => Vec::new(),
+        } => (false, Vec::new()),
     };
 
     let mut next_tag: u32 = 1;
     let mut fields = fields
         .into_iter()
         .enumerate()
-        .flat_map(|(idx, field)| {
-            let field_ident = field
-                .ident
-                .unwrap_or_else(|| Ident::new(&idx.to_string(), Span::call_site()));
+        .flat_map(|(i, field)| {
+            let field_ident = field.ident.map(|x| quote!(#x)).unwrap_or_else(|| {
+                let index = Index {
+                    index: i as u32,
+                    span: Span::call_site(),
+                };
+                quote!(#index)
+            });
             match Field::new(field.attrs, Some(next_tag)) {
                 Ok(Some(field)) => {
                     next_tag = field.tags().iter().max().map(|t| t + 1).unwrap_or(next_tag);
@@ -124,17 +128,27 @@ fn try_message(input: TokenStream) -> Result<TokenStream, Error> {
         )
     };
 
-    // TODO
-    let is_struct = true;
-
     let clear = fields
         .iter()
         .map(|&(ref field_ident, ref field)| field.clear(quote!(self.#field_ident)));
 
-    let default = fields.iter().map(|&(ref field_ident, ref field)| {
-        let value = field.default();
-        quote!(#field_ident: #value,)
-    });
+    let default = if is_struct {
+        let default = fields.iter().map(|(field_ident, field)| {
+            let value = field.default();
+            quote!(#field_ident: #value,)
+        });
+        quote! {#ident {
+            #(#default)*
+        }}
+    } else {
+        let default = fields.iter().map(|(_, field)| {
+            let value = field.default();
+            quote!(#value,)
+        });
+        quote! {#ident (
+            #(#default)*
+        )}
+    };
 
     let methods = fields
         .iter()
@@ -206,9 +220,7 @@ fn try_message(input: TokenStream) -> Result<TokenStream, Error> {
 
         impl #impl_generics ::core::default::Default for #ident #ty_generics #where_clause {
             fn default() -> Self {
-                #ident {
-                    #(#default)*
-                }
+                #default
             }
         }
 
@@ -424,12 +436,14 @@ fn try_oneof(input: TokenStream) -> Result<TokenStream, Error> {
 
     let expanded = quote! {
         impl #impl_generics #ident #ty_generics #where_clause {
+            /// Encodes the message to a buffer.
             pub fn encode<B>(&self, buf: &mut B) where B: ::prost::bytes::BufMut {
                 match *self {
                     #(#encode,)*
                 }
             }
 
+            /// Decodes an instance of the message from a buffer, and merges it into self.
             pub fn merge<B>(
                 field: &mut ::core::option::Option<#ident #ty_generics>,
                 tag: u32,
@@ -444,6 +458,7 @@ fn try_oneof(input: TokenStream) -> Result<TokenStream, Error> {
                 }
             }
 
+            /// Returns the encoded length of the message without a length delimiter.
             #[inline]
             pub fn encoded_len(&self) -> usize {
                 match *self {

src/rust/vendor/prost-derive/src/lib.rs

@@ -1 +1 @@
-{"files":{"Cargo.toml":"a3c03b0feb9f65f64544ef348c0e0bb0743988d885a7206c16d3a043fb6f445e","FUZZING.md":"0223441ab805f2ccfda9f172955446c3287e1e125cc68814f77a46573935feba","LICENSE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","README.md":"8aa92df9aa43ce25e7d80b8c7cf3e06fa66b4f7ee5005b06c62ad175f37998b2","benches/varint.rs":"25e28eadeb5092882281eaa16307ae72cbdabe04a308c9cfe15d3a62c8ead40b","clippy.toml":"10eea08f9e26e0dc498e431ac3a62b861bd74029d1cad8a394284af4cbc90532","prepare-release.sh":"67f42e0649d33269c88272e69a9bf48d02de42126a9942ac6298b6995adea8df","publish-release.sh":"a9ff9a5a65a6772fbe115b64051b1284b0b81825f839a65594d6834c53d7a78f","src/encoding.rs":"19e7af9bb48a8ec33c879ac3d8e97293b2e361164f8ef519ef477c1be4472b01","src/error.rs":"bfccee0fc06836f9b32b1cdb631237031d0ba8e1bc82548db3c4a6c10c06e784","src/lib.rs":"abe91e0518ec38109082b3c393fb1cdc38f5292023fd1859ab27893825f91c5e","src/message.rs":"e4f85ffe6f0a66778b782199e29d450ec53a10e818e20199b15bb1d11d067521","src/types.rs":"edfefaf56ab4bc12c98cbcd9d0b3ca18c10352217556c193be6314990ecffd9c"},"package":"a07b0857a71a8cb765763950499cae2413c3f9cede1133478c43600d9e146890"}
+{"files":{"Cargo.toml":"183851a02065eed014bb2d63b45c15f4912e64552f82ce4c6b34a82bbd97b132","FUZZING.md":"90e5d9ae4cf3b975a7f917224cec20d5d757a9ca33e2bd6d3e2bb984409d3292","LICENSE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","README.md":"310f382a949d2af22e1ab4299b7b9c037f551790d4279df70d12c5822b790d86","benches/varint.rs":"25e28eadeb5092882281eaa16307ae72cbdabe04a308c9cfe15d3a62c8ead40b","clippy.toml":"10eea08f9e26e0dc498e431ac3a62b861bd74029d1cad8a394284af4cbc90532","flake.lock":"c0f731ad4db81f7f120a79a6dac4467970d410b9942688eb6286cd6f3e8c1f01","flake.nix":"8a0c3832f50cf2a134effaf269ae78189e5fcaae15de2a512f12685102217ef1","prepare-release.sh":"67f42e0649d33269c88272e69a9bf48d02de42126a9942ac6298b6995adea8df","publish-release.sh":"0cf0c6ec2765f19d45e271d005a6ad46f7b9b00241ba8a915ece8d100062546b","src/encoding.rs":"bcaeeecb90826f37dde6ee6c3d657ff4d69d6fe0e865e3a256665086d046400f","src/error.rs":"bfccee0fc06836f9b32b1cdb631237031d0ba8e1bc82548db3c4a6c10c06e784","src/lib.rs":"4475109102d73957b4bc18337551ca1da7c6b02896c9cb694d90692af480ba02","src/message.rs":"e4f85ffe6f0a66778b782199e29d450ec53a10e818e20199b15bb1d11d067521","src/types.rs":"edfefaf56ab4bc12c98cbcd9d0b3ca18c10352217556c193be6314990ecffd9c"},"package":"c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592"}

src/rust/vendor/prost/.cargo-checksum.json

@@ -10,11 +10,13 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 name = "prost"
-version = "0.10.1"
+version = "0.11.5"
 authors = [
     "Dan Burkert <[email protected]>",
+    "Lucio Franco <[email protected]",
     "Tokio Contributors <[email protected]>",
 ]
 description = "A Protocol Buffers implementation for the Rust Language."
@@ -43,7 +45,7 @@ version = "1"
 default-features = false
 
 [dependencies.prost-derive]
-version = "0.10.0"
+version = "0.11.5"
 optional = true
 
 [dev-dependencies.criterion]