Merge release-20200928.0-66-ga55bd73d4 (automated)

2 files changed, 12 insertions, 11 deletions

diff --git a/runsc/boot/boot_state_autogen.go b/runsc/boot/boot_state_autogen.go
index d025a2a1a..d33aa4293 100644
--- a/runsc/boot/boot_state_autogen.go
+++ b/runsc/boot/boot_state_autogen.go
@@ -6,30 +6,30 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *sandboxNetstackCreator) StateTypeName() string {
+func (s *sandboxNetstackCreator) StateTypeName() string {
 	return "runsc/boot.sandboxNetstackCreator"
 }
 
-func (x *sandboxNetstackCreator) StateFields() []string {
+func (s *sandboxNetstackCreator) StateFields() []string {
 	return []string{
 		"clock",
 		"uniqueID",
 	}
 }
 
-func (x *sandboxNetstackCreator) beforeSave() {}
+func (s *sandboxNetstackCreator) beforeSave() {}
 
-func (x *sandboxNetstackCreator) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.clock)
-	m.Save(1, &x.uniqueID)
+func (s *sandboxNetstackCreator) StateSave(stateSinkObject state.Sink) {
+	s.beforeSave()
+	stateSinkObject.Save(0, &s.clock)
+	stateSinkObject.Save(1, &s.uniqueID)
 }
 
-func (x *sandboxNetstackCreator) afterLoad() {}
+func (s *sandboxNetstackCreator) afterLoad() {}
 
-func (x *sandboxNetstackCreator) StateLoad(m state.Source) {
-	m.Load(0, &x.clock)
-	m.Load(1, &x.uniqueID)
+func (s *sandboxNetstackCreator) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &s.clock)
+	stateSourceObject.Load(1, &s.uniqueID)
 }
 
 func init() {
diff --git a/runsc/flag/flag.go b/runsc/flag/flag.go
index ba1ff833f..775325c06 100644
--- a/runsc/flag/flag.go
+++ b/runsc/flag/flag.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package flag wraps flag primitives.
 package flag
 
 import (