Skip to content

Commit

Permalink
Updated cargo_universe examples (bazelbuild#676)
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Wagner-Hall <dwagnerhall@apple.com>
  • Loading branch information
UebelAndre and illicitonion authored Apr 7, 2021
1 parent e3a818c commit 9f15a01
Show file tree
Hide file tree
Showing 18 changed files with 162 additions and 247 deletions.
2 changes: 0 additions & 2 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
docs
examples
examples/crate_universe
examples/cargo_manifest_dir/external_crate
1 change: 1 addition & 0 deletions examples/crate_universe/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bazel-*
Empty file.
42 changes: 42 additions & 0 deletions examples/crate_universe/WORKSPACE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
workspace(name = "rules_rust_examples_crate_universe")

local_repository(
name = "rules_rust",
path = "../../..",
)

load("@rules_rust//rust:repositories.bzl", "rust_repositories")

rust_repositories()

load("//basic:workspace.bzl", basic_deps = "deps")

basic_deps()

load("@basic_deps//:defs.bzl", basic_deps_pinned_rust_install = "pinned_rust_install")

basic_deps_pinned_rust_install()

load("//has_aliased_deps:workspace.bzl", has_aliased_deps_deps = "deps")

has_aliased_deps_deps()

load("@has_aliased_deps_deps//:defs.bzl", has_aliased_deps_deps_pinned_rust_install = "pinned_rust_install")

has_aliased_deps_deps_pinned_rust_install()

load("//uses_proc_macro:workspace.bzl", uses_proc_macro_deps = "deps")

uses_proc_macro_deps()

load("@uses_proc_macro_deps//:defs.bzl", uses_proc_macro_deps_pinned_rust_install = "pinned_rust_install")

uses_proc_macro_deps_pinned_rust_install()

load("//uses_sys_crate:workspace.bzl", uses_sys_crate_deps = "deps")

uses_sys_crate_deps()

load("@uses_sys_crate_deps//:defs.bzl", uses_sys_crate_deps_pinned_rust_install = "pinned_rust_install")

uses_sys_crate_deps_pinned_rust_install()
7 changes: 2 additions & 5 deletions examples/crate_universe/basic/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
load(
"@rules_rust//rust:rust.bzl",
"rust_binary",
)
load("@rust_deps//:defs.bzl", "crate")
load("@basic_deps//:defs.bzl", "crate")
load("@rules_rust//rust:defs.bzl", "rust_binary")

rust_binary(
name = "basic",
Expand Down
46 changes: 0 additions & 46 deletions examples/crate_universe/basic/WORKSPACE.bazel

This file was deleted.

18 changes: 18 additions & 0 deletions examples/crate_universe/basic/workspace.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"""A module for loading crate universe dependencies"""

load("@rules_rust//crate_universe:defs.bzl", "crate", "crate_universe")

def deps():
crate_universe(
name = "basic_deps",
packages = [
crate.spec(
name = "lazy_static",
semver = "=1.4",
),
],
supported_targets = [
"x86_64-apple-darwin",
"x86_64-unknown-linux-gnu",
],
)
7 changes: 2 additions & 5 deletions examples/crate_universe/has_aliased_deps/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
load(
"@rules_rust//rust:rust.bzl",
"rust_binary",
)
load("@rust_deps//:defs.bzl", "crate")
load("@has_aliased_deps_deps//:defs.bzl", "crate")
load("@rules_rust//rust:defs.bzl", "rust_binary")

rust_binary(
name = "has_aliased_deps",
Expand Down
69 changes: 0 additions & 69 deletions examples/crate_universe/has_aliased_deps/WORKSPACE.bazel

This file was deleted.

37 changes: 37 additions & 0 deletions examples/crate_universe/has_aliased_deps/workspace.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
"""A module for loading crate universe dependencies"""

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
load("@rules_rust//crate_universe:defs.bzl", "crate", "crate_universe")

def deps():
maybe(
http_archive,
name = "openssl",
build_file = "//has_aliased_deps:BUILD.openssl.bazel",
sha256 = "23011a5cc78e53d0dc98dfa608c51e72bcd350aa57df74c5d5574ba4ffb62e74",
strip_prefix = "openssl-OpenSSL_1_1_1d",
urls = ["https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz"],
)

crate_universe(
name = "has_aliased_deps_deps",
cargo_toml_files = ["//has_aliased_deps:Cargo.toml"],
overrides = {
"openssl-sys": crate.override(
extra_build_script_env_vars = {
"OPENSSL_DIR": "../openssl/openssl",
},
extra_bazel_deps = {
"cfg(all())": ["@openssl//:openssl"],
},
extra_build_script_bazel_data_deps = {
"cfg(all())": ["@openssl//:openssl"],
},
),
},
supported_targets = [
"x86_64-apple-darwin",
"x86_64-unknown-linux-gnu",
],
)
7 changes: 2 additions & 5 deletions examples/crate_universe/uses_proc_macro/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
load(
"@rules_rust//rust:rust.bzl",
"rust_binary",
)
load("@rust_deps//:defs.bzl", "crate")
load("@rules_rust//rust:defs.bzl", "rust_binary")
load("@uses_proc_macro_deps//:defs.bzl", "crate")

rust_binary(
name = "uses_proc_macro",
Expand Down
30 changes: 0 additions & 30 deletions examples/crate_universe/uses_proc_macro/WORKSPACE.bazel

This file was deleted.

9 changes: 9 additions & 0 deletions examples/crate_universe/uses_proc_macro/workspace.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
"""A module for loading crate universe dependencies"""

load("@rules_rust//crate_universe:defs.bzl", "crate_universe")

def deps():
crate_universe(
name = "uses_proc_macro_deps",
cargo_toml_files = ["//uses_proc_macro:Cargo.toml"],
)
7 changes: 2 additions & 5 deletions examples/crate_universe/uses_sys_crate/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
load(
"@rules_rust//rust:rust.bzl",
"rust_binary",
)
load("@rust_deps//:defs.bzl", "crate")
load("@rules_rust//rust:defs.bzl", "rust_binary")
load("@uses_sys_crate_deps//:defs.bzl", "crate")

package(default_visibility = ["//visibility:public"])

Expand Down
48 changes: 0 additions & 48 deletions examples/crate_universe/uses_sys_crate/WORKSPACE.bazel

This file was deleted.

Loading

0 comments on commit 9f15a01

Please sign in to comment.