Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-cli
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Operations
Operations
Metrics
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-cli
Commits
ded2cc3d
Commit
ded2cc3d
authored
Jan 08, 2019
by
Cristian Maglie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated github.com/pkg/errors from 0.8.0 to 0.8.1
Fix #111
parent
f87c9a3f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
65 deletions
+51
-65
Gopkg.lock
Gopkg.lock
+3
-3
vendor/github.com/pkg/errors/.travis.yml
vendor/github.com/pkg/errors/.travis.yml
+8
-4
vendor/github.com/pkg/errors/README.md
vendor/github.com/pkg/errors/README.md
+2
-2
vendor/github.com/pkg/errors/errors.go
vendor/github.com/pkg/errors/errors.go
+28
-15
vendor/github.com/pkg/errors/stack.go
vendor/github.com/pkg/errors/stack.go
+10
-41
No files found.
Gopkg.lock
View file @
ded2cc3d
...
@@ -234,12 +234,12 @@
...
@@ -234,12 +234,12 @@
revision = "5dcf00d8b228be86307f952f550f2191d956b9e2"
revision = "5dcf00d8b228be86307f952f550f2191d956b9e2"
[[projects]]
[[projects]]
digest = "1:
40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747
"
digest = "1:
cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b
"
name = "github.com/pkg/errors"
name = "github.com/pkg/errors"
packages = ["."]
packages = ["."]
pruneopts = "UT"
pruneopts = "UT"
revision = "
645ef00459ed84a119197bfb8d8205042c6df63d
"
revision = "
ba968bfe8b2f7e042a574c888954fccecfa385b4
"
version = "v0.8.
0
"
version = "v0.8.
1
"
[[projects]]
[[projects]]
digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
...
...
vendor/github.com/pkg/errors/.travis.yml
View file @
ded2cc3d
language
:
go
language
:
go
go_import_path
:
github.com/pkg/errors
go_import_path
:
github.com/pkg/errors
go
:
go
:
-
1.4.3
-
1.4.x
-
1.5.4
-
1.5.x
-
1.6.2
-
1.6.x
-
1.7.1
-
1.7.x
-
1.8.x
-
1.9.x
-
1.10.x
-
1.11.x
-
tip
-
tip
script
:
script
:
...
...
vendor/github.com/pkg/errors/README.md
View file @
ded2cc3d
# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors)
# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors)
[![Sourcegraph](https://sourcegraph.com/github.com/pkg/errors/-/badge.svg)](https://sourcegraph.com/github.com/pkg/errors?badge)
Package errors provides simple error handling primitives.
Package errors provides simple error handling primitives.
...
@@ -47,6 +47,6 @@ We welcome pull requests, bug fixes and issue reports. With that said, the bar f
...
@@ -47,6 +47,6 @@ We welcome pull requests, bug fixes and issue reports. With that said, the bar f
Before proposing a change, please discuss your change by raising an issue.
Before proposing a change, please discuss your change by raising an issue.
## Licen
c
e
## Licen
s
e
BSD-2-Clause
BSD-2-Clause
vendor/github.com/pkg/errors/errors.go
View file @
ded2cc3d
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
// return err
// return err
// }
// }
//
//
// which applied recursively up the call stack results in error reports
// which
when
applied recursively up the call stack results in error reports
// without context or debugging information. The errors package allows
// without context or debugging information. The errors package allows
// programmers to add context to the failure path in their code in a way
// programmers to add context to the failure path in their code in a way
// that does not destroy the original value of the error.
// that does not destroy the original value of the error.
...
@@ -15,16 +15,17 @@
...
@@ -15,16 +15,17 @@
//
//
// The errors.Wrap function returns a new error that adds context to the
// The errors.Wrap function returns a new error that adds context to the
// original error by recording a stack trace at the point Wrap is called,
// original error by recording a stack trace at the point Wrap is called,
//
and
the supplied message. For example
//
together with
the supplied message. For example
//
//
// _, err := ioutil.ReadAll(r)
// _, err := ioutil.ReadAll(r)
// if err != nil {
// if err != nil {
// return errors.Wrap(err, "read failed")
// return errors.Wrap(err, "read failed")
// }
// }
//
//
// If additional control is required the errors.WithStack and errors.WithMessage
// If additional control is required, the errors.WithStack and
// functions destructure errors.Wrap into its component operations of annotating
// errors.WithMessage functions destructure errors.Wrap into its component
// an error with a stack trace and an a message, respectively.
// operations: annotating an error with a stack trace and with a message,
// respectively.
//
//
// Retrieving the cause of an error
// Retrieving the cause of an error
//
//
...
@@ -38,7 +39,7 @@
...
@@ -38,7 +39,7 @@
// }
// }
//
//
// can be inspected by errors.Cause. errors.Cause will recursively retrieve
// can be inspected by errors.Cause. errors.Cause will recursively retrieve
// the topmost error
which
does not implement causer, which is assumed to be
// the topmost error
that
does not implement causer, which is assumed to be
// the original cause. For example:
// the original cause. For example:
//
//
// switch err := errors.Cause(err).(type) {
// switch err := errors.Cause(err).(type) {
...
@@ -48,16 +49,16 @@
...
@@ -48,16 +49,16 @@
// // unknown error
// // unknown error
// }
// }
//
//
//
causer interface is not exported by this package, but is considered a part
//
Although the causer interface is not exported by this package, it is
//
of stable public API
.
//
considered a part of its stable public interface
.
//
//
// Formatted printing of errors
// Formatted printing of errors
//
//
// All error values returned from this package implement fmt.Formatter and can
// All error values returned from this package implement fmt.Formatter and can
// be formatted by the fmt package. The following verbs are supported
// be formatted by the fmt package. The following verbs are supported
:
//
//
// %s print the error. If the error has a Cause it will be
// %s print the error. If the error has a Cause it will be
// printed recursively
// printed recursively
.
// %v see %s
// %v see %s
// %+v extended format. Each Frame of the error's StackTrace will
// %+v extended format. Each Frame of the error's StackTrace will
// be printed in detail.
// be printed in detail.
...
@@ -65,13 +66,13 @@
...
@@ -65,13 +66,13 @@
// Retrieving the stack trace of an error or wrapper
// Retrieving the stack trace of an error or wrapper
//
//
// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are
// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are
// invoked. This information can be retrieved with the following interface
.
// invoked. This information can be retrieved with the following interface
:
//
//
// type stackTracer interface {
// type stackTracer interface {
// StackTrace() errors.StackTrace
// StackTrace() errors.StackTrace
// }
// }
//
//
//
Where errors.StackTrac
e is defined as
//
The returned errors.StackTrace typ
e is defined as
//
//
// type StackTrace []Frame
// type StackTrace []Frame
//
//
...
@@ -85,8 +86,8 @@
...
@@ -85,8 +86,8 @@
// }
// }
// }
// }
//
//
//
stackTracer interface is not exported by this package, but is considered a part
//
Although the stackTracer interface is not exported by this package, it is
//
of stable public API
.
//
considered a part of its stable public interface
.
//
//
// See the documentation for Frame.Format for more details.
// See the documentation for Frame.Format for more details.
package
errors
package
errors
...
@@ -192,7 +193,7 @@ func Wrap(err error, message string) error {
...
@@ -192,7 +193,7 @@ func Wrap(err error, message string) error {
}
}
// Wrapf returns an error annotating err with a stack trace
// Wrapf returns an error annotating err with a stack trace
// at the point Wrapf is call, and the format specifier.
// at the point Wrapf is call
ed
, and the format specifier.
// If err is nil, Wrapf returns nil.
// If err is nil, Wrapf returns nil.
func
Wrapf
(
err
error
,
format
string
,
args
...
interface
{})
error
{
func
Wrapf
(
err
error
,
format
string
,
args
...
interface
{})
error
{
if
err
==
nil
{
if
err
==
nil
{
...
@@ -220,6 +221,18 @@ func WithMessage(err error, message string) error {
...
@@ -220,6 +221,18 @@ func WithMessage(err error, message string) error {
}
}
}
}
// WithMessagef annotates err with the format specifier.
// If err is nil, WithMessagef returns nil.
func
WithMessagef
(
err
error
,
format
string
,
args
...
interface
{})
error
{
if
err
==
nil
{
return
nil
}
return
&
withMessage
{
cause
:
err
,
msg
:
fmt
.
Sprintf
(
format
,
args
...
),
}
}
type
withMessage
struct
{
type
withMessage
struct
{
cause
error
cause
error
msg
string
msg
string
...
...
vendor/github.com/pkg/errors/stack.go
View file @
ded2cc3d
...
@@ -46,7 +46,8 @@ func (f Frame) line() int {
...
@@ -46,7 +46,8 @@ func (f Frame) line() int {
//
//
// Format accepts flags that alter the printing of some verbs, as follows:
// Format accepts flags that alter the printing of some verbs, as follows:
//
//
// %+s path of source file relative to the compile time GOPATH
// %+s function name and path of source file relative to the compile time
// GOPATH separated by \n\t (<funcname>\n\t<path>)
// %+v equivalent to %+s:%d
// %+v equivalent to %+s:%d
func
(
f
Frame
)
Format
(
s
fmt
.
State
,
verb
rune
)
{
func
(
f
Frame
)
Format
(
s
fmt
.
State
,
verb
rune
)
{
switch
verb
{
switch
verb
{
...
@@ -79,6 +80,14 @@ func (f Frame) Format(s fmt.State, verb rune) {
...
@@ -79,6 +80,14 @@ func (f Frame) Format(s fmt.State, verb rune) {
// StackTrace is stack of Frames from innermost (newest) to outermost (oldest).
// StackTrace is stack of Frames from innermost (newest) to outermost (oldest).
type
StackTrace
[]
Frame
type
StackTrace
[]
Frame
// Format formats the stack of Frames according to the fmt.Formatter interface.
//
// %s lists source files for each Frame in the stack
// %v lists the source file and line number for each Frame in the stack
//
// Format accepts flags that alter the printing of some verbs, as follows:
//
// %+v Prints filename, function, and line number for each Frame in the stack.
func
(
st
StackTrace
)
Format
(
s
fmt
.
State
,
verb
rune
)
{
func
(
st
StackTrace
)
Format
(
s
fmt
.
State
,
verb
rune
)
{
switch
verb
{
switch
verb
{
case
'v'
:
case
'v'
:
...
@@ -136,43 +145,3 @@ func funcname(name string) string {
...
@@ -136,43 +145,3 @@ func funcname(name string) string {
i
=
strings
.
Index
(
name
,
"."
)
i
=
strings
.
Index
(
name
,
"."
)
return
name
[
i
+
1
:
]
return
name
[
i
+
1
:
]
}
}
func
trimGOPATH
(
name
,
file
string
)
string
{
// Here we want to get the source file path relative to the compile time
// GOPATH. As of Go 1.6.x there is no direct way to know the compiled
// GOPATH at runtime, but we can infer the number of path segments in the
// GOPATH. We note that fn.Name() returns the function name qualified by
// the import path, which does not include the GOPATH. Thus we can trim
// segments from the beginning of the file path until the number of path
// separators remaining is one more than the number of path separators in
// the function name. For example, given:
//
// GOPATH /home/user
// file /home/user/src/pkg/sub/file.go
// fn.Name() pkg/sub.Type.Method
//
// We want to produce:
//
// pkg/sub/file.go
//
// From this we can easily see that fn.Name() has one less path separator
// than our desired output. We count separators from the end of the file
// path until it finds two more than in the function name and then move
// one character forward to preserve the initial path segment without a
// leading separator.
const
sep
=
"/"
goal
:=
strings
.
Count
(
name
,
sep
)
+
2
i
:=
len
(
file
)
for
n
:=
0
;
n
<
goal
;
n
++
{
i
=
strings
.
LastIndex
(
file
[
:
i
],
sep
)
if
i
==
-
1
{
// not enough separators found, set i so that the slice expression
// below leaves file unmodified
i
=
-
len
(
sep
)
break
}
}
// get back to 0 or trim the leading separator
file
=
file
[
i
+
len
(
sep
)
:
]
return
file
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment