convert 99.9% of `try!`s to `?`s #32390

japaric · 2016-03-21T08:43:01Z

The first commit is an automated conversion using the untry tool and the following command:

$ find -name '*.rs' -type f | xargs untry

at the root of the Rust repo.

cc @rust-lang/lang @alexcrichton @brson

rust-highfive · 2016-03-21T08:43:15Z

r? @pnkfelix

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

japaric · 2016-03-21T08:48:08Z

This is, approximately, all the try!s that were left behind in the repository.

$ grep 'try!' **/*.rs | grep -v 'panictry!' | grep -v 'option_try!' | grep -v ' *//'
src/libcore/num/bignum.rs:                try!(write!(f, "{:#x}", self.base[sz-1]));
src/libcore/num/bignum.rs:                    try!(write!(f, "_{:01$x}", v, digitlen));
src/librustc_const_eval/int.rs:                match try!(self.infer(rhs)) {
src/librustc_const_eval/int.rs:                match try!(self.infer(rhs)) {
src/librustc/diagnostics.rs:Another situation in which this occurs is when you attempt to use the `try!`
src/librustc/diagnostics.rs:    let mut f = try!(File::create("foo.txt"));
src/librustc/diagnostics.rs:`try!` returns a `Result<T, E>`, and so the function must. But `main()` has
src/libserialize/json.rs:            try!(write!($enc.writer, "\"{}\"", $e));
src/libserialize/json.rs:            try!(write!($enc.writer, "{}", $e));
src/libserialize/serialize.rs:                    let ret = ($(try!(d.read_tuple_arg({ i+=1; i-1 },
src/libserialize/serialize.rs:                    $(try!(s.emit_tuple_arg({ i+=1; i-1 }, |s| $name.encode(s)));)*
src/libstd/sys/common/backtrace.rs:                                try!(writer.write_all($demangled));
src/libstd/sys/common/backtrace.rs:                                try!(writer.write_all(rest.as_bytes()));

The tool can't/won't convert try!s that are inside macros like macro_rules! or inside comments.

mitaa · 2016-03-21T09:25:26Z

src/compiletest/compiletest.rs

                                        base,
                                        &file_path,
                                        &relative_file_path,
-                                        tests));
+                                        tests)?;


The automatic conversion breaks alignment in multi-line statements such as this. Should this be addressed in other PRs?

I think it should be in this one directly. Otherwise we'll certainly have multiple PRs to fix local broken alignments.

Hmm, can untry be extended to warn about cases like this, to ease the process of detecting them?

Hmm, can untry be extended to warn about cases like this, to ease the process of detecting them?

Yeah, it shouldn't be that hard. (famous last words)

The automatic conversion breaks alignment in multi-line statements such as this. Should this be addressed in other PRs?

Once we get a good way to detect all these cases (with the warn feature @pnkfelix mentioned above) it should easy to fix all these in a single PR; it doesn't have to be done in this one though.

Abandoning the style, which causes such problems is not an option?

pnkfelix · 2016-03-22T14:45:27Z

rubber stamping... (leaving the fixes to indentation to later PR's)

pnkfelix · 2016-03-22T14:45:31Z

@bors r+

bors · 2016-03-22T14:45:32Z

📌 Commit 1316ad4 has been approved by pnkfelix

bors · 2016-03-22T20:17:57Z

☔ The latest upstream changes (presumably #32156) made this pull request unmergeable. Please resolve the merge conflicts.

japaric · 2016-03-22T21:50:39Z

untry now warns when converting multi-line try!s. There are 313 instances of multi-line try!s in this PR. I'm going to rebase this and fix the alignments.

japaric · 2016-03-22T23:57:40Z

@bors: r=pnkfelix

bors · 2016-03-22T23:57:41Z

📌 Commit 10ed4f6 has been approved by pnkfelix

bors · 2016-03-23T02:58:09Z

☔ The latest upstream changes (presumably #32204) made this pull request unmergeable. Please resolve the merge conflicts.

Automated conversion using the untry tool [1] and the following command: ``` $ find -name '*.rs' -type f | xargs untry ``` at the root of the Rust repo. [1]: https://github.com/japaric/untry

chris-morgan · 2016-03-23T03:05:39Z

@japaric, FYI:

grep 'try!' **/*.rs | grep -v 'panictry!' | grep -v 'option_try!' | grep -v ' *//'

grep '\btry!' **/*.rs | grep -v //

Or with ag and a slightly improved comment filter,

ag --rust '\btry!' | grep -v '//.*try!'

japaric · 2016-03-23T03:10:08Z

Rebased and pushed a commit that enables the question_mark feature gate in the recently added rustc_borrowck crate.

@bors: r=pnkfelix

bors · 2016-03-23T03:10:09Z

📌 Commit c548eda has been approved by pnkfelix

bors · 2016-03-23T10:01:48Z

⌛ Testing commit c548eda with merge e2e5795...

bors · 2016-03-23T10:49:01Z

💔 Test failed - auto-linux-64-x-android-t

japaric · 2016-03-23T11:18:43Z

I deleted an & by mistake while fixing the alignments 😅.

@bors: r=pnkfelix

bors · 2016-03-23T11:18:44Z

📌 Commit c063c51 has been approved by pnkfelix

bors · 2016-03-23T15:59:11Z

⌛ Testing commit c063c51 with merge b76f818...

@alexcrichton

convert 99.9% of `try!`s to `?`s The first commit is an automated conversion using the [untry] tool and the following command: ``` $ find -name '*.rs' -type f | xargs untry ``` at the root of the Rust repo. [untry]: https://github.com/japaric/untry cc @rust-lang/lang @alexcrichton @brson

bors · 2016-03-23T19:33:02Z

nodakai · 2016-03-26T05:54:58Z

src/libstd/sys/windows/process.rs

        si.hStdInput = stdin.raw();
        si.hStdOutput = stdout.raw();
        si.hStdError = stderr.raw();

-        try!(unsafe {


Now I'm not sure if ? was actually an improvement in cases like this.

? should probably just go inside the unsafe block.

rust-highfive assigned pnkfelix Mar 21, 2016

japaric mentioned this pull request Mar 21, 2016

[JustForShow] try!() -> ? rust-lang/cargo#2497

Closed

mitaa reviewed Mar 21, 2016
View reviewed changes

japaric force-pushed the untry branch from 1316ad4 to 10ed4f6 Compare March 22, 2016 22:59

Jorge Aparicio added 7 commits March 22, 2016 22:01

try! -> ?

0f02309

Automated conversion using the untry tool [1] and the following command: ``` $ find -name '*.rs' -type f | xargs untry ``` at the root of the Rust repo. [1]: https://github.com/japaric/untry

sprinkle feature gates here and there

aa7fe93

std: undo conversion of user defined try!s

f88a1e6

term: undo conversion of user defined try!s

acbf386

break long line

bd71d11

fix alignment

2628f3c

enable question_mark feature in rustc_borrowck

c548eda

japaric force-pushed the untry branch from 10ed4f6 to c548eda Compare March 23, 2016 03:09

add back & that was deleted by mistake

c063c51

bors merged commit c063c51 into rust-lang:master Mar 23, 2016

japaric deleted the untry branch March 23, 2016 19:59

nodakai reviewed Mar 26, 2016
View reviewed changes

choleraehyq mentioned this pull request Jul 17, 2017

*: Add grpc interfaces used by transaction debugger tikv/tikv#2012

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

convert 99.9% of `try!`s to `?`s #32390

convert 99.9% of `try!`s to `?`s #32390

japaric commented Mar 21, 2016

rust-highfive commented Mar 21, 2016

japaric commented Mar 21, 2016

mitaa Mar 21, 2016

GuillaumeGomez Mar 21, 2016

pnkfelix Mar 21, 2016

japaric Mar 21, 2016

gkoz Mar 22, 2016

pnkfelix commented Mar 22, 2016

pnkfelix commented Mar 22, 2016

bors commented Mar 22, 2016

bors commented Mar 22, 2016

japaric commented Mar 22, 2016

japaric commented Mar 22, 2016

bors commented Mar 22, 2016

bors commented Mar 23, 2016

chris-morgan commented Mar 23, 2016

japaric commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

japaric commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

nodakai Mar 26, 2016

cristicbz Mar 28, 2016

convert 99.9% of try!s to ?s #32390

convert 99.9% of try!s to ?s #32390

Conversation

japaric commented Mar 21, 2016

rust-highfive commented Mar 21, 2016

japaric commented Mar 21, 2016

mitaa Mar 21, 2016

Choose a reason for hiding this comment

GuillaumeGomez Mar 21, 2016

Choose a reason for hiding this comment

pnkfelix Mar 21, 2016

Choose a reason for hiding this comment

japaric Mar 21, 2016

Choose a reason for hiding this comment

gkoz Mar 22, 2016

Choose a reason for hiding this comment

pnkfelix commented Mar 22, 2016

pnkfelix commented Mar 22, 2016

bors commented Mar 22, 2016

bors commented Mar 22, 2016

japaric commented Mar 22, 2016

japaric commented Mar 22, 2016

bors commented Mar 22, 2016

bors commented Mar 23, 2016

chris-morgan commented Mar 23, 2016

japaric commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

japaric commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

bors commented Mar 23, 2016

nodakai Mar 26, 2016

Choose a reason for hiding this comment

cristicbz Mar 28, 2016

Choose a reason for hiding this comment

convert 99.9% of `try!`s to `?`s #32390

convert 99.9% of `try!`s to `?`s #32390