Fix DSL#env override covariance error#22023
Merged
MikeMcQuaid merged 2 commits intomainfrom Apr 15, 2026
Merged
Conversation
- `typed: strict` on `build_environment.rb` tightened `DSL#env` to `returns(BuildEnvironment)` but the `Requirement` override legitimately returns `nil` - Mark `DSL#env` as `overridable` with nilable return - Replace `T.must` with explicit `ArgumentError` guard - Add missing `override.` to `Requirement.env` sig
Contributor
There was a problem hiding this comment.
Pull request overview
Resolves a Sorbet covariance/typechecking error around BuildEnvironment::DSL#env so that Requirement.env can legitimately return nil when used in its block form.
Changes:
- Make
BuildEnvironment::DSL#envoverridableand widen its return type toT.nilable(BuildEnvironment)to support nil-returning overrides. - Replace
T.must(@env)with an explicitArgumentErrorguard when@envis not initialized. - Mark
Requirement.env’s signature as an explicitoverride.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| Library/Homebrew/build_environment.rb | Widen DSL#env return type for override compatibility and add explicit guard when @env is unset. |
| Library/Homebrew/requirement.rb | Mark env sig as override to match the intended Sorbet override relationship. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dduugg
approved these changes
Apr 15, 2026
krehel
approved these changes
Apr 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
typed: strictonbuild_environment.rbtightenedDSL#envtoreturns(BuildEnvironment)but theRequirementoverride legitimately returnsnilDSL#envasoverridablewith nilable returnT.mustwith explicitArgumentErrorguardoverride.toRequirement.envsigFixes #22022
brew lgtm(style, typechecking and tests) with your changes locally?Worked with Claude Code with manual review and testing.