Forgot to update backtrace additional build file (#438)

bazelbuild · Oct 15, 2020 · ded2d87 · ded2d87
1 parent 037557a
commit ded2d87
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 42 deletions.
diff --git a/wasm_bindgen/raze/Cargo.toml b/wasm_bindgen/raze/Cargo.toml
@@ -21,7 +21,7 @@ wasm-bindgen-cli = "0.2.48"
 [raze.crates.backtrace-sys.'0.1.29']
 additional_build_file = "overrides/backtrace-sys-0.1.29.BUILD"
 additional_deps = [
-    ":native_backtrace"
+    ":backtrace_native"
 ]
 
 [raze.crates.libc.'0.2.77']

diff --git a/wasm_bindgen/raze/overrides/backtrace-sys-0.1.29.BUILD b/wasm_bindgen/raze/overrides/backtrace-sys-0.1.29.BUILD
@@ -1,23 +1,17 @@
+# buildifier: disable=load-on-top
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
-package(default_visibility = ["//ext/public/rust/cargo:__subpackages__"])
-
 licenses([
     "notice",  # "MIT,Apache-2.0"
 ])
 
-load(
-    "@io_bazel_rules_rust//rust:rust.bzl",
-    "rust_binary",
-    "rust_library",
-)
-
 genrule(
     name = "touch_config_header",
     outs = [
         "config.h",
     ],
     cmd = "touch $@",
+    visibility = ["//ext/public/rust/cargo:__subpackages__"],
 )
 
 genrule(
@@ -26,6 +20,7 @@ genrule(
         "backtrace-supported.h",
     ],
     cmd = "touch $@",
+    visibility = ["//ext/public/rust/cargo:__subpackages__"],
 )
 
 cc_library(
@@ -58,16 +53,5 @@ cc_library(
         "_LARGE_FILES=1",
     ],
     includes = ["."],
-)
-
-rust_library(
-    name = "backtrace_sys",
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    crate_type = "lib",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":backtrace_native",
-        "@raze__libc__0_2_58//:libc",
-    ],
+    visibility = ["//ext/public/rust/cargo:__subpackages__"],
 )
diff --git a/wasm_bindgen/raze/remote/backtrace-sys-0.1.29.BUILD b/wasm_bindgen/raze/remote/backtrace-sys-0.1.29.BUILD
@@ -36,7 +36,7 @@ rust_library(
     crate_type = "lib",
     deps = [
         "@rules_rust_wasm_bindgen__libc__0_2_77//:libc",
-        ":native_backtrace",
+        ":backtrace_native",
     ],
     srcs = glob(["**/*.rs"]),
     crate_root = "src/lib.rs",
@@ -55,26 +55,20 @@ rust_library(
 # Unsupported target "build-script-build" with type "custom-build" omitted
 
 # Additional content from overrides/backtrace-sys-0.1.29.BUILD
+# buildifier: disable=load-on-top
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
-package(default_visibility = ["//ext/public/rust/cargo:__subpackages__"])
-
 licenses([
     "notice",  # "MIT,Apache-2.0"
 ])
 
-load(
-    "@io_bazel_rules_rust//rust:rust.bzl",
-    "rust_binary",
-    "rust_library",
-)
-
 genrule(
     name = "touch_config_header",
     outs = [
         "config.h",
     ],
     cmd = "touch $@",
+    visibility = ["//ext/public/rust/cargo:__subpackages__"],
 )
 
 genrule(
@@ -83,6 +77,7 @@ genrule(
         "backtrace-supported.h",
     ],
     cmd = "touch $@",
+    visibility = ["//ext/public/rust/cargo:__subpackages__"],
 )
 
 cc_library(
@@ -115,16 +110,5 @@ cc_library(
         "_LARGE_FILES=1",
     ],
     includes = ["."],
-)
-
-rust_library(
-    name = "backtrace_sys",
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    crate_type = "lib",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":backtrace_native",
-        "@raze__libc__0_2_58//:libc",
-    ],
+    visibility = ["//ext/public/rust/cargo:__subpackages__"],
 )