Fix the span for try shorthand expressions #32711

marcusklaas · 2016-04-03T20:31:27Z

My five character contribution to the rust parser! Fixes #32709.

rust-highfive · 2016-04-03T20:31:39Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

jseyfried · 2016-04-04T00:46:54Z

Thanks!

@bors r+ rollup

bors · 2016-04-04T00:46:54Z

📌 Commit 081a7a9 has been approved by jseyfried

nagisa · 2016-04-04T00:48:19Z

Needs a test.

@bors r-

marcusklaas · 2016-04-04T09:13:23Z

@nagisa AFAIK, there is no way to test against regressions of overly long spans. If you know of a way, I'd be happy to write one!

jseyfried · 2016-04-04T09:20:53Z

@marcusklaas I believe you can do something like this:

fn main() {
    a?; //~ ERROR 2:5: 2:7
}

nikomatsakis · 2016-04-04T17:33:31Z

as @marcusklaas notes, we don't usually test these, though indeed we probably should... would be nice to add a more targeted way of testing them. I guess that what @jseyfried suggests may actually work.

nagisa · 2016-04-04T18:14:46Z

It does indeed work. We also have a bunch of regression tests all around already, testing that the span (where it was misaligned before) is correct by using some smart whitespacing in test (though I’m not sure whether the tests actually properly test the span).

I don’t see how this case is any different.

marcusklaas · 2016-04-04T19:00:44Z

@nagisa these whitespace tests can only verify that some part of the code is part of the span. Here we want to ensure that the span does not contain something. I'll give @jseyfried's approach a try; looks promising!

marcusklaas · 2016-04-04T21:55:22Z

Added a test! r? @nagisa

nagisa · 2016-04-04T22:13:51Z

@bors r+ cfe25ad

mitaa · 2016-04-05T07:22:10Z

/home/travis/build/rust-lang/rust/src/test/compile-fail/symbol-names/issue-32709.rs:11: trailing whitespace

… r=nagisa Fix the span for try shorthand expressions My five character contribution to the rust parser! Fixes rust-lang#32709.

steveklabnik · 2016-04-06T15:33:21Z

@bors: r-

this has a tidy error

marcusklaas · 2016-04-06T20:53:33Z

Fixed. Apologies for the mess.

alexcrichton · 2016-04-06T21:00:24Z

@bors: r=nagisa 81a37e8d9ba19f0b40509d220da85c7e15e3467d

Manishearth · 2016-04-07T14:54:17Z

http://buildbot.rust-lang.org/builders/auto-linux-musl-64-opt/builds/3787/steps/test/logs/stdio



---- [compile-fail] compile-fail/symbol-names/issue-32709.rs stdout ----

error: unexpected compiler message: '/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16:5: 16:6 error: unresolved name `a` [E0425]'

error: unexpected compiler message: '/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16:5: 16:7 error: mismatched types:'

error: expected error on line 16 not found: 2:5: 2:7

error: 2 unexpected errors found, 1 expected errors not found
status: exit code: 101
command: x86_64-unknown-linux-gnu/stage2/bin/rustc /buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs -L x86_64-unknown-linux-gnu/test/compile-fail/ --target=x86_64-unknown-linux-musl -L x86_64-unknown-linux-gnu/test/compile-fail/symbol-names/issue-32709.stage2-x86_64-unknown-linux-musl.compile-fail.libaux -C prefer-dynamic -o x86_64-unknown-linux-gnu/test/compile-fail/symbol-names/issue-32709.stage2-x86_64-unknown-linux-musl -C linker=/musl-x86_64/bin/musl-gcc -C ar=ar --cfg rtopt -C rpath -O -L x86_64-unknown-linux-musl/rt
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16:5: 16:6 error: unresolved name `a` [E0425]
/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16     a?; //~ ERROR 2:5: 2:7
                                                                                                                      ^
/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16:5: 16:6 help: run `rustc --explain E0425` to see a detailed explanation
/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16:5: 16:7 error: mismatched types:
 expected `()`,
    found `std::result::Result<_, _>`
(expected (),
    found enum `std::result::Result`) [E0308]
/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16     a?; //~ ERROR 2:5: 2:7
                                                                                                                      ^~
/buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/test/compile-fail/symbol-names/issue-32709.rs:16:5: 16:7 help: run `rustc --explain E0308` to see a detailed explanation
error: aborting due to previous error

------------------------------------------

thread '[compile-fail] compile-fail/symbol-names/issue-32709.rs' panicked at 'explicit panic', /buildslave/rust-buildbot/slave/auto-linux-musl-64-opt/build/src/compiletest/runtest.rs:1677


failures:
    [compile-fail] compile-fail/symbol-names/issue-32709.rs

Rollup of 7 pull requests - Successful merges: #32674, #32699, #32711, #32745, #32748, #32757, #32789 - Failed merges:

nagisa · 2016-04-07T17:06:08Z

Oh, it still has the rollup flag on! My bad @Manishearth!

@bors rollup- r-

@marcusklaas need to adjust line numbers from 2 to 16 in the test.

marcusklaas · 2016-04-11T19:23:20Z

Ugh - I force pushed an experimental test the last time around :/ My bad. All should be well now.

nagisa · 2016-04-11T19:31:43Z

@bors r+ 05e4116

bors · 2016-04-11T22:20:37Z

⌛ Testing commit 05e4116 with merge 3fb3cf3...

Fix the span for try shorthand expressions My five character contribution to the rust parser! Fixes #32709.

bors · 2016-04-12T00:13:09Z

💔 Test failed - auto-win-msvc-32-opt

alexcrichton · 2016-04-12T01:23:01Z

@bors: retry

On Mon, Apr 11, 2016 at 5:13 PM, bors [email protected] wrote:

[image: 💔] Test failed - auto-win-msvc-32-opt
http://buildbot.rust-lang.org/builders/auto-win-msvc-32-opt/builds/2943

—
You are receiving this because you commented.
Reply to this email directly or view it on GitHub
#32711 (comment)

bors · 2016-04-12T05:14:04Z

⌛ Testing commit 05e4116 with merge 28c9fda...

Fix the span for try shorthand expressions My five character contribution to the rust parser! Fixes #32709.

bors · 2016-04-12T08:11:21Z

rust-highfive assigned nikomatsakis Apr 3, 2016

marcusklaas mentioned this pull request Apr 3, 2016

Try shorthand rust-lang/rustfmt#893

Merged

rust-highfive assigned nagisa and unassigned nikomatsakis Apr 4, 2016

steveklabnik mentioned this pull request Apr 6, 2016

Rollup of 13 pull requests #32771

Closed

Manishearth mentioned this pull request Apr 7, 2016

Rollup of 7 pull requests #32794

Merged

bors added a commit that referenced this pull request Apr 7, 2016

Auto merge of #32794 - Manishearth:rollup, r=Manishearth

470ca1c

Rollup of 7 pull requests - Successful merges: #32674, #32699, #32711, #32745, #32748, #32757, #32789 - Failed merges:

Fix the span for try shorthand expressions

05e4116

bors added a commit that referenced this pull request Apr 11, 2016

Auto merge of #32711 - marcusklaas:try-shorthand-span-fix, r=nagisa

3fb3cf3

Fix the span for try shorthand expressions My five character contribution to the rust parser! Fixes #32709.

bors added a commit that referenced this pull request Apr 12, 2016

Auto merge of #32711 - marcusklaas:try-shorthand-span-fix, r=nagisa

28c9fda

Fix the span for try shorthand expressions My five character contribution to the rust parser! Fixes #32709.

bors merged commit 05e4116 into rust-lang:master Apr 12, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the span for try shorthand expressions #32711

Fix the span for try shorthand expressions #32711

marcusklaas commented Apr 3, 2016

rust-highfive commented Apr 3, 2016

jseyfried commented Apr 4, 2016

bors commented Apr 4, 2016

nagisa commented Apr 4, 2016

marcusklaas commented Apr 4, 2016

jseyfried commented Apr 4, 2016

nikomatsakis commented Apr 4, 2016

nagisa commented Apr 4, 2016

marcusklaas commented Apr 4, 2016

marcusklaas commented Apr 4, 2016

nagisa commented Apr 4, 2016

mitaa commented Apr 5, 2016

steveklabnik commented Apr 6, 2016

marcusklaas commented Apr 6, 2016

alexcrichton commented Apr 6, 2016

Manishearth commented Apr 7, 2016

nagisa commented Apr 7, 2016

marcusklaas commented Apr 11, 2016

nagisa commented Apr 11, 2016

bors commented Apr 11, 2016

bors commented Apr 12, 2016

alexcrichton commented Apr 12, 2016

bors commented Apr 12, 2016

bors commented Apr 12, 2016

Fix the span for try shorthand expressions #32711

Fix the span for try shorthand expressions #32711

Conversation

marcusklaas commented Apr 3, 2016

rust-highfive commented Apr 3, 2016

jseyfried commented Apr 4, 2016

bors commented Apr 4, 2016

nagisa commented Apr 4, 2016

marcusklaas commented Apr 4, 2016

jseyfried commented Apr 4, 2016

nikomatsakis commented Apr 4, 2016

nagisa commented Apr 4, 2016

marcusklaas commented Apr 4, 2016

marcusklaas commented Apr 4, 2016

nagisa commented Apr 4, 2016

mitaa commented Apr 5, 2016

steveklabnik commented Apr 6, 2016

marcusklaas commented Apr 6, 2016

alexcrichton commented Apr 6, 2016

Manishearth commented Apr 7, 2016

nagisa commented Apr 7, 2016

marcusklaas commented Apr 11, 2016

nagisa commented Apr 11, 2016

bors commented Apr 11, 2016

bors commented Apr 12, 2016

alexcrichton commented Apr 12, 2016

bors commented Apr 12, 2016

bors commented Apr 12, 2016