internal/lsp: two trivial cleanups from CL 219077

Change-Id: Ia55bfc4d8283589a7a70e2b7b2ed3265ead18d62
Reviewed-on: https://go-review.googlesource.com/c/tools/+/219378
Run-TryBot: Peter Weinberger <pjw@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

internal/lsp/cmd/prepare_rename.go

diff --git a/internal/lsp/cmd/prepare_rename.go b/internal/lsp/cmd/prepare_rename.go
index b33a521..40ee201 100644
--- a/internal/lsp/cmd/prepare_rename.go
+++ b/internal/lsp/cmd/prepare_rename.go
@@ -69,9 +69,7 @@
 		return fmt.Errorf("request is not valid at the given position")
 	}
 
-	resRange := *result
-
-	l := protocol.Location{Range: resRange}
+	l := protocol.Location{Range: *result}
 	s, err := file.mapper.Span(l)
 	if err != nil {
 		return err

internal/lsp/lsp_test.go

diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go
index 6355b4c..1047c00 100644
--- a/internal/lsp/lsp_test.go
+++ b/internal/lsp/lsp_test.go
@@ -719,16 +719,15 @@
 		}
 		return
 	}
-	xx := got
-	if xx.Start == xx.End {
+	if got.Start == got.End {
 		// Special case for 0-length ranges. Marks can't specify a 0-length range,
 		// so just compare the start.
-		if xx.Start != want.Range.Start {
-			t.Errorf("prepare rename failed: incorrect point, got %v want %v", xx.Start, want.Range.Start)
+		if got.Start != want.Range.Start {
+			t.Errorf("prepare rename failed: incorrect point, got %v want %v", got.Start, want.Range.Start)
 		}
 	} else {
-		if protocol.CompareRange(*xx, want.Range) != 0 {
-			t.Errorf("prepare rename failed: incorrect range got %v want %v", *xx, want.Range)
+		if protocol.CompareRange(*got, want.Range) != 0 {
+			t.Errorf("prepare rename failed: incorrect range got %v want %v", *got, want.Range)
 		}
 	}
 }