From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 0F3AA3857B9D; Tue, 16 Jan 2024 18:08:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F3AA3857B9D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705428533; bh=qg59u+eZmMhV1tNzNeN19dgGNOConorXGf2IfLDehok=; h=From:To:Subject:Date:From; b=Xc4TJ+3WV/qXg7F3Mo8T6bwU6SAU76BibN9u/WjkISNLtw4c1qFNBxLmgeIigPjYy xodO85q4XlN+std0MEz8DuK0eo58SZy4CuMncQdBDniV9YkU1or+TXJOqSZ3M6Ln0K BhLYG9K0pWpscHgxYr2uTrLHbSpog5IDgVbHyEuw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-7937] gccrs: Improve byte vector to string conversion X-Act-Checkin: gcc X-Git-Author: Owen Avery X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 04d6111e6e68cb4b7f53027ed35a47241dfc7165 X-Git-Newrev: 750ac3263c8db064b1d6b3ae33ec6a2036e38bb8 Message-Id: <20240116180853.0F3AA3857B9D@sourceware.org> Date: Tue, 16 Jan 2024 18:08:52 +0000 (GMT) List-Id: https://gcc.gnu.org/g:750ac3263c8db064b1d6b3ae33ec6a2036e38bb8 commit r14-7937-g750ac3263c8db064b1d6b3ae33ec6a2036e38bb8 Author: Owen Avery Date: Wed Aug 2 16:45:42 2023 -0400 gccrs: Improve byte vector to string conversion gcc/rust/ChangeLog: * expand/rust-macro-builtins.cc (MacroBuiltin::include_str_handler): Use vector::data. Signed-off-by: Owen Avery Diff: --- gcc/rust/expand/rust-macro-builtins.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index 718d740b1dc..b36a46f0aff 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -576,10 +576,8 @@ MacroBuiltin::include_str_handler (location_t invoc_locus, if (expect_single) rust_error_at (invoc_locus, "%s was not a valid utf-8 file", target_filename.c_str ()); - else if (!bytes.empty ()) - str = std::string ((const char *) &bytes[0], bytes.size ()); else - return tl::nullopt; + str = std::string ((const char *) bytes.data (), bytes.size ()); auto node = AST::SingleASTNode (make_string (invoc_locus, str)); auto str_tok = make_token (Token::make_string (invoc_locus, std::move (str)));