Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of PRs in the queue; Wednesday #22796

Merged
merged 62 commits into from
Feb 25, 2015
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
efd2a17
Deprecate std::sync::TaskPool
aturon Feb 17, 2015
64fe93e
std: Tidy up some `unsafe impl`s for `sync`
alexcrichton Feb 20, 2015
d443f98
Apply borrowck to fns that appear in const declarations.
nikomatsakis Feb 23, 2015
d0c589d
Hide unnecessary error checking from the user
tbu- Feb 23, 2015
79bf783
std: Handle a trailing slash in create_dir_all
alexcrichton Feb 23, 2015
537d694
std: Expose a `mode` accessor for Permissions on unix
alexcrichton Feb 23, 2015
948a17e
Stop parsing "-" as integer, fixes #22745
krdln Feb 24, 2015
fcf7023
Properly reimplement `unsafe-code` lint to honor changing lint attrib…
ipetkov Feb 24, 2015
23f5a8f
std::io::BufReader: remove leftover lifetime parameter on get_ref()
mzabaluev Feb 24, 2015
a9f6f4b
Add missing `fn`
krdln Feb 24, 2015
0afebe6
Replace deprecated getdtablesize() with sysconf(_SC_OPEN_MAX) for and…
ejjeong Feb 24, 2015
0bea550
style nitpicks
Feb 24, 2015
01385a2
iOS: Sync/Send fallout
vhbit Feb 24, 2015
54b1106
Revert a wrong replace of "fail" to "panic"
tbu- Feb 24, 2015
0fc1a7d
Improve readability of an error check in `set_non_blocking`
tbu- Feb 24, 2015
f31ea22
Mention try macro in error chapter
steveklabnik Feb 17, 2015
2807a1c
Use arrays instead of vectors in tests
petrochenkov Feb 24, 2015
c11807d
Fix broken tests
petrochenkov Feb 24, 2015
0e36a27
Rollup merge of #22623 - petrochenkov:optest, r=alexcrichton
Manishearth Feb 24, 2015
5af3d66
Rollup merge of #22739 - tbu-:pr_error_net, r=alexcrichton
Manishearth Feb 24, 2015
ad73cb0
Rollup merge of #22747 - krdln:fix-parsing-minus, r=alexcrichton
Manishearth Feb 24, 2015
4ff8b8a
Rollup merge of #22752 - ipetkov:unsafe-lint-fix, r=alexcrichton
Manishearth Feb 24, 2015
1913e79
Rollup merge of #22758 - ejjeong:aarch64-linux-android, r=alexcrichton
Manishearth Feb 24, 2015
216be12
Rollup merge of #22770 - vhbit:ios-rand-send, r=alexcrichton
Manishearth Feb 24, 2015
80ac3a8
Rollup merge of #22772 - tbu-:pr_panic_fail, r=alexcrichton
Manishearth Feb 24, 2015
a429bf6
Rollup merge of #22458 - steveklabnik:try_in_error_chapter, r=alexcri…
Manishearth Feb 24, 2015
c51c377
Rollup merge of #22539 - oli-obk:style_nitpicks, r=Manishearth
Manishearth Feb 24, 2015
2408698
Rollup merge of #22736 - nikomatsakis:issue-22382, r=eddyb
Manishearth Feb 24, 2015
b711b6a
Rollup merge of #22778 - mzabaluev:leftover-lifetime, r=alexcrichton
Manishearth Feb 24, 2015
ab45694
std: Stabilize some `ptr` functions
alexcrichton Feb 23, 2015
27f8708
std: Recomend threadpool on crates.io for TaskPool
alexcrichton Feb 24, 2015
14c7683
Fix "How to submit a bug report" link
rnestler Feb 24, 2015
408f7b5
Modify collection's `Debug` output to resemble in their content only
tbu- Feb 10, 2015
870ad3b
Change `Debug` implementation of `BTree*` as well
tbu- Feb 10, 2015
db6ae66
Make traits with assoc types invariant in their inputs.
nikomatsakis Feb 20, 2015
eb841fc
Resolve regions too when normalizing param env.
nikomatsakis Feb 20, 2015
206c254
Improve debug output from coherence.
nikomatsakis Feb 23, 2015
2d200c9
std: Move std::env to the new I/O APIs
alexcrichton Feb 23, 2015
65e1e6b
Add a section on recursive macros
kmcallister Feb 20, 2015
1804242
Add a second, more vexing section on recursive macros
kmcallister Feb 21, 2015
df08657
Tweak wording in the macros guide
kmcallister Feb 21, 2015
848a7e6
Enhance and move information about macro debugging
kmcallister Feb 21, 2015
5d7e283
Turn `unsafe_no_drop_flag` back into a gated-feature.
pnkfelix Feb 25, 2015
91e00f3
unbreak openbsd after nacl intergration
semarie Feb 25, 2015
9692f3b
Rollup merge of #22635 - kmcallister:macros-chapter, r=steveklabnik
Manishearth Feb 25, 2015
24fc50d
Rollup merge of #22783 - alexcrichton:deprecate-taskpool, r=alexcrichton
Manishearth Feb 25, 2015
267c587
Rollup merge of #22784 - rnestler:fix_doc_faq, r=dotdash
Manishearth Feb 25, 2015
3a49c3b
Rollup merge of #22785 - nikomatsakis:issue-21750-normalization-with-…
Manishearth Feb 25, 2015
1c97ac3
Rollup merge of #22792 - semarie:openbsd-unbreak-nacl, r=alexcrichton
Manishearth Feb 25, 2015
c950ee9
Rollup merge of #22157 - tbu-:pr_debug_collections, r=alexcrichton
Manishearth Feb 25, 2015
7b7cf84
Rollup merge of #22596 - alexcrichton:fix-some-impls, r=huonw
Manishearth Feb 25, 2015
b18584c
Rollup merge of #22727 - alexcrichton:prep-env, r=aturon
Manishearth Feb 25, 2015
6c6f231
Rollup merge of #22729 - alexcrichton:ptr-stabilization, r=aturon
Manishearth Feb 25, 2015
ecaf74a
Rollup merge of #22742 - alexcrichton:issue-22737, r=aturon
Manishearth Feb 25, 2015
1f2b3eb
Rollup merge of #22744 - alexcrichton:issue-22738, r=aturon
Manishearth Feb 25, 2015
f164254
Rollup merge of #22787 - pnkfelix:reenable-gate-for-unsafe_no_drop_fl…
Manishearth Feb 25, 2015
f8e4fcb
allow(deprecated) for TaskPool (fixup #22783)
Manishearth Feb 25, 2015
9f8a1cb
Use os::getcwd instead of env in rustbook (fixup #22727)
Manishearth Feb 25, 2015
e61a790
Fix type inference error (fixup #22739)
Manishearth Feb 25, 2015
2470fa1
Assert is internal now (fixup #22739)
Manishearth Feb 25, 2015
d54ed56
path -> PathBuf for osx/dragonfly (fixup #22727)
Manishearth Feb 25, 2015
357b41b
Path -> PathBuf for Windows test (fixup #22727)
Manishearth Feb 25, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Mention try macro in error chapter
Fixes #22342
  • Loading branch information
steveklabnik committed Feb 24, 2015
commit f31ea22bffa025b53cf6d26bbf8c48030de13183
72 changes: 72 additions & 0 deletions src/doc/trpl/error-handling.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,78 @@ let input = io::stdin().read_line()
.ok()
.expect("Failed to read line");
```

`ok()` converts the `IoResult` into an `Option`, and `expect()` does the same
thing as `unwrap()`, but takes a message. This message is passed along to the
underlying `panic!`, providing a better error message if the code errors.

# Using `try!`

When writing code that calls many functions that return the `Result` type, the
error handling can be tedious. The `try!` macro hides some of the boilerplate
of propagating errors up the call stack.

It replaces this:

```rust
use std::fs::File;
use std::io;
use std::io::prelude::*;

struct Info {
name: String,
age: i32,
rating: i32,
}

fn write_info(info: &Info) -> io::Result<()> {
let mut file = File::open("my_best_friends.txt").unwrap();

if let Err(e) = writeln!(&mut file, "name: {}", info.name) {
return Err(e)
}
if let Err(e) = writeln!(&mut file, "age: {}", info.age) {
return Err(e)
}
if let Err(e) = writeln!(&mut file, "rating: {}", info.rating) {
return Err(e)
}

return Ok(());
}
```

With this:

```rust
use std::fs::File;
use std::io;
use std::io::prelude::*;

struct Info {
name: String,
age: i32,
rating: i32,
}

fn write_info(info: &Info) -> io::Result<()> {
let mut file = try!(File::open("my_best_friends.txt"));

try!(writeln!(&mut file, "name: {}", info.name));
try!(writeln!(&mut file, "age: {}", info.age));
try!(writeln!(&mut file, "rating: {}", info.rating));

return Ok(());
}
```

Wrapping an expression in `try!` will result in the unwrapped success (`Ok`)
value, unless the result is `Err`, in which case `Err` is returned early from
the enclosing function.

It's worth noting that you can only use `try!` from a function that returns a
`Result`, which means that you cannot use `try!` inside of `main()`, because
`main()` doesn't return anything.

`try!` makes use of [`FromError`](../std/error/#the-fromerror-trait) to determine
what to return in the error case.