From 5e2af2b0d2e7e367e461d4162b0338ff2dc08033 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Fri, 31 May 2019 20:33:01 +1000 Subject: [PATCH] errors: fix package example The example in example_test.go requires that the whole file be displayed; the addition of ExampleAs meant that only the body of the package example function was shown, rather than the surrounding context. This change moves ExampleAs to the file wrap_test.go file, restoring the package example to its former glory. Update #31716 Change-Id: Id0ea77bc06023b239a63c1d6a7c8b3c1dae91ce9 Reviewed-on: https://go-review.googlesource.com/c/go/+/179737 Reviewed-by: Marcel van Lohuizen Reviewed-by: Jean de Klerk Run-TryBot: Benny Siegert TryBot-Result: Gobot Gobot --- src/errors/example_test.go | 16 ---------------- src/errors/wrap_test.go | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/errors/example_test.go b/src/errors/example_test.go index d7dd782bef..5dc8841237 100644 --- a/src/errors/example_test.go +++ b/src/errors/example_test.go @@ -5,9 +5,7 @@ package errors_test import ( - "errors" "fmt" - "os" "time" ) @@ -34,17 +32,3 @@ func Example() { } // Output: 1989-03-15 22:30:00 +0000 UTC: the file system has gone away } - -func ExampleAs() { - if _, err := os.Open("non-existing"); err != nil { - var pathError *os.PathError - if errors.As(err, &pathError) { - fmt.Println("Failed at path:", pathError.Path) - } else { - fmt.Println(err) - } - } - - // Output: - // Failed at path: non-existing -} diff --git a/src/errors/wrap_test.go b/src/errors/wrap_test.go index 2055316756..d349414527 100644 --- a/src/errors/wrap_test.go +++ b/src/errors/wrap_test.go @@ -218,3 +218,17 @@ func (errorUncomparable) Is(target error) bool { _, ok := target.(errorUncomparable) return ok } + +func ExampleAs() { + if _, err := os.Open("non-existing"); err != nil { + var pathError *os.PathError + if errors.As(err, &pathError) { + fmt.Println("Failed at path:", pathError.Path) + } else { + fmt.Println(err) + } + } + + // Output: + // Failed at path: non-existing +} -- 2.50.0