Skip to content

crate_universe: Allow passing extra args down to crate_universe_bootstrap #2279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 25, 2023
Merged

crate_universe: Allow passing extra args down to crate_universe_bootstrap #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c56c093
crate_universe: Allow passing extra args down to crate_universe_boots…
DolceTriade Nov 23, 2023
a5b0d88
Regenerate documentation
DolceTriade Nov 23, 2023
7dd2783
Merge branch 'main' into nix
UebelAndre Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crate_universe/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ load("//crate_universe/3rdparty/crates:crates.bzl", _vendor_crate_repositories =
load("//crate_universe/private:vendor_utils.bzl", "crates_vendor_deps")
load("//crate_universe/tools/cross_installer:cross_installer_deps.bzl", "cross_installer_deps")

def crate_universe_dependencies(rust_version = rust_common.default_version, bootstrap = False):
def crate_universe_dependencies(rust_version = rust_common.default_version, bootstrap = False, **kwargs):
"""Define dependencies of the `cargo-bazel` Rust target

Args:
rust_version (str, optional): The version of rust to use when generating dependencies.
bootstrap (bool, optional): If true, a `cargo_bootstrap_repository` target will be generated.
**kwargs: Arguments to pass through to cargo_bazel_bootstrap.
"""
third_party_deps()

if bootstrap:
cargo_bazel_bootstrap(rust_version = rust_version)
cargo_bazel_bootstrap(rust_version = rust_version, **kwargs)

_vendor_crate_repositories()

Expand Down
3 changes: 2 additions & 1 deletion docs/crate_universe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ A macro for defining repositories for all generated crates
## crate_universe_dependencies

<pre>
crate_universe_dependencies(<a href="#crate_universe_dependencies-rust_version">rust_version</a>, <a href="#crate_universe_dependencies-bootstrap">bootstrap</a>)
crate_universe_dependencies(<a href="#crate_universe_dependencies-rust_version">rust_version</a>, <a href="#crate_universe_dependencies-bootstrap">bootstrap</a>, <a href="#crate_universe_dependencies-kwargs">kwargs</a>)
</pre>

Define dependencies of the `cargo-bazel` Rust target
Expand All @@ -732,6 +732,7 @@ Define dependencies of the `cargo-bazel` Rust target
| :------------- | :------------- | :------------- |
| <a id="crate_universe_dependencies-rust_version"></a>rust_version | The version of rust to use when generating dependencies. | `"1.74.0"` |
| <a id="crate_universe_dependencies-bootstrap"></a>bootstrap | If true, a <code>cargo_bootstrap_repository</code> target will be generated. | `False` |
| <a id="crate_universe_dependencies-kwargs"></a>kwargs | Arguments to pass through to cargo_bazel_bootstrap. | none |


<a id="render_config"></a>
Expand Down