From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 5E5D938582B7 for ; Tue, 30 Jan 2024 12:11:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5E5D938582B7 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5E5D938582B7 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616754; cv=none; b=Z3fzfYcKiA0tH/iH+cgbU0pQChVGcM55l1r+s8D+YRbRhIxtEng4t2uEwcOZoyWKl1g3s33p2fv+xR1wkQxjW0fuQvY3/d/s93z3mGZ3ZsrrQye2aaAFvx7OTKHqui/0WSIwOLyKDfn19VLpumbQTqSEVPtr17vifNg22Br8kJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616754; c=relaxed/simple; bh=oNX+2jrKTJkYQVjf8aKAJTOZDIoY6kwjk0y3fXjLYYQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ovqFi6xJ+jF8SW24MEcuqdJqk8g3fVum3sCbefrKK7U3cyh83v7jxjGMbRFJoH1ACPNFzaaA7n2N5vmX7EXYgE0lf6o6SA2bSENx8mhOZlg4TStnIUQotsc6HdXeXpQyrjHpssTbn1nnvqiiqgGkRi9w9V9LlksJrtt0KcBvfUU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40e913e3f03so43508955e9.3 for ; Tue, 30 Jan 2024 04:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616710; x=1707221510; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=SK4wuJ0WnqVoZ8MJRdmhnZwHJ1R1DRwZs66E4CruSAU=; b=M0U+uaZwVnQRZCm4Ey5Z3b5iObGbl6JLHhYTqPkr8h1Kj6/uQwZtX93zZvwFQjobJA lpFLUoJcPeoYWHWx5fkxQ8MDQwgxBD6Tceudo4WsqWhc65RtSOhKmTu3nvMitCJEYeiP e+tPaznXdL7NE+BbXHgMA5/+BMGIAmvmV6sRQ/uUE01q+qy9CbDp6E8WpXi15+JOskop /ER/Ag0gvFYW7yuIC7PD4Ma5yWndUliw6Ak8CPvFWron3gb+lJShKhVueb1dSBhn/Wq4 4QZvsj6CimgZrCzP8jzZ5tUNFkNdlmEft0MQ+ExXBN8bcMf+gtADWyA1JSFcm6Uhtcu8 MrYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616710; x=1707221510; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SK4wuJ0WnqVoZ8MJRdmhnZwHJ1R1DRwZs66E4CruSAU=; b=JrzHbmD6CG4+qXwJA3mQGqP2RDIN19hQ84zVau8eedPaiIT9wMAnrCwKLZVkncCUqM dty/07YC223VdC89ijDFjSOVfCIZfeSsxWiBqprhesGDujYEHK4H5APyFtj5qFHpTm9k BMBN7TdtZ+MZ854V0M/qMDuAtsvNK5BQbcPO13YamDp0MPs/g+ilnvHf8TlNNZDpBgIZ zLCh2A1bnGHg+gImdrb+riByWr7K+8VddUxoAYTcZyPq3nRJoqOGv9xvF/K3+7igJmDS uzT1IWUpXCDgdXP2F3zsgsSnwFpGax+FJqPRbmMYYdkpEPhg1xt/+l5z395hfwHjOQNA PTFA== X-Gm-Message-State: AOJu0YwLN7+ANuqBkSWwWITkoGJT2Qgk1iXNrswYDA6uM7k+gsc8dtT+ rjzz+KRZnTz34toQ5SghMt8F0YFNPaApObq6NO8pCCH9mka0JkIJ2SLXRXqjNzbUK4/lRd+RWXA hbg== X-Google-Smtp-Source: AGHT+IHUBGl2Qv+vojAwXNxYLRJuViMtzW8Izt5TZLbJB5+2vo1zs+EmixInI4qrjIpLKUPIFa6g8w== X-Received: by 2002:a5d:6383:0:b0:33a:ed8c:1a6a with SMTP id p3-20020a5d6383000000b0033aed8c1a6amr3921776wru.64.1706616710058; Tue, 30 Jan 2024 04:11:50 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:49 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [COMMITTED 082/101] gccrs: ast: Fix lifetime type parsing Date: Tue, 30 Jan 2024 13:07:38 +0100 Message-ID: <20240130121026.807464-85-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Jakub Dupak There was a mismatch whether lifetime 'static is parsed as "static" or "'static". gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::lifetime_from_token): Fix matched pattern. Signed-off-by: Jakub Dupak --- gcc/rust/parse/rust-parse-impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 378b9ada5ed..90bc2e214e4 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -4158,11 +4158,11 @@ Parser::lifetime_from_token (const_TokenPtr tok) location_t locus = tok->get_locus (); std::string lifetime_ident = tok->get_str (); - if (lifetime_ident == "'static") + if (lifetime_ident == "static") { return AST::Lifetime (AST::Lifetime::STATIC, "", locus); } - else if (lifetime_ident == "'_") + else if (lifetime_ident == "_") { return AST::Lifetime (AST::Lifetime::WILDCARD, "", locus); } -- 2.42.1