-
Notifications
You must be signed in to change notification settings - Fork 213
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.
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
Support for headers.dhall configuration #2236
Merged
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
6a02fac
WIP support for ~/.config/dhall/headers.dhall
timbertson 01438f1
load headers as dhall expressions, not JSON
timbertson b60c084
load headers from env in tests
timbertson 8c859bb
user headers take precedent over inline headers
timbertson 5c0711c
move UserHeaders out of HTTP manager
timbertson d8ff7ce
cleanup
timbertson 9f33559
use caller's stack when importing headers
timbertson addfbaa
revert unnecessary change
timbertson 54f2eda
Merge remote-tracking branch 'origin/master' into user-headers
timbertson e8ce0e8
PR feedback
timbertson 65f3a12
Implement site headers loading as a plain dhall expression
timbertson b233d23
refer to site / user headers as originHeaders consistently
timbertson 1799fd1
revert unnecessary diffs
timbertson 9e51f6b
minor
timbertson 85afb69
Load origin headers with an empty stack
timbertson dd85fba
revert the addition of OriginHeaders ImportMode
timbertson 88f6fbd
reset dhall-lang submodule
timbertson c77f5a7
loadOriginHeaders: use parent stack instead of special-casing reentra…
timbertson 02a65a3
fix compilation failure when building without http
timbertson a78e942
revert unnecessary diffs
timbertson 14201cd
Merge remote-tracking branch 'origin/master' into user-headers
timbertson dd515d9
raise haddock coverage in Import module
timbertson 0d9ffa2
fix haddock warning
timbertson 84b4c6d
Merge remote-tracking branch 'origin/master' into user-headers
timbertson 770cbab
fix compilation error when HTTP is disabled
timbertson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made one mistake when I previously suggested using the ambient
StateT
for_loadOriginHeaders
. We do still want_loadOriginHeaders
to useStateT
, but we want the_stack
to be temporarily reset to contain just one import, which is the path to origin headers. This is because of this line from the standard:The key bit is the
(ε, headersPath)
part, which says that when resolving theuserHeadersExpr
you want the stack to contain only the headers path and nothing else.However, we don't have to reset the stack here within the
fetchFromHttpUrl
function. Instead, I think the best place to do that would be inside of the_loadOriginHeaders
function. I'll comment below with some more notes about how to do that.