Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into patch-stack
Browse files Browse the repository at this point in the history
  • Loading branch information
mattklein123 committed Sep 5, 2024
2 parents b35660c + 0beff24 commit 9e9818e
Show file tree
Hide file tree
Showing 17 changed files with 7 additions and 24 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 0 additions & 1 deletion protobuf-codegen/src/gen/code_writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]");
Expand Down
8 changes: 0 additions & 8 deletions protobuf/regenerate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion protobuf/src/descriptor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/doctest_pb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/rustproto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/any.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/duration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/empty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/field_mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/source_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/struct_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/timestamp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/type_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/well_known_types/wrappers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down

0 comments on commit 9e9818e

Please sign in to comment.