Merge remote-tracking branch 'upstream/master' into patch-stack

Author: mattklein123

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## [3.5] - Unreleased
+## [3.6] - Unreleased
+
+## [3.5.1] - Unreleased
+
+- [Remove deprecated `box_pointers` lint](https://github.com/stepancheg/rust-protobuf/pull/733)
+
+## [3.5.0] - 2024-06-26
 
 - [Default to packed for repeated primitives in proto3](https://github.com/stepancheg/rust-protobuf/pull/707)
 - [Put correct flag in comment of generated files](https://github.com/stepancheg/rust-protobuf/pull/655)

protobuf-codegen/src/gen/code_writer.rs

@@ -85,7 +85,6 @@ impl<'a> CodeWriter<'a> {
         self.write_line("#![allow(unused_attributes)]");
         self.write_line("#![cfg_attr(rustfmt, rustfmt::skip)]");
         self.write_line("");
-        self.write_line("#![allow(box_pointers)]");
         self.write_line("#![allow(dead_code)]");
         self.write_line("#![allow(missing_docs)]");
         self.write_line("#![allow(non_camel_case_types)]");

protobuf/regenerate.sh

@@ -7,14 +7,6 @@ die() {
     exit 1
 }
 
-protoc_ver=$(protoc --version)
-case "$protoc_ver" in
-"libprotoc 3"*) ;;
-*)
-    die "you need to use protobuf 3 to regenerate .rs from .proto"
-    ;;
-esac
-
 cargo build --manifest-path=../protobuf-codegen/Cargo.toml
 cargo build --manifest-path=../protoc-bin/Cargo.toml --bin protoc-bin-print-paths
 

protobuf/src/descriptor.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]

protobuf/src/doctest_pb.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]

protobuf/src/plugin.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]

protobuf/src/rustproto.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]

protobuf/src/well_known_types/any.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]

protobuf/src/well_known_types/api.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]

protobuf/src/well_known_types/duration.rs

@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]