Skip to content

Commit 025ad72

Browse files
committed
vendor: delete vendored code
This intentionally breaks support for older version. This is because I'm facing a conundrum: - Have "go get github.com/maruel/panicparse/cmd/pp" be broken on go1.16. That's what people on #modules on gophers.slack.com propose. - Get v1 of the executables to use github.com/maruel/panicparse/v2/stack. I prefer the later, since it just fixes the problem and make it work for the users. This is a bit challenging, but I think I can get there.
1 parent 0494274 commit 025ad72

308 files changed

Lines changed: 4 additions & 214754 deletions

File tree

Some content is hidden

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

stack/context_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,8 +1571,8 @@ func identifyPanicwebSignature(t *testing.T, b *Bucket, pwebDir string) panicweb
15711571
pkgPrefix := ""
15721572
if !internaltest.IsUsingModules() {
15731573
t.Logf("Using vendored")
1574-
pColorable = "src/github.com/maruel/panicparse/vendor/github.com/mattn/go-colorable/noncolorable.go"
1575-
pkgPrefix = "github.com/maruel/panicparse/vendor/"
1574+
pColorable = "src/github.com/mattn/go-colorable/noncolorable.go"
1575+
pkgPrefix = ""
15761576
} else {
15771577
t.Logf("Using go module")
15781578
}
@@ -1636,17 +1636,13 @@ func identifyPanicwebSignature(t *testing.T, b *Bucket, pwebDir string) panicweb
16361636
mainOS = "main_windows.go"
16371637
}
16381638
usingModules := internaltest.IsUsingModules()
1639-
if !usingModules {
1640-
fn = "github.com/maruel/panicparse/vendor/" + fn
1641-
}
16421639
if b.Stack.Calls[1].Func.Raw != fn {
16431640
t.Fatalf("expected %q, got %q", fn, b.Stack.Calls[1].Func.Raw)
16441641
}
16451642
prefix := "golang.org/x/sys@v0.0.0-"
16461643
if !usingModules {
1647-
// Assert that there's no version by including the trailing / and that
1648-
// it's using the vendored version.
1649-
prefix = "github.com/maruel/panicparse/vendor/golang.org/x/sys/"
1644+
// Assert that there's no version by including the trailing /.
1645+
prefix = "golang.org/x/sys/"
16501646
}
16511647
if !strings.HasPrefix(b.Stack.Calls[1].RelSrcPath, prefix) {
16521648
t.Fatalf("expected %q, got %q", prefix, b.Stack.Calls[1].RelSrcPath)

vendor/github.com/mattn/go-colorable/.travis.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

vendor/github.com/mattn/go-colorable/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

vendor/github.com/mattn/go-colorable/README.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

vendor/github.com/mattn/go-colorable/colorable_appengine.go

Lines changed: 0 additions & 37 deletions
This file was deleted.

vendor/github.com/mattn/go-colorable/colorable_others.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)