Restore prost-reflect dependency in build crate

matter-labs · Nov 13, 2023 · 3321d41 · 3321d41
1 parent 57a7132
commit 3321d41
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/libs/protobuf_build/Cargo.toml b/node/libs/protobuf_build/Cargo.toml
@@ -12,6 +12,7 @@ heck.workspace = true
 prettyplease.workspace = true
 proc-macro2.workspace = true
 prost-build.workspace = true
+prost-reflect.workspace = true
 protox.workspace = true
 quote.workspace = true
 syn.workspace = true
diff --git a/node/libs/protobuf_build/src/canonical.rs b/node/libs/protobuf_build/src/canonical.rs
@@ -1,7 +1,8 @@
 //! Checks whether messages in the given file descriptor set support canonical encoding.
+
 use crate::syntax::extract_message_names;
 use anyhow::Context as _;
-use protox::prost_reflect::{self, prost_types};
+use prost_reflect::{self, prost_types};
 use std::collections::HashSet;
 
 #[derive(Default)]

diff --git a/node/libs/protobuf_build/src/lib.rs b/node/libs/protobuf_build/src/lib.rs
@@ -24,12 +24,11 @@
 //! these are being built simultaneously from the same build script).
 
 #![allow(clippy::print_stdout)]
+
 pub use self::syntax::*;
 use anyhow::Context as _;
-use protox::{
-    file::File,
-    prost_reflect::{self, prost::Message as _, prost_types},
-};
+use prost_reflect::{prost::Message as _, prost_types};
+use protox::file::File;
 use std::{
     collections::{HashMap, HashSet},
     env, fs,

diff --git a/node/libs/protobuf_build/src/syntax.rs b/node/libs/protobuf_build/src/syntax.rs
@@ -2,7 +2,7 @@
 
 use super::ident;
 use anyhow::Context as _;
-use protox::prost_reflect::prost_types;
+use prost_reflect::prost_types;
 use std::{
     collections::BTreeMap,
     fmt,