move common types to an internal package

This helps avoid import cycles.

1 files changed, 4 insertions, 4 deletions

diff --git a/spartan/client.go b/spartan/client.go
index 9547f74..e3025ee 100644
--- a/spartan/client.go
+++ b/spartan/client.go
@@ -8,7 +8,7 @@ import (
 	neturl "net/url"
 	"strconv"
 
-	sr "tildegit.org/tjp/sliderule"
+	"tildegit.org/tjp/sliderule/internal/types"
 )
 
 // Client is used for sending spartan requests and receiving responses.
@@ -32,7 +32,7 @@ const DefaultMaxRedirects int = 2
 var ExceededMaxRedirects = errors.New("spartan.Client: exceeded MaxRedirects")
 
 // RoundTrip sends a single spartan request and returns its response.
-func (c Client) RoundTrip(request *sr.Request) (*sr.Response, error) {
+func (c Client) RoundTrip(request *types.Request) (*types.Response, error) {
 	if request.Scheme != "spartan" && request.Scheme != "" {
 		return nil, errors.New("non-spartan protocols not supported")
 	}
@@ -89,14 +89,14 @@ func (c Client) RoundTrip(request *sr.Request) (*sr.Response, error) {
 // Fetch parses a URL string and fetches the spartan resource.
 //
 // It will resolve any redirects along the way, up to client.MaxRedirects.
-func (c Client) Fetch(url string) (*sr.Response, error) {
+func (c Client) Fetch(url string) (*types.Response, error) {
 	u, err := neturl.Parse(url)
 	if err != nil {
 		return nil, err
 	}
 
 	for i := 0; i <= c.MaxRedirects; i += 1 {
-		response, err := c.RoundTrip(&sr.Request{URL: u})
+		response, err := c.RoundTrip(&types.Request{URL: u})
 		if err != nil {
 			return nil, err
 		}