Fix #1101 #1105
Merged
Fix #1101 #1105
Conversation
This file contains 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
emillon
approved these changes
Aug 7, 2018
ghost
suggested changes
Aug 7, 2018
bin/main.ml
Outdated
| @@ -658,75 +658,87 @@ let check_path contexts = | |||
| name | |||
| (hint name (String.Set.to_list contexts)) | |||
|
|
|||
| let resolve_targets ~log common (setup : Main.setup) user_targets = | |||
| let resolve_path path ~(setup : Main.setup) = | |||
| let check_path = check_path setup.contexts in | |||
There was a problem hiding this comment.
In both resolve_path and resolve_target, check_path is now used only once, so we don't need to partially apply it anymore
bin/main.ml
Outdated
| ) | ||
| in | ||
| List.map user_targets ~f:(function | ||
| | `String s -> resolve_target common ~setup s |
There was a problem hiding this comment.
Could you use a plain variant here? I find polymorphic variants more error prone and they provide no real benefit here
|
@diml good call. i addressed your review |
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Split it into 3 functinos * Resolve 1 targets * Do logging * Resolve all targets Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Do not attempt to convert string -> path -> string as this loses information Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
ghost
approved these changes
Aug 7, 2018
rgrinberg
added a commit
to rgrinberg/opam-repository
that referenced
this pull request
Aug 8, 2018
CHANGES: - Fix `$ jbuilder --dev` (ocaml/dune#1104, fixes ocaml/dune#1103, @rgrinberg) - Fix dune exec when `--build-dir` is set to an absolute path (ocaml/dune#1105, fixes ocaml/dune#1101, @rgrinberg) - Fix duplicate profile argument in suggested command when an external library is missing (ocaml/dune#1109, ocaml/dune#1106, @emillon) - `-opaque` wasn't correctly being added to modules without an interface. (ocaml/dune#1108, fix ocaml/dune#1107, @rgrinberg) - Fix validation of library `name` fields and make sure this validation also applies when the `name` is derived from the `public_name`. (ocaml/dune#1110, fix ocaml/dune#1102, @rgrinberg) - Fix a bug causing the toplevel `env` stanza in the workspace file to be ignored when at least one context had `(merlin)` (ocaml/dune#1114, @diml)
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.
cc @andreypopp. The code in this main module is getting hairy. We should probably re-organize our CLI soon-ish.