compileopts: move {root} replacement to compileopts.Emulator() #2454
Conversation
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
|
I think I know why CI failed. |
|
@dgryski please note merge conflict needing resolution, please. |
dgryski
force-pushed
the
dgryski/root-compileopts
branch
from
01e4260 to
b7db2b6
Compare
|
Fixed. |
aykevl
reviewed
Jan 14, 2022
Comment on lines
+467
to
+471
| var emulator []string | ||
| for _, s := range c.Target.Emulator { | ||
| emulator = append(emulator, strings.ReplaceAll(s, "{root}", goenv.Get("TINYGOROOT"))) | ||
| } |
There was a problem hiding this comment.
This works, but a more efficient version is the following:
Suggested change
| var emulator []string | |
| for _, s := range c.Target.Emulator { | |
| emulator = append(emulator, strings.ReplaceAll(s, "{root}", goenv.Get("TINYGOROOT"))) | |
| } | |
| emulator = make([]string, len(c.Target.Emulator)) | |
| for i, s := range c.Target.Emulator { | |
| emulator[i] = strings.ReplaceAll(s, "{root}", goenv.Get("TINYGOROOT")) | |
| } |
...probably not worth the effort though. Just an idea. It's even possible the Go compiler recognizes the idiom and optimizes it.
main_test.go
Outdated
Comment on lines
373
to
377
| // Probably not the best place to handle this | ||
| var emulator []string | ||
| for _, s := range spec.Emulator { | ||
| emulator = append(emulator, strings.ReplaceAll(s, "{root}", goenv.Get("TINYGOROOT"))) | ||
| } |
There was a problem hiding this comment.
Yeah, that kind of duplication doesn't look good.
What about this?
Suggested change
| // Probably not the best place to handle this | |
| var emulator []string | |
| for _, s := range spec.Emulator { | |
| emulator = append(emulator, strings.ReplaceAll(s, "{root}", goenv.Get("TINYGOROOT"))) | |
| } | |
| config := compileopts.Config{Target: spec} | |
| emulator := config.Emulator() |
A bit hacky but it works.
Also, spec.Emulator is also used below. It probably doesn't matter much though.
dgryski
force-pushed
the
dgryski/root-compileopts
branch
from
b7db2b6 to
632849f
Compare
|
@dgryski can you please resolve merge conflicts? Thank you. |
dgryski
force-pushed
the
dgryski/root-compileopts
branch
from
632849f to
27dbf35
Compare
|
Rebased. |
|
Thanks for the improvement @dgryski now merging. |
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.
Follow up for #2387 (comment)