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

diff --cc gcc/rust/lex/rust-lex.cc
index 71775e87c22a9ede1f0961da701abd7cf7309ee5,ccc0c06d889f5308b59b055124a21b83ec4ee51b..bf6bf4c84466470a5bf2ed34517fc48ff4b124b3
--- 1/gcc/rust/lex/rust-lex.cc
--- 2/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))
  {}