public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] Match rustc beta versions
Date: Fri, 15 Apr 2022 17:35:46 +0000 (GMT)	[thread overview]
Message-ID: <20220415173546.F20CE3858C2C@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7410508723bf20c29ea8d5888eee9c45e5fae0a2

commit 7410508723bf20c29ea8d5888eee9c45e5fae0a2
Author: Tom Tromey <tom@tromey.com>
Date:   Fri Mar 25 13:36:32 2022 -0600

    Match rustc beta versions
    
    The rust_compiler_version proc extracts the Rust compiler version from
    the "rustc --version" output.  For a beta compiler, the output looks
    like:
    
        rustc 1.60.0-beta.6 (7bccde197 2022-03-22)
    
    This patch slightly relaxes the regexp -- removing a space -- so that
    this can be understood by this proc.

Diff:
---
 gdb/testsuite/lib/rust-support.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/lib/rust-support.exp b/gdb/testsuite/lib/rust-support.exp
index 0d39566df73..85e5b021e21 100644
--- a/gdb/testsuite/lib/rust-support.exp
+++ b/gdb/testsuite/lib/rust-support.exp
@@ -104,7 +104,7 @@ gdb_caching_proc rust_compiler_version {
     } else {
 	set output [lindex [remote_exec host "$rustc --version --verbose"] 1]
 	foreach line [split $output \n] {
-	    if {[regexp "rustc (\[0-9.\]+) .*\$" $output ignore version]} {
+	    if {[regexp "rustc (\[0-9.\]+).*\$" $output ignore version]} {
 		return $version
 	    }
 	}


                 reply	other threads:[~2022-04-15 17:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220415173546.F20CE3858C2C@sourceware.org \
    --to=tromey@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).