Move dircache, oauthutil, rest and pacer modules into lib

backend/amazonclouddrive/amazonclouddrive.go

@@ -23,11 +23,11 @@ import (
 	"time"
 
 	"github.com/ncw/go-acd"
-	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/dircache"
+	"github.com/ncw/rclone/lib/oauthutil"
+	"github.com/ncw/rclone/lib/pacer"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

backend/azureblob/azureblob.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/pacer"
+	"github.com/ncw/rclone/lib/pacer"
 	"github.com/pkg/errors"
 )
 

backend/b2/b2.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/ncw/rclone/backend/b2/api"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/pacer"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 )
 

backend/b2/upload.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/ncw/rclone/backend/b2/api"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 )
 

backend/box/box.go

@@ -22,11 +22,11 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/backend/box/api"
-	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/dircache"
+	"github.com/ncw/rclone/lib/oauthutil"
+	"github.com/ncw/rclone/lib/pacer"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

backend/box/upload.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/ncw/rclone/backend/box/api"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 )
 

backend/drive/drive.go

@@ -20,10 +20,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/pacer"
+	"github.com/ncw/rclone/lib/dircache"
+	"github.com/ncw/rclone/lib/oauthutil"
+	"github.com/ncw/rclone/lib/pacer"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 	"golang.org/x/oauth2"

backend/dropbox/dropbox.go

@@ -34,8 +34,8 @@ import (
 	"github.com/dropbox/dropbox-sdk-go-unofficial/dropbox"
 	"github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/files"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/pacer"
+	"github.com/ncw/rclone/lib/oauthutil"
+	"github.com/ncw/rclone/lib/pacer"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

backend/googlecloudstorage/googlecloudstorage.go

@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
+	"github.com/ncw/rclone/lib/oauthutil"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"

backend/http/http.go

@@ -17,7 +17,7 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 	"golang.org/x/net/html"
 )

backend/http/http_internal_test.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fstest"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

backend/hubic/hubic.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/ncw/rclone/backend/swift"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
+	"github.com/ncw/rclone/lib/oauthutil"
 	swiftLib "github.com/ncw/swift"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"

backend/onedrive/onedrive.go

@@ -15,11 +15,11 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/backend/onedrive/api"
-	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/dircache"
+	"github.com/ncw/rclone/lib/oauthutil"
+	"github.com/ncw/rclone/lib/pacer"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

backend/pcloud/pcloud.go

@@ -22,11 +22,11 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/backend/pcloud/api"
-	"github.com/ncw/rclone/dircache"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
-	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/dircache"
+	"github.com/ncw/rclone/lib/oauthutil"
+	"github.com/ncw/rclone/lib/pacer"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

backend/s3/s3.go

@@ -37,7 +37,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/ncw/swift"
 	"github.com/pkg/errors"
 )

backend/webdav/webdav.go

@@ -30,8 +30,8 @@ import (
 
 	"github.com/ncw/rclone/backend/webdav/api"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/pacer"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/pacer"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/pkg/errors"
 )
 

backend/yandex/yandex.go

@@ -15,7 +15,7 @@ import (
 
 	yandex "github.com/ncw/rclone/backend/yandex/api"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/oauthutil"
+	"github.com/ncw/rclone/lib/oauthutil"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

cmd/serve/http/http.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/ncw/rclone/cmd"
 	"github.com/ncw/rclone/fs"
-	"github.com/ncw/rclone/rest"
+	"github.com/ncw/rclone/lib/rest"
 	"github.com/ncw/rclone/vfs"
 	"github.com/ncw/rclone/vfs/vfsflags"
 	"github.com/spf13/cobra"