Skip to content

Commit

Permalink
all: change golang.org/x/net/context to context
Browse files Browse the repository at this point in the history
Run commands:
- go tool fix -r context .
- goimports .

Change-Id: I231da3b8de36a0362f5988df7b00bb4bfec6d58a
Reviewed-on: https://go-review.googlesource.com/c/build/+/468015
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Michael Pratt <mpratt@google.com>
  • Loading branch information
alexandear authored and gopherbot committed Feb 15, 2023
1 parent c6da647 commit 47c00be
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion internal/task/version.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package task

import (
"context"
"fmt"
"strconv"
"strings"
Expand All @@ -9,7 +10,6 @@ import (
"golang.org/x/build/buildlet"
"golang.org/x/build/gerrit"
"golang.org/x/build/internal/workflow"
"golang.org/x/net/context"
)

// VersionTasks contains tasks related to versioning the release.
Expand Down
2 changes: 1 addition & 1 deletion perf/app/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package app

import (
"context"
"errors"
"fmt"
"net/http"
Expand All @@ -17,7 +18,6 @@ import (
"github.com/google/safehtml"
"github.com/google/safehtml/template"
"golang.org/x/build/perfdata/query"
"golang.org/x/net/context"
"golang.org/x/perf/benchstat"
"golang.org/x/perf/storage/benchfmt"
)
Expand Down
2 changes: 1 addition & 1 deletion perf/app/compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package app

import (
"context"
"fmt"
"net/http"
"net/http/httptest"
Expand All @@ -13,7 +14,6 @@ import (
"testing"

"golang.org/x/build/perfdata"
"golang.org/x/net/context"
"golang.org/x/perf/storage/benchfmt"
)

Expand Down
2 changes: 1 addition & 1 deletion perfdata/app/appengine.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
package app

import (
"context"
"net/http"

"golang.org/x/net/context"
"google.golang.org/appengine"
"google.golang.org/appengine/log"
)
Expand Down
3 changes: 1 addition & 2 deletions perfdata/app/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
package app

import (
"context"
"log"
"net/http"

"golang.org/x/net/context"
)

// requestContext returns the Context object for a given request.
Expand Down
2 changes: 1 addition & 1 deletion perfdata/app/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package app

import (
"context"
"encoding/json"
"errors"
"fmt"
Expand All @@ -18,7 +19,6 @@ import (
"time"

"golang.org/x/build/perfdata/db"
"golang.org/x/net/context"
"golang.org/x/perf/storage/benchfmt"
)

Expand Down
2 changes: 1 addition & 1 deletion perfdata/appengine/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package main

import (
"context"
"errors"
"fmt"
"log"
Expand All @@ -18,7 +19,6 @@ import (
"golang.org/x/build/perfdata/app"
"golang.org/x/build/perfdata/db"
"golang.org/x/build/perfdata/fs/gcs"
"golang.org/x/net/context"
oauth2 "google.golang.org/api/oauth2/v2"
"google.golang.org/appengine"
aelog "google.golang.org/appengine/log"
Expand Down
2 changes: 1 addition & 1 deletion perfdata/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package perfdata

import (
"context"
"encoding/json"
"fmt"
"io"
Expand All @@ -14,7 +15,6 @@ import (
"net/http"
"net/url"

"golang.org/x/net/context"
"golang.org/x/net/context/ctxhttp"
"golang.org/x/perf/storage/benchfmt"
)
Expand Down
2 changes: 1 addition & 1 deletion perfdata/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package perfdata

import (
"bytes"
"context"
"fmt"
"io"
"io/ioutil"
Expand All @@ -15,7 +16,6 @@ import (
"testing"

"golang.org/x/build/internal/diff"
"golang.org/x/net/context"
"golang.org/x/perf/storage/benchfmt"
)

Expand Down
2 changes: 1 addition & 1 deletion perfdata/db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package db

import (
"bytes"
"context"
"database/sql"
"fmt"
"io"
Expand All @@ -20,7 +21,6 @@ import (

"golang.org/x/build/perfdata"
"golang.org/x/build/perfdata/query"
"golang.org/x/net/context"
"golang.org/x/perf/storage/benchfmt"
)

Expand Down
2 changes: 1 addition & 1 deletion perfdata/db/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package db_test

import (
"bytes"
"context"
"fmt"
"reflect"
"sort"
Expand All @@ -20,7 +21,6 @@ import (
"golang.org/x/build/internal/diff"
. "golang.org/x/build/perfdata/db"
"golang.org/x/build/perfdata/db/dbtest"
"golang.org/x/net/context"
"golang.org/x/perf/storage/benchfmt"
)

Expand Down
3 changes: 1 addition & 2 deletions perfdata/fs/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
package fs

import (
"context"
"errors"
"io"
"sort"
"sync"

"golang.org/x/net/context"
)

// An FS stores uploaded benchmark data files.
Expand Down
3 changes: 2 additions & 1 deletion perfdata/fs/gcs/gcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
package gcs

import (
"context"

"cloud.google.com/go/storage"
"golang.org/x/build/perfdata/fs"
"golang.org/x/net/context"
)

// impl is an fs.FS backed by Google Cloud Storage.
Expand Down
2 changes: 1 addition & 1 deletion perfdata/fs/local/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
package local

import (
"context"
"os"
"path/filepath"

"golang.org/x/build/perfdata/fs"
"golang.org/x/net/context"
)

// impl is an fs.FS backed by local disk.
Expand Down

0 comments on commit 47c00be

Please sign in to comment.