Module.New() does not need to return an error

5 files changed, 5 insertions, 5 deletions

diff --git a/modules/caddytls/acmemanager.go b/modules/caddytls/acmemanager.go
index 59fc7c3..1e37b86 100644
--- a/modules/caddytls/acmemanager.go
+++ b/modules/caddytls/acmemanager.go
@@ -15,7 +15,7 @@ import (
 func init() {
 	caddy2.RegisterModule(caddy2.Module{
 		Name: "tls.management.acme",
-		New:  func() (interface{}, error) { return new(acmeManagerMaker), nil },
+		New:  func() interface{} { return new(acmeManagerMaker) },
 	})
 }
 
diff --git a/modules/caddytls/fileloader.go b/modules/caddytls/fileloader.go
index fae2275..516c632 100644
--- a/modules/caddytls/fileloader.go
+++ b/modules/caddytls/fileloader.go
@@ -11,7 +11,7 @@ import (
 func init() {
 	caddy2.RegisterModule(caddy2.Module{
 		Name: "tls.certificates.load_files",
-		New:  func() (interface{}, error) { return fileLoader{}, nil },
+		New:  func() interface{} { return fileLoader{} },
 	})
 }
 
diff --git a/modules/caddytls/folderloader.go b/modules/caddytls/folderloader.go
index 9d46502..8ec9827 100644
--- a/modules/caddytls/folderloader.go
+++ b/modules/caddytls/folderloader.go
@@ -16,7 +16,7 @@ import (
 func init() {
 	caddy2.RegisterModule(caddy2.Module{
 		Name: "tls.certificates.load_folders",
-		New:  func() (interface{}, error) { return folderLoader{}, nil },
+		New:  func() interface{} { return folderLoader{} },
 	})
 }
 
diff --git a/modules/caddytls/matchers.go b/modules/caddytls/matchers.go
index bda4ec2..e155efd 100644
--- a/modules/caddytls/matchers.go
+++ b/modules/caddytls/matchers.go
@@ -12,7 +12,7 @@ type MatchServerName []string
 func init() {
 	caddy2.RegisterModule(caddy2.Module{
 		Name: "tls.handshake_match.host",
-		New:  func() (interface{}, error) { return MatchServerName{}, nil },
+		New:  func() interface{} { return MatchServerName{} },
 	})
 }
 
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 4743e6b..4e21ade 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -15,7 +15,7 @@ import (
 func init() {
 	caddy2.RegisterModule(caddy2.Module{
 		Name: "tls",
-		New:  func() (interface{}, error) { return new(TLS), nil },
+		New:  func() interface{} { return new(TLS) },
 	})
 }