Rename NewFsObject to NewObject

s3/s3.go

@@ -340,10 +340,10 @@ func NewFs(name, root string) (fs.Fs, error) {
 	return f, nil
 }
 
-// Return an FsObject from a path
+// Return an Object from a path
 //
 // May return nil if an error occurred
-func (f *Fs) newFsObjectWithInfo(remote string, info *s3.Object) fs.Object {
+func (f *Fs) newObjectWithInfo(remote string, info *s3.Object) fs.Object {
 	o := &Object{
 		fs:     f,
 		remote: remote,
@@ -368,11 +368,11 @@ func (f *Fs) newFsObjectWithInfo(remote string, info *s3.Object) fs.Object {
 	return o
 }
 
-// NewFsObject returns an FsObject from a path
+// NewObject returns an Object from a path
 //
 // May return nil if an error occurred
-func (f *Fs) NewFsObject(remote string) fs.Object {
-	return f.newFsObjectWithInfo(remote, nil)
+func (f *Fs) NewObject(remote string) fs.Object {
+	return f.newObjectWithInfo(remote, nil)
 }
 
 // listFn is called from list to handle an object.
@@ -482,7 +482,7 @@ func (f *Fs) listFiles(out fs.ListOpts, dir string) {
 				return fs.ErrorListAborted
 			}
 		} else {
-			if o := f.newFsObjectWithInfo(remote, object); o != nil {
+			if o := f.newObjectWithInfo(remote, object); o != nil {
 				if out.Add(o) {
 					return fs.ErrorListAborted
 				}
@@ -536,7 +536,7 @@ func (f *Fs) List(out fs.ListOpts, dir string) {
 	return
 }
 
-// Put the FsObject into the bucket
+// Put the Object into the bucket
 func (f *Fs) Put(in io.Reader, src fs.ObjectInfo) (fs.Object, error) {
 	// Temporary Object under construction
 	fs := &Object{
@@ -634,7 +634,7 @@ func (f *Fs) Copy(src fs.Object, remote string) (fs.Object, error) {
 	if err != nil {
 		return nil, err
 	}
-	return f.NewFsObject(remote), err
+	return f.NewObject(remote), err
 }
 
 // Hashes returns the supported hash sets.