Skip to content

Remove triple field from triple struct in favor of str #1297

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 1 commit into from
Apr 26, 2022
Merged

Remove triple field from triple struct in favor of str #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cargo/cargo_bootstrap.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def _cargo_bootstrap_repository_impl(repository_ctx):

# In addition to platform specific environment variables, a common set (indicated by `*`) will always
# be gathered.
environment = dict(_collect_environ(repository_ctx, "*").items() + _collect_environ(repository_ctx, host_triple.triple).items())
environment = dict(_collect_environ(repository_ctx, "*").items() + _collect_environ(repository_ctx, host_triple.str).items())

built_binary = cargo_bootstrap(
repository_ctx = repository_ctx,
Expand Down
4 changes: 2 additions & 2 deletions cargo/private/cargo_utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def get_rust_tools(cargo_template, rustc_template, host_triple, version):
cargo_label = Label(_resolve_repository_template(
template = cargo_template,
version = version,
triple = host_triple.triple,
triple = host_triple.str,
arch = host_triple.arch,
vendor = host_triple.vendor,
system = host_triple.system,
Expand All @@ -77,7 +77,7 @@ def get_rust_tools(cargo_template, rustc_template, host_triple, version):
rustc_label = Label(_resolve_repository_template(
template = rustc_template,
version = version,
triple = host_triple.triple,
triple = host_triple.str,
arch = host_triple.arch,
vendor = host_triple.vendor,
system = host_triple.system,
Expand Down
2 changes: 1 addition & 1 deletion crate_universe/private/crates_repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def _crates_repository_impl(repository_ctx):
host_triple = get_host_triple(repository_ctx)

# Locate the generator to use
generator, generator_sha256 = get_generator(repository_ctx, host_triple.triple)
generator, generator_sha256 = get_generator(repository_ctx, host_triple.str)

# Generate a config file for all settings
config_path = generate_config(repository_ctx)
Expand Down
3 changes: 0 additions & 3 deletions rust/platform/triple.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def triple(triple):
- system (str): The name of the system
- abi (str, optional): The abi to use or None if abi does not apply.
- str (str): Original string representation of the triple
- triple (str): Deprecated; same as str
"""
if triple == "wasm32-wasi":
return struct(
Expand All @@ -29,7 +28,6 @@ def triple(triple):
vendor = "wasi",
abi = None,
str = triple,
triple = triple,
)

component_parts = triple.split("-")
Expand All @@ -54,7 +52,6 @@ def triple(triple):
system = system,
abi = abi,
str = triple,
triple = triple,
)

_CPU_ARCH_ERROR_MSG = """\
Expand Down