From 14189eba071ebc7bb4b502924e495cec13b5f166 Mon Sep 17 00:00:00 2001
From: JimhHan <50871214+JimhHan@users.noreply.github.com>
Date: Fri, 26 Mar 2021 15:28:27 +0800
Subject: [PATCH] Replace: domain conf loader

---
 common/matcher/{ => domain}/conf/conf.go             | 0
 common/matcher/{ => domain}/conf/domain.go           | 0
 common/matcher/{ => domain}/conf/errors.generated.go | 0
 infra/conf/dns.go                                    | 2 +-
 infra/conf/router.go                                 | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename common/matcher/{ => domain}/conf/conf.go (100%)
 rename common/matcher/{ => domain}/conf/domain.go (100%)
 rename common/matcher/{ => domain}/conf/errors.generated.go (100%)

diff --git a/common/matcher/conf/conf.go b/common/matcher/domain/conf/conf.go
similarity index 100%
rename from common/matcher/conf/conf.go
rename to common/matcher/domain/conf/conf.go
diff --git a/common/matcher/conf/domain.go b/common/matcher/domain/conf/domain.go
similarity index 100%
rename from common/matcher/conf/domain.go
rename to common/matcher/domain/conf/domain.go
diff --git a/common/matcher/conf/errors.generated.go b/common/matcher/domain/conf/errors.generated.go
similarity index 100%
rename from common/matcher/conf/errors.generated.go
rename to common/matcher/domain/conf/errors.generated.go
diff --git a/infra/conf/dns.go b/infra/conf/dns.go
index b9623040..ce7bc24e 100644
--- a/infra/conf/dns.go
+++ b/infra/conf/dns.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/xtls/xray-core/app/dns"
-	"github.com/xtls/xray-core/common/matcher/conf"
 	dm "github.com/xtls/xray-core/common/matcher/domain"
+	"github.com/xtls/xray-core/common/matcher/domain/conf"
 	"github.com/xtls/xray-core/common/matcher/geosite"
 	"github.com/xtls/xray-core/common/net"
 )
diff --git a/infra/conf/router.go b/infra/conf/router.go
index de6246cb..128096ab 100644
--- a/infra/conf/router.go
+++ b/infra/conf/router.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/xtls/xray-core/app/router"
-	"github.com/xtls/xray-core/common/matcher/conf"
+	"github.com/xtls/xray-core/common/matcher/domain/conf"
 	"github.com/xtls/xray-core/common/matcher/geoip"
 	"github.com/xtls/xray-core/common/matcher/geosite"
 	"github.com/xtls/xray-core/common/net"