From 5bd5d85117ce968e68d41a746f917a63ed8e6ae6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 26 Nov 2020 20:13:16 -0800 Subject: compiler: reword "declared and not used" error message This is a gofrontend copy of https://golang.org/cl/203282. From the CL 203282 description: "declared and not used" is technically correct, but might confuse the user. Switching "and" to "but" will hopefully create the contrast for the users: they did one thing (declaration), but not the other --- actually using the variable. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/273629 --- gcc/go/gofrontend/MERGE | 2 +- gcc/go/gofrontend/gogo.cc | 2 +- gcc/go/gofrontend/parse.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/go/gofrontend') diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index d6ee857..183e5ca 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -720b8fed93143f284ca04358e1b13c8a3487281e +6b01f8cdc11d86bd98165c91d6ae101bcf6b9e1a The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc index 93a4a57..a5e4521 100644 --- a/gcc/go/gofrontend/gogo.cc +++ b/gcc/go/gofrontend/gogo.cc @@ -3744,7 +3744,7 @@ Check_types_traverse::variable(Named_object* named_object) && !var->type()->is_error() && (init == NULL || !init->is_error_expression()) && !Lex::is_invalid_identifier(named_object->name())) - go_error_at(var->location(), "%qs declared and not used", + go_error_at(var->location(), "%qs declared but not used", named_object->message_name().c_str()); } return TRAVERSE_CONTINUE; diff --git a/gcc/go/gofrontend/parse.cc b/gcc/go/gofrontend/parse.cc index 00ac2f8..b1925ed 100644 --- a/gcc/go/gofrontend/parse.cc +++ b/gcc/go/gofrontend/parse.cc @@ -4817,7 +4817,7 @@ Parse::type_switch_body(Label* label, const Type_switch& type_switch, } } if (!used) - go_error_at(type_switch.location, "%qs declared and not used", + go_error_at(type_switch.location, "%qs declared but not used", Gogo::message_name(var_name).c_str()); } return statement; -- cgit v1.1