Skip to content

Commit 419768e

Browse files
committed
Renamed fields of protoc enum CompileResult to make them unique
1 parent 91e06cf commit 419768e

File tree

8 files changed

+269
-144
lines changed

8 files changed

+269
-144
lines changed

commands/compile/compile.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,22 +189,22 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
189189
if req.GetShowProperties() {
190190
if err := builder.RunParseHardwareAndDumpBuildProperties(builderCtx); err != nil {
191191
fmt.Fprintf(errStream, "error: %s", err)
192-
return &rpc.CompileResp{Result: rpc.CompileResult_error}, nil
192+
return &rpc.CompileResp{Result: rpc.CompileResult_compile_error}, nil
193193
}
194-
return &rpc.CompileResp{Result: rpc.CompileResult_success}, nil
194+
return &rpc.CompileResp{Result: rpc.CompileResult_compile_success}, nil
195195
}
196196
if req.GetPreprocess() {
197197
if err := builder.RunPreprocess(builderCtx); err != nil {
198198
fmt.Fprintf(errStream, "error: %s", err)
199-
return &rpc.CompileResp{Result: rpc.CompileResult_error}, nil
199+
return &rpc.CompileResp{Result: rpc.CompileResult_compile_error}, nil
200200
}
201-
return &rpc.CompileResp{Result: rpc.CompileResult_success}, nil
201+
return &rpc.CompileResp{Result: rpc.CompileResult_compile_success}, nil
202202
}
203203

204204
// if it's a regular build, go on...
205205
if err := builder.RunBuilder(builderCtx); err != nil {
206206
fmt.Fprintf(errStream, "error: %s", err)
207-
return &rpc.CompileResp{Result: rpc.CompileResult_error}, nil
207+
return &rpc.CompileResp{Result: rpc.CompileResult_compile_error}, nil
208208
}
209209

210210
if !req.GetDryRun() {
@@ -266,5 +266,5 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
266266
}
267267

268268
logrus.Tracef("Compile %s for %s successful", sketch.Name, fqbnIn)
269-
return &rpc.CompileResp{Result: rpc.CompileResult_success}, nil
269+
return &rpc.CompileResp{Result: rpc.CompileResult_compile_success}, nil
270270
}

rpc/commands/commands.pb.go

Lines changed: 86 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc/commands/compile.pb.go

Lines changed: 40 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc/commands/compile.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ message CompileResp {
4949
}
5050

5151
enum CompileResult {
52-
success = 0;
53-
error = 1;
52+
compile_success = 0;
53+
compile_error = 1;
5454
}

0 commit comments

Comments
 (0)