From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 9415F385B53C; Thu, 12 Jan 2023 07:44:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9415F385B53C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673509474; bh=oVos/5czac8H91jFIe+2KXovV4dANMGT/Uwn6enlFPs=; h=From:To:Subject:Date:From; b=bCK1BghwAM6a5N/d8AhkJgUUeKp7O74WiA6jNIuz3qFRB5hDdMwlZH5L+hKbm50ca MpIjdgEGW07Qa7e939WpGfsa+umP4M8USYlyx2rZLgBX+nhKylcLjq942ekzlrAwZP 2fV9E1CFtS90mwIT6K0AurLpoTAHwvdweas/G3Bo= 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 #1707 #1717 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: 68b0212c81a9c8187976eb27a932ee4bf65643a1 X-Git-Newrev: 48d32bc9cb05ea02ee0dc9d97d86ff1f559fae4f Message-Id: <20230112074434.9415F385B53C@sourceware.org> Date: Thu, 12 Jan 2023 07:44:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:48d32bc9cb05ea02ee0dc9d97d86ff1f559fae4f commit 48d32bc9cb05ea02ee0dc9d97d86ff1f559fae4f Merge: 68b0212c81a 5bbbe70df98 fd25c4fa72f Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Jan 5 15:59:10 2023 +0000 Merge #1707 #1717 1707: Fix frust very long typo r=CohenArthur a=CohenArthur Missing space character 1717: format: Fix git whitespace errors r=CohenArthur a=CohenArthur Addresses #1680 Fixes #1680 Probably does not need a changelog since I assume this commit will just be dropped when we merge Co-authored-by: Arthur Cohen Diff: CONTRIBUTING.md | 20 ++++++++++---------- README.md | 20 ++++++++++---------- gcc/rust/lang.opt | 4 ++-- gcc/rust/lex/rust-token.h | 2 -- gcc/rust/parse/rust-parse-impl.h | 29 +++++++++++++++++++---------- gcc/rust/rust-session-manager.cc | 2 +- 6 files changed, 42 insertions(+), 35 deletions(-)