Skip to content

Commit

Permalink
Remaining old packages via rg/sd
Browse files Browse the repository at this point in the history
  • Loading branch information
lespea committed Sep 20, 2024
1 parent 55edefb commit cf522cf
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion cmd/sizes/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ================================================================

/*
go build github.com/johnkerl/miller/cmd/sizes
go build github.com/johnkerl/miller/v6/cmd/sizes
*/

package main
Expand Down
8 changes: 4 additions & 4 deletions docs/src/build.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ Two-clause BSD license [https://github.com/johnkerl/miller/blob/master/LICENSE.t
* `cd mlr-i.j.k`
* `cd go`
* `make` creates the `./mlr` (or `.\mlr.exe` on Windows) executable
* Without `make`: `go build github.com/johnkerl/miller/cmd/mlr`
* Without `make`: `go build github.com/johnkerl/miller/v6/cmd/mlr`
* `make check` runs tests
* Without `make`: `go test github.com/johnkerl/miller/pkg/...` and `mlr regtest`
* Without `make`: `go test github.com/johnkerl/miller/v6/pkg/...` and `mlr regtest`
* `make install` installs the `mlr` executable and the `mlr` manpage
* Without make: `go install github.com/johnkerl/miller/cmd/mlr` will install to _GOPATH_`/bin/mlr`
* Without make: `go install github.com/johnkerl/miller/v6/cmd/mlr` will install to _GOPATH_`/bin/mlr`

## From git clone

* `git clone https://github.com/johnkerl/miller`
* `make`/`go build github.com/johnkerl/miller/cmd/mlr` as above
* `make`/`go build github.com/johnkerl/miller/v6/cmd/mlr` as above

## In case of problems

Expand Down
14 changes: 7 additions & 7 deletions docs/src/miller-as-library.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ package main
import (
"fmt"

"github.com/johnkerl/miller/pkg/bifs"
"github.com/johnkerl/miller/pkg/mlrval"
"github.com/johnkerl/miller/v6/pkg/bifs"
"github.com/johnkerl/miller/v6/pkg/mlrval"
)

func main() {
Expand Down Expand Up @@ -86,11 +86,11 @@ import (
"fmt"
"os"

"github.com/johnkerl/miller/pkg/bifs"
"github.com/johnkerl/miller/pkg/cli"
"github.com/johnkerl/miller/pkg/input"
"github.com/johnkerl/miller/pkg/output"
"github.com/johnkerl/miller/pkg/types"
"github.com/johnkerl/miller/v6/pkg/bifs"
"github.com/johnkerl/miller/v6/pkg/cli"
"github.com/johnkerl/miller/v6/pkg/input"
"github.com/johnkerl/miller/v6/pkg/output"
"github.com/johnkerl/miller/v6/pkg/types"
)

// Put your record-processing logic here.
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module github.com/johnkerl/miller/v6
// executable would be 'miller' not 'mlr'.
//
// So we have cmd/mlr/main.go:
// * go build github.com/johnkerl/miller/cmd/mlr
// * go install github.com/johnkerl/miller/cmd/mlr
// * go build github.com/johnkerl/miller/v6/cmd/mlr
// * go install github.com/johnkerl/miller/v6/cmd/mlr

// go get github.com/johnkerl/lumin@v1.0.0
// Local development:
Expand Down
2 changes: 1 addition & 1 deletion pkg/dsl/cst/hofs.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/johnkerl/miller/v6/pkg/runtime"
)

// Most function types are in the github.com/johnkerl/miller/pkg/types package. These types, though,
// Most function types are in the github.com/johnkerl/miller/v6/pkg/types package. These types, though,
// include functions which need to access CST state in order to call back to
// user-defined functions. To avoid a package-cycle dependency, they are
// defined here.
Expand Down
2 changes: 1 addition & 1 deletion pkg/input/record_reader_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/johnkerl/miller/v6/pkg/cli"
)

// go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/input/...
// go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/input/...

func BenchmarkDKVPParse(b *testing.B) {
readerOptions := &cli.TReaderOptions{
Expand Down
2 changes: 1 addition & 1 deletion pkg/mlrval/mlrval_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
)

// go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/mlrval/...
// go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/mlrval/...

func BenchmarkFromDeferredType(b *testing.B) {
for i := 0; i < b.N; i++ {
Expand Down
2 changes: 1 addition & 1 deletion pkg/mlrval/mlrval_new.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ func (mv *Mlrval) SetFromPrevalidatedBoolString(input string, boolval bool) *Mlr

// The user-defined function is of type 'interface{}' here to avoid what would
// otherwise be a package-dependency cycle between this package and
// github.com/johnkerl/miller/pkg/dsl/cst.
// github.com/johnkerl/miller/v6/pkg/dsl/cst.
//
// Nominally the name argument is the user-specified name if `func f(a, b) {
// ... }`, or some autogenerated UUID like `fl0052` if `func (a, b) { ... }`.
Expand Down
2 changes: 1 addition & 1 deletion pkg/parsing/errors.go.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"
"strings"

"github.com/johnkerl/miller/pkg/parsing/token"
"github.com/johnkerl/miller/v6/pkg/parsing/token"
)

type ErrorSymbol interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/parsing/mlr.bnf
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ panic : '%' '%' '%' 'p' 'a' 'n' 'i' 'c' '%' '%' '%' ;
// ================================================================

// Import the AST/ASTNode types and functions
<< import "github.com/johnkerl/miller/pkg/dsl" >>
<< import "github.com/johnkerl/miller/v6/pkg/dsl" >>

// ================================================================
// TOP-LEVEL PRODUCTION RULE FOR THE MILLER DSL
Expand Down
2 changes: 1 addition & 1 deletion pkg/scan/find_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
)

// go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/scan/...
// go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/scan/...

func BenchmarkFromNormalCases(b *testing.B) {

Expand Down
4 changes: 2 additions & 2 deletions scripts/compiler-versions-build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

for go in go1.15.15 go1.16.12 go1.17.5 go1.18beta1; do
$go clean github.com/johnkerl/miller/cmd/mlr
$go build github.com/johnkerl/miller/cmd/mlr
$go clean github.com/johnkerl/miller/v6/cmd/mlr
$go build github.com/johnkerl/miller/v6/cmd/mlr
mv mlr mlr-$go
done

0 comments on commit cf522cf

Please sign in to comment.