From: Andriy Lytvynov <lytvynov.a.v@gmail.com>
Date: Fri, 6 Sep 2013 20:49:34 +0000 (-0400)
Subject: sort: fix Example_sortMultiKeys
X-Git-Tag: go1.2rc2~325
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fb25a61872f3679cd2c4880e93cc2a44a9d373f7;p=gostls13.git

sort: fix Example_sortMultiKeys

Old example referenced global var from multiSorter.Sort and ignored it's argument.
Changed one of example calls to actually pass slice to sort.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/13551044
---

diff --git a/src/pkg/sort/example_multi_test.go b/src/pkg/sort/example_multi_test.go
index d0a9e7dc37..b2ebc4c610 100644
--- a/src/pkg/sort/example_multi_test.go
+++ b/src/pkg/sort/example_multi_test.go
@@ -26,6 +26,7 @@ type multiSorter struct {
 
 // Sort sorts the argument slice according to the less functions passed to OrderedBy.
 func (ms *multiSorter) Sort(changes []Change) {
+	ms.changes = changes
 	sort.Sort(ms)
 }
 
@@ -33,8 +34,7 @@ func (ms *multiSorter) Sort(changes []Change) {
 // Call its Sort method to sort the data.
 func OrderedBy(less ...lessFunc) *multiSorter {
 	return &multiSorter{
-		changes: changes,
-		less:    less,
+		less: less,
 	}
 }
 
@@ -108,11 +108,10 @@ func Example_sortMultiKeys() {
 	OrderedBy(user).Sort(changes)
 	fmt.Println("By user:", changes)
 
-	// multiSorter implements the Sort interface, so we can also do this.
-	sort.Sort(OrderedBy(user, increasingLines))
+	// More examples.
+	OrderedBy(user, increasingLines).Sort(changes)
 	fmt.Println("By user,<lines:", changes)
 
-	// More examples.
 	OrderedBy(user, decreasingLines).Sort(changes)
 	fmt.Println("By user,>lines:", changes)