From 8b616c2bf69c5f37a5e621c2e3ac025abde6f237 Mon Sep 17 00:00:00 2001
From: magodo <wztdyl@sina.com>
Date: Tue, 7 Jul 2020 10:19:16 +0800
Subject: [PATCH] Nil check error in `diag.FromErr`

This allows following use cases:

```go
func foo() error {
    //...
}
t p
func bar() diag.diagnostics {
    //...
    return diag.FromErr(foo())
}
```
---
 diag/helpers.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/diag/helpers.go b/diag/helpers.go
index 8037b1301e5..d43eab3249f 100644
--- a/diag/helpers.go
+++ b/diag/helpers.go
@@ -10,6 +10,9 @@ import "fmt"
 //     return diag.FromErr(err)
 //   }
 func FromErr(err error) Diagnostics {
+	if err == nil {
+		return nil
+	}
 	return Diagnostics{
 		Diagnostic{
 			Severity: Error,