Skip to content
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

Jump to bottom

Recognize edition = "required" idiom #1255

Closed
wants to merge 1 commit into from
Closed

Recognize edition = "required" idiom #1255

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/private/rust.bzl
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ def get_edition(attr, toolchain, label):
"""
if getattr(attr, "edition"):
return attr.edition
elif not toolchain.default_edition:
elif toolchain.default_edition == "required" or not toolchain.default_edition:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the order of comparisons would need to be switched to avoid an error (None check first).

fail("Attribute `edition` is required for {}.".format(label))
else:
return toolchain.default_edition
Expand Down