diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-10-23 14:37:09 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-10-23 19:41:22 +0200 |
commit | 6636cf1bea77d20ef2a72a45fae59ac402fb133b (patch) | |
tree | 91c9435acd1a2139f8816abcd9b0d978ff2fa300 /tpl | |
parent | f669ef6bec25155d015b6ab231c53caef4fa5cdc (diff) |
Resolve error handling/parser related TODOs
See #5324
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/data/data.go | 1 | ||||
-rw-r--r-- | tpl/template.go | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tpl/data/data.go b/tpl/data/data.go index 03fd27606..8b3eb8292 100644 --- a/tpl/data/data.go +++ b/tpl/data/data.go @@ -120,7 +120,6 @@ func (ns *Namespace) GetJSON(urlParts ...string) (v interface{}, err error) { if err != nil { return nil, _errors.Wrapf(err, "failed to get getJSON resource %q", url) - return nil, nil } return } diff --git a/tpl/template.go b/tpl/template.go index 12a4607fb..968705493 100644 --- a/tpl/template.go +++ b/tpl/template.go @@ -179,7 +179,7 @@ func (t *TemplateAdapter) addFileContext(name string, inerr error) error { } return false } - // TODO(bep) 2errors text vs HTML + fe, ok := herrors.WithFileContext(ferr, realFilename, f, lineMatcher) if ok || !hasMaster { return fe |