Skip to content

Commit d99fbf4

Browse files
authored
Merge branch 'master' into 12ya-patch
2 parents eda2f3c + 1c017f1 commit d99fbf4

File tree

84 files changed

+525
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+525
-144
lines changed

cmd/signature-fuzzer/internal/fuzz-generator/gen_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestIsBuildable(t *testing.T) {
112112
verb(1, "output is: %s\n", string(coutput))
113113
}
114114

115-
// TestExhaustive does a series of code genreation runs, starting with
115+
// TestExhaustive does a series of code generation runs, starting with
116116
// (relatively) simple code and then getting progressively more
117117
// complex (more params, deeper structs, turning on additional
118118
// features such as address-taken vars and reflect testing). The

cmd/stringer/endtoend_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func TestTestFiles(t *testing.T) {
286286
}
287287
}
288288

289-
// The -output flag cannot be used in combiation with matching types across multiple packages.
289+
// The -output flag cannot be used in combination with matching types across multiple packages.
290290
func TestCollidingOutput(t *testing.T) {
291291
testenv.NeedsTool(t, "go")
292292
stringer := stringerPath(t)

go/analysis/checker/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func Example() {
6969
// min=bufio max=unsafe
7070
}
7171

72-
// minmaxpkg is a trival example analyzer that uses package facts to
72+
// minmaxpkg is a trivial example analyzer that uses package facts to
7373
// compute information from the entire dependency graph.
7474
var minmaxpkg = &analysis.Analyzer{
7575
Name: "minmaxpkg",

go/analysis/doc/suggested_fixes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ These requirements guarantee that suggested fixes can be cleanly applied.
7979
Because a driver may only analyze, or be able to modify, the current package,
8080
we restrict edits to the current package. In general this restriction should
8181
not be a big problem for users because other packages might not belong to the
82-
same module and so will not be safe to modify in a singe change.
82+
same module and so will not be safe to modify in a single change.
8383

8484
On the other hand, analyzers will not be required to produce gofmt-compliant
8585
code. Analysis drivers will be expected to apply gofmt to the results of

go/analysis/internal/checker/checker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func Run(args []string, analyzers []*analysis.Analyzer) (exitcode int) {
9999
// without having to remember what code to return.
100100
//
101101
// TODO(adonovan): interpreting exit codes is like reading tea-leaves.
102-
// Insted of wasting effort trying to encode a multidimensional result
102+
// Instead of wasting effort trying to encode a multidimensional result
103103
// into 7 bits we should just emit structured JSON output, and
104104
// an exit code of 0 or 1 for success or failure.
105105
exitAtLeast := func(code int) {

go/analysis/passes/asmdecl/asmdecl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type asmArch struct {
5757
// include the first integer register and first floating-point register. Accessing
5858
// any of them counts as writing to result.
5959
retRegs []string
60-
// writeResult is a list of instructions that will change result register implicity.
60+
// writeResult is a list of instructions that will change result register implicitly.
6161
writeResult []string
6262
// calculated during initialization
6363
sizes types.Sizes

go/analysis/passes/loopclosure/loopclosure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func run(pass *analysis.Pass) (any, error) {
8888
//
8989
// TODO: consider allowing the "last" go/defer/Go statement to be followed by
9090
// N "trivial" statements, possibly under a recursive definition of "trivial"
91-
// so that that checker could, for example, conclude that a go statement is
91+
// so that checker could, for example, conclude that a go statement is
9292
// followed by an if statement made of only trivial statements and trivial expressions,
9393
// and hence the go statement could still be checked.
9494
forEachLastStmt(body.List, func(last ast.Stmt) {

go/analysis/passes/structtag/structtag.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func checkCanonicalFieldTag(pass *analysis.Pass, field *types.Var, tag string, s
107107

108108
// Embedded struct. Nothing to do for now, but that
109109
// may change, depending on what happens with issue 7363.
110-
// TODO(adonovan): investigate, now that that issue is fixed.
110+
// TODO(adonovan): investigate, now that issue is fixed.
111111
if field.Anonymous() {
112112
return
113113
}

go/analysis/unitchecker/unitchecker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func _() {
170170
// TODO(golang/go#65729): this is unsound: any extra
171171
// logging by the child process (e.g. due to GODEBUG
172172
// options) will add noise to stderr, causing the
173-
// CombinedOutput to be unparseable as JSON. But we
173+
// CombinedOutput to be unparsable as JSON. But we
174174
// can't simply use Output here as some of the tests
175175
// look for substrings of stderr. Rework the test to
176176
// be specific about which output stream to match.

go/callgraph/vta/graph.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ func (b *builder) call(c ssa.CallInstruction) {
658658
}
659659

660660
func addArgumentFlows(b *builder, c ssa.CallInstruction, f *ssa.Function) {
661-
// When f has no paremeters (including receiver), there is no type
661+
// When f has no parameters (including receiver), there is no type
662662
// flow here. Also, f's body and parameters might be missing, such
663663
// as when vta is used within the golang.org/x/tools/go/analysis
664664
// framework (see github.com/golang/go/issues/50670).
@@ -803,7 +803,7 @@ func (b *builder) nodeFromVal(val ssa.Value) node {
803803
return function{f: v}
804804
case *ssa.Parameter, *ssa.FreeVar, ssa.Instruction:
805805
// ssa.Param, ssa.FreeVar, and a specific set of "register" instructions,
806-
// satisifying the ssa.Value interface, can serve as local variables.
806+
// satisfying the ssa.Value interface, can serve as local variables.
807807
return local{val: v}
808808
default:
809809
panic(fmt.Errorf("unsupported value %v in node creation", val))

0 commit comments

Comments
 (0)