From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 5794C385828F; Wed, 31 Aug 2022 10:41:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5794C385828F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661942460; bh=lXDUQFBisWbCk0MAn/IkgsizmyoXQIk98B9CShOl4mM=; h=From:To:Subject:Date:From; b=KQ+WPWMpSusSLeUSn3x1YWJ5csfJq2YqcGsw9FmJCSeX1P7HDaVAs8Yw3EzPuKi1m SQCqjGFRaPI3nO5SX26w2LtCZiGAJc2J9d+QcPBhwGJCiFV25+rRYZUQCVx55mFY3+ ymX9y3mASbab/S4K+Vcs7y+ItaIgMhtiP4l6W0bM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Experiment with adding an error code to an error X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 05f1f87274a4ed13c0ab84de77d4253776b46637 X-Git-Newrev: bc2fe97fad18ba518279b7058512606bc99cc2ca Message-Id: <20220831104100.5794C385828F@sourceware.org> Date: Wed, 31 Aug 2022 10:41:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:bc2fe97fad18ba518279b7058512606bc99cc2ca commit bc2fe97fad18ba518279b7058512606bc99cc2ca Author: David Malcolm Date: Thu Jul 21 18:35:35 2022 -0400 Experiment with adding an error code to an error Diff: --- gcc/rust/rust-diagnostics.cc | 11 +++++++++ gcc/rust/rust-diagnostics.h | 18 ++++++++++++++ gcc/rust/rust-gcc-diagnostics.cc | 34 ++++++++++++++++++++++++++ gcc/rust/typecheck/rust-casts.cc | 2 +- gcc/testsuite/rust/compile/bad_as_bool_char.rs | 4 +-- 5 files changed, 66 insertions(+), 3 deletions(-) diff --git a/gcc/rust/rust-diagnostics.cc b/gcc/rust/rust-diagnostics.cc index c2d3e4ee8be..79daf6b163c 100644 --- a/gcc/rust/rust-diagnostics.cc +++ b/gcc/rust/rust-diagnostics.cc @@ -166,6 +166,17 @@ rust_error_at (const Location location, const char *fmt, ...) va_end (ap); } +void +rust_error_at (const RichLocation &location, const ErrorCode code, + const char *fmt, ...) +{ + va_list ap; + + va_start (ap, fmt); + rust_be_error_at (location, code, expand_message (fmt, ap)); + va_end (ap); +} + void rust_warning_at (const Location location, int opt, const char *fmt, ...) { diff --git a/gcc/rust/rust-diagnostics.h b/gcc/rust/rust-diagnostics.h index 93bd1b3237b..35a1727f6a3 100644 --- a/gcc/rust/rust-diagnostics.h +++ b/gcc/rust/rust-diagnostics.h @@ -50,6 +50,18 @@ // clang-format off // simple location + +struct ErrorCode +{ + explicit ErrorCode (const char *str) : m_str (str) + { + gcc_assert (str); + gcc_assert (str[0] == 'E'); + } + + const char *m_str; +}; + extern void rust_internal_error_at (const Location, const char *fmt, ...) RUST_ATTRIBUTE_GCC_DIAG (2, 3) @@ -72,6 +84,9 @@ rust_inform (const Location, const char *fmt, ...) extern void rust_error_at (const RichLocation &, const char *fmt, ...) RUST_ATTRIBUTE_GCC_DIAG (2, 3); +extern void +rust_error_at (const RichLocation &, const ErrorCode, const char *fmt, ...) + RUST_ATTRIBUTE_GCC_DIAG (3, 4); // clang-format on // These interfaces provide a way for the front end to ask for @@ -97,6 +112,9 @@ rust_be_error_at (const Location, const std::string &errmsg); extern void rust_be_error_at (const RichLocation &, const std::string &errmsg); extern void +rust_be_error_at (const RichLocation &, const ErrorCode, + const std::string &errmsg); +extern void rust_be_warning_at (const Location, int opt, const std::string &warningmsg); extern void rust_be_fatal_error (const Location, const std::string &errmsg) diff --git a/gcc/rust/rust-gcc-diagnostics.cc b/gcc/rust/rust-gcc-diagnostics.cc index db07372dfb5..70b3cf267a1 100644 --- a/gcc/rust/rust-gcc-diagnostics.cc +++ b/gcc/rust/rust-gcc-diagnostics.cc @@ -22,6 +22,7 @@ #include "rust-diagnostics.h" #include "options.h" +#include "diagnostic-metadata.h" void rust_be_internal_error_at (const Location location, const std::string &errmsg) @@ -70,6 +71,39 @@ rust_be_error_at (const RichLocation &location, const std::string &errmsg) error_at (&gcc_loc, "%s", errmsg.c_str ()); } +class rust_error_code_rule : public diagnostic_metadata::rule +{ +public: + rust_error_code_rule (const ErrorCode code) : m_code (code) {} + + char *make_description () const final override + { + return xstrdup (m_code.m_str); + } + + char *make_url () const final override + { + return concat ("https://doc.rust-lang.org/error-index.html#", + m_code.m_str, + NULL); + } + +private: + const ErrorCode m_code; +}; + +void +rust_be_error_at (const RichLocation &location, const ErrorCode code, + const std::string &errmsg) +{ + /* TODO: 'error_at' would like a non-'const' 'rich_location *'. */ + rich_location &gcc_loc = const_cast (location.get ()); + diagnostic_metadata m; + rust_error_code_rule rule (code); + m.add_rule (rule); + error_meta (&gcc_loc, m, "%s", errmsg.c_str ()); +} + void rust_be_get_quotechars (const char **open_qu, const char **close_qu) { diff --git a/gcc/rust/typecheck/rust-casts.cc b/gcc/rust/typecheck/rust-casts.cc index 61004dfabc3..708880e0019 100644 --- a/gcc/rust/typecheck/rust-casts.cc +++ b/gcc/rust/typecheck/rust-casts.cc @@ -283,7 +283,7 @@ TypeCastRules::emit_cast_error () const RichLocation r (locus); r.add_range (from.get_locus ()); r.add_range (to.get_locus ()); - rust_error_at (r, "invalid cast %<%s%> to %<%s%>", + rust_error_at (r, ErrorCode ("E0054"), "invalid cast %<%s%> to %<%s%>", from.get_ty ()->get_name ().c_str (), to.get_ty ()->get_name ().c_str ()); } diff --git a/gcc/testsuite/rust/compile/bad_as_bool_char.rs b/gcc/testsuite/rust/compile/bad_as_bool_char.rs index 91a28eebe00..9652915fe11 100644 --- a/gcc/testsuite/rust/compile/bad_as_bool_char.rs +++ b/gcc/testsuite/rust/compile/bad_as_bool_char.rs @@ -5,13 +5,13 @@ pub fn main () let fone = t as f32; // { dg-error "invalid cast" } let fzero = f as f64; // { dg-error "invalid cast" } - let nb = 0u8 as bool; // { dg-error "invalid cast" } + let nb = 0u8 as bool; // { dg-error "invalid cast .u8. to .bool. \\\[E0054\\\]" } let nc = true as char; // { dg-error "invalid cast" } let a = 'a'; let b = 'b'; let fa = a as f32; // { dg-error "invalid cast" } - let bb = b as bool; // { dg-error "invalid cast" } + let bb = b as bool; // { dg-error "invalid cast .char. to .bool. \\\[E0054\\\]" } let t32: u32 = 33; let ab = t32 as char; // { dg-error "invalid cast" }