[gcc/devel/rust/master] Merge commit '00dea7e8c41b672730d6e2c891b6012a83d8842c' into HEAD [#2284]

[Thomas Schwinge via Gcc-cvs]

https://gcc.gnu.org/g:59bc3e7924ed9dc293a77e3d9c6cdd99c252eefb

commit 59bc3e7924ed9dc293a77e3d9c6cdd99c252eefb
Merge: 4c445f0015b9 00dea7e8c41b
Author: Thomas Schwinge <tschwi...@baylibre.com>
Date:   Fri Mar 22 09:55:35 2024 +0100

    Merge commit '00dea7e8c41b672730d6e2c891b6012a83d8842c' into HEAD [#2284]

Diff:

 gcc/rust/lex/rust-lex.cc |  4 ++--
 libcpp/charset.cc        | 22 +++++++++++-----------
 libcpp/include/cpplib.h  |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --cc gcc/rust/lex/rust-lex.cc
index 71775e87c22a,ccc0c06d889f..bf6bf4c84466
--- a/gcc/rust/lex/rust-lex.cc
+++ b/gcc/rust/lex/rust-lex.cc
@@@ -125,21 -116,9 +125,21 @@@ is_non_decimal_int_literal_separator (u
    return character == 'x' || character == 'o' || character == 'b';
  }
  
 -Lexer::Lexer (const std::string &input)
 +bool
 +is_identifier_start (uint32_t codepoint)
 +{
-   return (check_xid_property (codepoint) & XID_START) || codepoint == '_';
++  return (cpp_check_xid_property (codepoint) & CPP_XID_START) || codepoint == 
'_';
 +}
 +
 +bool
 +is_identifier_continue (uint32_t codepoint)
 +{
-   return check_xid_property (codepoint) & XID_CONTINUE;
++  return cpp_check_xid_property (codepoint) & CPP_XID_CONTINUE;
 +}
 +
 +Lexer::Lexer (const std::string &input, Linemap *linemap)
    : input (RAIIFile::create_error ()), current_line (1), current_column (1),
 -    line_map (nullptr), dump_lex_out (Optional<std::ofstream &>::none ()),
 +    line_map (linemap), dump_lex_out ({}),
      raw_input_source (new BufferInputSource (input, 0)),
      input_queue{*raw_input_source}, token_queue (TokenSource (this))
  {}