Merge upstream 20210422 basedon revert squash

.bazelrc

@@ -1,2 +1,2 @@
 # Force Bazel to use --target=wasm32-wasi
-build --platforms=@io_bazel_rules_rust//rust/platform:wasi
+build --platforms=@rules_rust//rust/platform:wasi

.bazelversion

@@ -1 +1 @@
-3.7.0
+4.0.0

.github/workflows/rust.yml

@@ -45,42 +45,40 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/bazel
-            ~/.cache/bazelisk
-            ~/.cargo/.crates.toml
-            ~/.cargo/.crates2.json
-            ~/.cargo/bin
-            ~/.cargo/registry
-          key: ${{ hashFiles('WORKSPACE', '.bazelrc', '.bazelversion', 'bazel/cargo/Cargo.lock', 'bazel/dependencies.bzl', 'bazel/repositories.bzl') }}
-
-      - name: Build (wasm32-unknown-unknown)
-        run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasm //...
-
-      - name: Build (wasm32-wasi)
-        run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasi //...
-
-      - name: Format (buildifier)
-        run: |
-          GO111MODULE=on go get -u github.com/bazelbuild/buildtools/[email protected]
-          export PATH=$PATH:$(go env GOPATH)/bin
-          buildifier -mode=check WORKSPACE
-          buildifier -mode=check BUILD
-          buildifier -mode=check examples/BUILD
-
-      - name: Format (cargo raze)
-        run: |
-          cargo install cargo-raze --version 0.7.0
-          cp -p bazel/cargo/Cargo.lock .
-          rm -rf bazel/cargo/
-          cargo raze --output=bazel/cargo
-          mv Cargo.lock bazel/cargo/
-          git diff --exit-code
+    - uses: actions/checkout@v2
+
+    - name: Cache
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cache/bazel
+          ~/.cache/bazelisk
+          ~/.cargo/.crates.toml
+          ~/.cargo/.crates2.json
+          ~/.cargo/bin
+          ~/.cargo/registry
+        key: ${{ hashFiles('WORKSPACE', '.bazelrc', '.bazelversion', 'bazel/cargo/Cargo.raze.lock', 'bazel/dependencies.bzl', 'bazel/repositories.bzl') }}
+
+    - name: Build (wasm32-unknown-unknown)
+      run: bazelisk --noworkspace_rc build --platforms=@rules_rust//rust/platform:wasm //...
+
+    - name: Build (wasm32-wasi)
+      run: bazelisk --noworkspace_rc build --platforms=@rules_rust//rust/platform:wasi //...
+
+    - name: Format (buildifier)
+      run: |
+        GO111MODULE=on go get -u github.com/bazelbuild/buildtools/[email protected]
+        export PATH=$PATH:$(go env GOPATH)/bin
+        buildifier -mode=check WORKSPACE
+        buildifier -mode=check BUILD
+        buildifier -mode=check examples/BUILD
+
+    - name: Format (cargo raze)
+      run: |
+        mv bazel/cargo/Cargo.raze.lock Cargo.lock
+        bazelisk --noworkspace_rc run @cargo_raze//:raze -- --manifest-path=$(pwd)/Cargo.toml
+        mv Cargo.lock bazel/cargo/Cargo.raze.lock
+        git diff --exit-code
 
   stable:
     runs-on: ubuntu-latest
@@ -197,102 +195,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Run cargo outdated
-        run: cargo outdated --root-deps-only --exit-code 1
-
-      - name: Check freshness of bazel/cargo/Cargo.lock
-        run: |
-          cargo generate-lockfile
-          mv Cargo.lock bazel/cargo/
-          git diff --exit-code
+    - name: Run cargo outdated
+      run: cargo outdated --root-deps-only --exit-code 1
 
   audit:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Run cargo audit
-        run: |
-          cp -p bazel/cargo/Cargo.lock .
-          cargo audit
-
-  docs:
-    name: "Docs"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v2
-
-      - name: "Install Rust"
-        run: |
-          rustup update stable
-          rustup default stable
-          rustc -vV
-
-      - name: "Install 'wasm32-unknown-unknown'"
-        run: |
-          rustup target add wasm32-unknown-unknown
-
-      - name: "Build docs"
-        run: |
-          cargo doc --no-deps --target=wasm32-unknown-unknown
-
-      - name: "Publish GitHub Pages"
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/proxy-wasm-spec-0.1.0' }}
-        run: |
-          git fetch origin gh-pages                 # By default, 'actions/checkout' only fetches branch of the commit.
-          git worktree add /tmp/rustdoc gh-pages    # Checkout 'gh-pages' branch into '/tmp/rustdoc'
-          rm -rf /tmp/rustdoc/*                     # Remove all files (except for hidden files, such as .git directory)
-          cp -rp target/wasm32-unknown-unknown/doc/* /tmp/rustdoc/
-          cd /tmp/rustdoc
-          git add --all                             # This adds, modifies, and removes index entries to match the working tree.
-          if ! git diff --cached --exit-code ; then # There might be no changes to commit
-            GIT_AUTHOR_NAME="${{ github.event.head_commit.author.name }}" \
-              GIT_AUTHOR_EMAIL="${{ github.event.head_commit.author.email }}" \
-              GIT_AUTHOR_DATE="${{ github.event.head_commit.timestamp }}" \
-              GIT_COMMITTER_NAME="${{ github.event.head_commit.committer.name }}" \
-              GIT_COMMITTER_EMAIL="${{ github.event.head_commit.committer.email }}" \
-              GIT_COMMITTER_DATE="${{ github.event.head_commit.timestamp }}" \
-              git commit -m "${{ github.event.head_commit.message }}"
-            git push origin gh-pages
-          else
-            echo "There are no changes to GitHub Pages."
-          fi
-          git worktree remove --force /tmp/rustdoc  # Remove the working tree.
-
-  publish:
-    name: "Publish Crate"
-    if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
-    needs:
-      - stable
-      - nightly
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v2
-
-      - name: "Install Rust"
-        run: |
-          rustup update stable
-          rustup default stable
-          rustc -vV
-
-      - name: "Install 'wasm32-unknown-unknown'"
-        run: |
-          rustup target add wasm32-unknown-unknown
-
-      - name: "Check version"
-        run: |
-          version="$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | .version')"
-          tag="${GITHUB_REF##*/}"
-          if [[ "$version" != "$tag" ]]; then
-            echo "Package version according to Cargo.toml ($version) is different from the Git tag ($tag). Did you forget to bump the version in Cargo.toml ?"
-            exit 1
-          fi
-
-      - name: "Publish"
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
-        run: |
-          cargo publish --target=wasm32-unknown-unknown
+    - name: Run cargo audit
+      run: |
+        cp -p bazel/cargo/Cargo.raze.lock .
+        cargo audit

BUILD

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_rust//rust:rust.bzl", "rust_library")
+load("@rules_rust//rust:rust.bzl", "rust_library")
 
 rust_library(
     name = "proxy_wasm_experimental",

Cargo.toml

@@ -12,7 +12,7 @@ edition = "2018"
 wee-alloc = ["wee_alloc"]
 
 [dependencies]
-hashbrown = "0.9"
+hashbrown = "0.11"
 log = "0.4"
 wee_alloc = { version = "0.4", optional = true }
 
@@ -31,18 +31,10 @@ opt-level = 3
 panic = "abort"
 
 [package.metadata.raze]
+package_aliases_dir = "bazel/cargo"
 workspace_path = "//bazel/cargo"
 genmode = "Remote"
 
-[package.metadata.raze.crates.getrandom.'=0.2.0']
-gen_buildrs = true
-
-[package.metadata.raze.crates.libc.'=0.2.85']
-gen_buildrs = true
-
-[package.metadata.raze.crates.log.'=0.4.14']
-gen_buildrs = true
-
 [[example]]
 name = "hello_world"
 path = "examples/hello_world.rs"

README.md

@@ -30,9 +30,6 @@
 
 When updating dependencies, you need to regenerate Bazel `BUILD` files to match updated `Cargo.toml`:
 ```
-cargo install cargo-raze --version 0.7.0
-rm -rf bazel/cargo/
-cargo generate-lockfile
-cargo raze --output=bazel/cargo
-mv Cargo.lock bazel/cargo/
+cargo install cargo-raze --version 0.11.0
+cargo raze --generate-lockfile
 ```

WORKSPACE

@@ -7,3 +7,23 @@ proxy_wasm_rust_sdk_repositories()
 load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies")
 
 proxy_wasm_rust_sdk_dependencies()
+
+# Needed only when using @cargo_raze//:raze to generate BUILD files in //bazel/cargo.
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "cargo_raze",
+    sha256 = "73c5cea8ad3f4ef7788116d491070eeb27819fe0f923dbb6f451f69dd5fa752c",
+    # v0.11.0 with a few Bazel fixes.
+    strip_prefix = "cargo-raze-7614085d2748e55ad3032c9b1dca78f6011cb40e",
+    url = "https://github.com/google/cargo-raze/archive/7614085d2748e55ad3032c9b1dca78f6011cb40e.tar.gz",
+)
+
+load("@cargo_raze//:repositories.bzl", "cargo_raze_repositories")
+
+cargo_raze_repositories()
+
+load("@cargo_raze//:transitive_deps.bzl", "cargo_raze_transitive_deps")
+
+cargo_raze_transitive_deps()

bazel/cargo/BUILD.bazel

@@ -14,7 +14,7 @@ licenses([
 # Aliased targets
 alias(
     name = "bstr",
-    actual = "@raze__bstr__0_2_14//:bstr",
+    actual = "@raze__bstr__0_2_15//:bstr",
     tags = [
         "cargo-raze",
         "manual",
@@ -50,7 +50,7 @@ alias(
 
 alias(
     name = "hashbrown",
-    actual = "@raze__hashbrown__0_9_1//:hashbrown",
+    actual = "@raze__hashbrown__0_11_2//:hashbrown",
     tags = [
         "cargo-raze",
         "manual",
@@ -68,9 +68,17 @@ alias(
 
 alias(
     name = "version_sync",
-    actual = "@raze__version_sync__0_9_1//:version_sync",
+    actual = "@raze__version_sync__0_9_2//:version_sync",
     tags = [
         "cargo-raze",
         "manual",
     ],
 )
+
+# Export file for Stardoc support
+exports_files(
+    [
+        "crates.bzl",
+    ],
+    visibility = ["//visibility:public"],
+)