From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id F2955384B13A; Thu, 27 Oct 2022 18:56:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2955384B13A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666896973; bh=Zyy2beJ4xaav+h74ATeRjbuFpyl34YB0kplYRke2VNw=; h=From:To:Subject:Date:From; b=hsicAgM7Ca2yBcfiA53zc7BeAjQLie7t+zsplj3i794FPl1jlQ834cxFcp3vZwTTg BA+A+ALOOPRnUm71zcJSmK6/jCB9JYp9tKGXgU1QqX9EVhNxvSs51JbtlfhKayNAmo wKg+2cYBM0P41ajHCS7rnj6axeLF+pTu/0DCAEog= 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] Merge #1616 #1617 X-Act-Checkin: gcc X-Git-Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 4dbff3d0550fed53de385ff5a52859178f8940cc X-Git-Newrev: 353ed6ce8add32b84f0fdfbcbc020d8f7154530d Message-Id: <20221027185613.F2955384B13A@sourceware.org> Date: Thu, 27 Oct 2022 18:56:13 +0000 (GMT) List-Id: https://gcc.gnu.org/g:353ed6ce8add32b84f0fdfbcbc020d8f7154530d commit 353ed6ce8add32b84f0fdfbcbc020d8f7154530d Merge: 4dbff3d0550 259c384a97f 3f3b4a45eb9 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Oct 27 10:49:47 2022 +0000 Merge #1616 #1617 1616: Apply 1559 master (remove system includes) r=CohenArthur a=CohenArthur Fixes #1571 1617: Apply #1605 on master (fix lang spec) r=CohenArthur a=CohenArthur Co-authored-by: ibuclaw Let's still do this while we haven't resolved #1540 :) Closes #1609 Co-authored-by: Arthur Cohen Diff: gcc/rust/Make-lang.in | 2 +- gcc/rust/ast/rust-ast-full-test.cc | 6 +----- gcc/rust/ast/rust-macro.h | 2 +- gcc/rust/lang-specs.h | 4 ++-- gcc/rust/lex/rust-codepoint.h | 2 +- gcc/rust/lex/rust-lex.cc | 5 ++--- gcc/rust/lex/rust-token.cc | 3 +-- gcc/rust/lex/rust-token.h | 7 +------ gcc/rust/parse/rust-cfg-parser.h | 2 -- gcc/rust/rust-object-export.cc | 3 +-- gcc/rust/util/rust-attributes.cc | 2 +- gcc/rust/util/rust-make-unique.h | 2 +- gcc/rust/util/rust-optional-test.cc | 3 +-- 13 files changed, 14 insertions(+), 29 deletions(-)