gofumpt -s no longer works

closes mvdan#174

gofmt.go

@@ -42,6 +42,10 @@ var (
 	langVersion = flag.String("lang", "", "target Go version in the form 1.X (default from go.mod)")
 	extraRules  = flag.Bool("extra", false, "enable extra rules which should be vetted by a human")
 	showVersion = flag.Bool("version", false, "show version and exit")
+
+	// DEPRECATED
+	rewriteRule = flag.String("r", "", "DEPRECATED: you can use gofmt for it instead")
+	simplifyAST = flag.Bool("s", false, "DEPRECATED: the simplify flag is enabled by default")
 )
 
 // Keep these in sync with go/format/format.go.
@@ -75,6 +79,16 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func checkDeprecated() {
+	if *simplifyAST {
+		fmt.Fprintf(os.Stderr, "warning: -s used, the simplify flag is enabled by default\n")
+	}
+	if *rewriteRule != "" {
+		fmt.Fprintf(os.Stderr, "the rewrite flag is no longer available, you can use gofmt for it instead\n")
+		os.Exit(2)
+	}
+}
+
 func initParserMode() {
 	parserMode = parser.ParseComments
 	if *allErrors {
@@ -204,6 +218,8 @@ func gofumptMain() {
 	flag.Usage = usage
 	flag.Parse()
 
+	checkDeprecated()
+
 	// Print the gofumpt version if the user asks for it.
 	if *showVersion {
 		version.Print()

testdata/scripts/deprecated-rewrite.txt

@@ -0,0 +1,13 @@
+cp foo.orig.go foo.go
+! gofumpt -w -r foo foo.go
+stderr 'the rewrite flag is no longer available, you can use gofmt for it instead\n'
+cmp foo.orig.go foo.go
+
+-- foo.orig.go --
+package p
+
+func f() {
+
+	println("foo")
+
+}

testdata/scripts/deprecated-simplify.txt

@@ -0,0 +1,20 @@
+gofumpt -w -s foo.go
+cmp foo.go foo.go.golden
+
+gofumpt -d foo.go.golden
+! stdout .
+
+-- foo.go --
+package p
+
+func f() {
+
+	println("foo")
+
+}
+-- foo.go.golden --
+package p
+
+func f() {
+	println("foo")
+}