[pull] master from tokio-rs:master

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "build(deps)"

.github/workflows/ci.yml

@@ -10,8 +10,28 @@ on:
 
 env:
   PROTOC_VERSION: 3.20.3
+  clippy_rust_version: 1.78
 
 jobs:
+  # Depends on all actions that are required for a "successful" CI run.
+  tests-pass:
+    name: all systems go
+    runs-on: ubuntu-latest
+    needs:
+      - rustfmt
+      - toml_validation
+      - clippy
+      - docs
+      - machete
+      - unused_dependencies
+      - test
+      - msrv
+      - minimal-versions
+      - kani
+      - no-std
+      - check-readme
+    steps:
+      - run: exit 0
 
   rustfmt:
     runs-on: ubuntu-latest
@@ -22,6 +42,55 @@ jobs:
           components: rustfmt
       - run: cargo fmt --all --check
 
+  toml_validation:
+    runs-on: ubuntu-latest
+    container:
+      image: tamasfe/taplo:0.8.1
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: taplo lint
+        run: taplo lint
+      - name: taplo fmt
+        run: taplo fmt --check --diff
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: install protoc
+        uses: taiki-e/install-action@v2
+        with:
+          tool: protoc@${{ env.PROTOC_VERSION }}
+      - name: install ninja
+        uses: ./.github/actions/setup-ninja
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.clippy_rust_version }}
+          components: clippy
+      - run: cargo clippy --workspace --exclude protobuf --all-features --tests -- -D warnings
+
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: install protoc
+        uses: taiki-e/install-action@v2
+        with:
+          tool: protoc@${{ env.PROTOC_VERSION }}
+      - name: install ninja
+        uses: ./.github/actions/setup-ninja
+      - uses: dtolnay/rust-toolchain@stable
+      - name: "doc --lib --all-features"
+        run: |
+          cargo doc --lib --no-deps --all-features --document-private-items
+        env:
+          RUSTDOCFLAGS: -Dwarnings
+
   machete:
     runs-on: ubuntu-latest
     steps:
@@ -31,19 +100,40 @@ jobs:
       - name: Check unused dependencies
         run: cargo machete
 
+  unused_dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - uses: dtolnay/rust-toolchain@nightly
+      - name: install protoc
+        uses: taiki-e/install-action@v2
+        with:
+          tool: protoc@${{ env.PROTOC_VERSION }}
+      - name: install ninja
+        uses: ./.github/actions/setup-ninja
+      - name: install cargo-udeps
+        uses: taiki-e/install-action@cargo-udeps
+      - name: cargo udeps
+        run: cargo +nightly udeps
+      - name: cargo udeps all-targets
+        run: cargo +nightly udeps --all-targets
+
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         toolchain:
           - stable
-          - "1.70"
         os:
           - ubuntu-latest
           - macos-latest
           - windows-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - name: install toolchain (${{ matrix.toolchain }})
         uses: dtolnay/rust-toolchain@master
         with:
@@ -56,15 +146,30 @@ jobs:
         uses: ./.github/actions/setup-ninja
       - uses: Swatinem/rust-cache@v2
       - name: test
-        run: cargo test --workspace --all-targets
+        run: cargo test --all-targets
       - name: test no-default-features
         run: cargo test -p prost-build -p prost-derive -p prost-types --all-targets --no-default-features
       # Run doc tests separately: https://github.com/rust-lang/cargo/issues/6669
       - name: test doc
-        run: cargo test --workspace --doc
+        run: cargo test --doc
       - name: test doc no-default-features
         run: cargo test -p prost-build -p prost-derive -p prost-types --doc --no-default-features
 
+  msrv:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: install protoc
+        uses: taiki-e/install-action@v2
+        with:
+          tool: protoc@${{ env.PROTOC_VERSION }}
+      - uses: taiki-e/install-action@cargo-hack
+      - uses: Swatinem/rust-cache@v2
+      - name: check with no-default-features
+        run: cargo hack --rust-version --no-private --no-dev-deps check --no-default-features
+      - name: check with all-features
+        run: cargo hack --rust-version --no-private --no-dev-deps check --all-features
+
   minimal-versions:
     runs-on: ubuntu-latest
     steps:
@@ -73,7 +178,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-hack
       - uses: taiki-e/install-action@cargo-minimal-versions
-      - run: cargo minimal-versions --no-private check --workspace --all-features
+      - run: cargo minimal-versions --no-private check --all-features
 
   kani:
     runs-on: ubuntu-latest
@@ -110,7 +215,7 @@ jobs:
         with:
           crate: cargo-no-std-check
       - name: prost cargo-no-std-check
-        run: cargo no-std-check --manifest-path Cargo.toml --no-default-features
+        run: cargo no-std-check --manifest-path prost/Cargo.toml --no-default-features
       - name: prost-types cargo-no-std-check
         run: cargo no-std-check --manifest-path prost-types/Cargo.toml --no-default-features
       # prost-build depends on prost with --no-default-features, but when
@@ -120,3 +225,15 @@ jobs:
       # prost's default features to compile.
       - name: prost-build check
         run: cargo check --manifest-path prost-build/Cargo.toml
+
+  check-readme:
+    name: Check README
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Verify that both READMEs are identical
+        run: diff README.md prost/README.md
+
+      - name: Verify that Prost version is up to date in README
+        working-directory: prost
+        run: grep -q "$(sed '/^version = /!d' Cargo.toml | head -n1)" README.md

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/protobuf"]
+	path = third_party/protobuf
+	url = https://github.com/protocolbuffers/protobuf.git

Cargo.toml

@@ -1,24 +1,7 @@
-[package]
-name = "prost"
-version = "0.12.4"
-authors = [
-    "Dan Burkert <dan@danburkert.com>",
-    "Lucio Franco <luciofranco14@gmail.com",
-    "Tokio Contributors <team@tokio.rs>",
-]
-license = "Apache-2.0"
-repository = "https://github.com/tokio-rs/prost"
-documentation = "https://docs.rs/prost"
-readme = "README.md"
-description = "A Protocol Buffers implementation for the Rust Language."
-keywords = ["protobuf", "serialization"]
-categories = ["encoding"]
-edition = "2021"
-rust-version = "1.70"
-
 [workspace]
 members = [
   "conformance",
+  "prost",
   "prost-build",
   "prost-derive",
   "prost-types",
@@ -37,31 +20,20 @@ exclude = [
   "afl",
 ]
 
-[lib]
-# https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
-bench = false
-
-[features]
-default = ["derive", "std"]
-derive = ["dep:prost-derive"]
-prost-derive = ["derive"]     # deprecated, please use derive feature instead
-no-recursion-limit = []
-std = []
+resolver = "2"
 
-[dependencies]
-bytes = { version = "1", default-features = false }
-prost-derive = { version = "0.12.4", path = "prost-derive", optional = true }
-
-[dev-dependencies]
-criterion = { version = "0.4", default-features = false }
-env_logger = { version = "0.10", default-features = false }
-log = "0.4"
-proptest = "1"
-rand = "0.8"
+[workspace.package]
+version = "0.12.6"
+authors = [
+  "Dan Burkert <dan@danburkert.com>",
+  "Lucio Franco <luciofranco14@gmail.com>",
+  "Casper Meijn <casper@meijn.net>",
+  "Tokio Contributors <team@tokio.rs>",
+]
+license = "Apache-2.0"
+repository = "https://github.com/tokio-rs/prost"
+rust-version = "1.70"
+edition = "2021"
 
 [profile.bench]
 debug = true
-
-[[bench]]
-name = "varint"
-harness = false

README.md

@@ -1,4 +1,4 @@
-![continuous integration](https://github.com/tokio-rs/prost/workflows/continuous%20integration/badge.svg)
+[![continuous integration](https://github.com/tokio-rs/prost/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/tokio-rs/prost/actions/workflows/ci.yml?query=branch%3Amaster)
 [![Documentation](https://docs.rs/prost/badge.svg)](https://docs.rs/prost/)
 [![Crate](https://img.shields.io/crates/v/prost.svg)](https://crates.io/crates/prost)
 [![Dependency Status](https://deps.rs/repo/github/tokio-rs/prost/status.svg)](https://deps.rs/repo/github/tokio-rs/prost)
@@ -380,9 +380,9 @@ the `std` features in `prost` and `prost-types`:
 
 ```ignore
 [dependencies]
-prost = { version = "0.6", default-features = false, features = ["prost-derive"] }
+prost = { version = "0.12.6", default-features = false, features = ["prost-derive"] }
 # Only necessary if using Protobuf well-known types:
-prost-types = { version = "0.6", default-features = false }
+prost-types = { version = "0.12.6", default-features = false }
 ```
 
 Additionally, configure `prost-build` to output `BTreeMap`s instead of `HashMap`s

clippy.toml

@@ -1 +1 @@
-too-many-arguments-threshold=8
+too-many-arguments-threshold = 8

conformance/Cargo.toml

@@ -1,16 +1,13 @@
 [package]
 name = "conformance"
 version = "0.0.0"
-authors = [
-    "Dan Burkert <dan@danburkert.com>",
-    "Tokio Contributors <team@tokio.rs>",
-]
 publish = false
-edition = "2018"
+edition.workspace = true
+authors.workspace = true
 
 [dependencies]
 bytes = "1"
-env_logger = { version = "0.10", default-features = false }
-prost = { path = ".." }
+env_logger = { version = "0.11", default-features = false }
+prost = { path = "../prost" }
 protobuf = { path = "../protobuf" }
 tests = { path = "../tests" }

conformance/src/main.rs

@@ -12,7 +12,7 @@ use tests::{roundtrip, RoundtripResult};
 
 fn main() -> io::Result<()> {
     env_logger::init();
-    let mut bytes = Vec::new();
+    let mut bytes = vec![0; 4];
 
     loop {
         bytes.resize(4, 0);

fuzz/Cargo.toml

@@ -1,19 +1,15 @@
 [package]
 name = "fuzz"
 version = "0.0.0"
-authors = [
-    "Dan Burkert <dan@danburkert.com>",
-    "Tokio Contributors <team@tokio.rs>",
-]
 publish = false
-edition = "2018"
+edition.workspace = true
+authors.workspace = true
 
 [package.metadata]
 cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
-protobuf = { path = "../protobuf" }
 tests = { path = "../tests" }
 
 [[bin]]

fuzz/afl/proto3/Cargo.toml

@@ -2,7 +2,7 @@
 name = "fuzz-target-proto3"
 version = "0.1.0"
 authors = ["Prost developers"]
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "fuzz-target"

prepare-release.sh

@@ -14,31 +14,31 @@ fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 VERSION="$1"
-MINOR="$( echo ${VERSION} | cut -d\. -f1-2 )"
 
 VERSION_MATCHER="([a-z0-9\\.-]+)"
 PROST_CRATE_MATCHER="(prost|prost-[a-z]+)"
 
 # Update the README.md.
-sed -i -E "s/${PROST_CRATE_MATCHER} = \"${VERSION_MATCHER}\"/\1 = \"${MINOR}\"/" "$DIR/README.md"
+sed -i -E "s/version = \"${VERSION_MATCHER}\"/version = \"${VERSION}\"/" "$DIR/README.md"
+sed -i -E "s/version = \"${VERSION_MATCHER}\"/version = \"${VERSION}\"/" "$DIR/prost/README.md"
 
 # Update html_root_url attributes.
 sed -i -E "s~html_root_url = \"https://docs\.rs/${PROST_CRATE_MATCHER}/$VERSION_MATCHER\"~html_root_url = \"https://docs.rs/\1/${VERSION}\"~" \
-  "$DIR/src/lib.rs" \
+  "$DIR/prost/src/lib.rs" \
   "$DIR/prost-derive/src/lib.rs" \
   "$DIR/prost-build/src/lib.rs" \
   "$DIR/prost-types/src/lib.rs"
 
 # Update Cargo.toml version fields.
 sed -i -E "s/^version = \"${VERSION_MATCHER}\"$/version = \"${VERSION}\"/" \
-  "$DIR/Cargo.toml" \
+  "$DIR/prost/Cargo.toml" \
   "$DIR/prost-derive/Cargo.toml" \
   "$DIR/prost-build/Cargo.toml" \
   "$DIR/prost-types/Cargo.toml"
 
 # Update Cargo.toml dependency versions.
 sed -i -E "s/^${PROST_CRATE_MATCHER} = \{ version = \"${VERSION_MATCHER}\"/\1 = { version = \"${VERSION}\"/" \
-  "$DIR/Cargo.toml" \
+  "$DIR/prost/Cargo.toml" \
   "$DIR/prost-derive/Cargo.toml" \
   "$DIR/prost-build/Cargo.toml" \
   "$DIR/prost-types/Cargo.toml"