From c9c27c6a3abb09ee161ed7869dc7db7bb269557e Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Fri, 10 Jan 2025 08:09:08 -0800 Subject: [PATCH] Fix warnings in protobuf-codegen crate. PiperOrigin-RevId: 714056391 --- .../protobuf_codegen/src/lib.rs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/rust/release_crates/protobuf_codegen/src/lib.rs b/rust/release_crates/protobuf_codegen/src/lib.rs index df753a44ea..4cb5c37297 100644 --- a/rust/release_crates/protobuf_codegen/src/lib.rs +++ b/rust/release_crates/protobuf_codegen/src/lib.rs @@ -142,7 +142,8 @@ impl CodeGen { .output() .map_err(|e| { format!( - "Unable to find protoc-gen-upb_minitable: {}", + "Unable to find protoc-gen-upb_minitable: {} {}", + e, missing_protoc_error_message() ) })?; @@ -207,19 +208,19 @@ mod tests { use super::*; use googletest::prelude::*; - #[googletest::test] + #[gtest] fn test_protoc_version() { - assert_eq!(protoc_version("libprotoc 30.0"), "30.0"); - assert_eq!(protoc_version("libprotoc 30.0-dev"), "30.0"); - assert_eq!(protoc_version("libprotoc 30.0-rc1"), "30.0-rc1"); + assert_that!(protoc_version("libprotoc 30.0"), eq("30.0")); + assert_that!(protoc_version("libprotoc 30.0-dev"), eq("30.0")); + assert_that!(protoc_version("libprotoc 30.0-rc1"), eq("30.0-rc1")); } #[googletest::test] fn test_expected_protoc_version() { - assert_eq!(expected_protoc_version("4.30.0"), "30.0"); - assert_eq!(expected_protoc_version("4.30.0-alpha"), "30.0"); - assert_eq!(expected_protoc_version("4.30.0-beta"), "30.0"); - assert_eq!(expected_protoc_version("4.30.0-pre"), "30.0"); - assert_eq!(expected_protoc_version("4.30.0-rc1"), "30.0-rc1"); + assert_that!(expected_protoc_version("4.30.0"), eq("30.0")); + assert_that!(expected_protoc_version("4.30.0-alpha"), eq("30.0")); + assert_that!(expected_protoc_version("4.30.0-beta"), eq("30.0")); + assert_that!(expected_protoc_version("4.30.0-pre"), eq("30.0")); + assert_that!(expected_protoc_version("4.30.0-rc1"), eq("30.0-rc1")); } }