Skip to content

Rollup of 9 pull requests #38450

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

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9976f5f
Add missing doc examples for SocketAddr struct
GuillaumeGomez Dec 8, 2016
7fe17f9
Add doc examples for UnixStream
GuillaumeGomez Dec 8, 2016
c35b9f6
Add UnixListener doc examples
GuillaumeGomez Dec 8, 2016
a78a33c
Add Incoming doc examples
GuillaumeGomez Dec 8, 2016
8323185
minor fix about visibility in reference
liigo Dec 7, 2016
e095c71
Associated items and variants inherit visibility from their traits an…
liigo Dec 13, 2016
16d4b7b
doc: Explain meaning of Result iters and link to factory functions.
sourcefrog Dec 3, 2016
60fbe7a
Add missing Duration examples
GuillaumeGomez Dec 13, 2016
8cd3081
rustdoc: a formatting nit
tshepang Dec 15, 2016
2938e6a
Add missing doc examples for UnixDatagram
GuillaumeGomez Dec 8, 2016
0971cb1
Document platform-specific differences for `std::process::exit`.
frewsxcv Dec 15, 2016
d409fc3
Rewrite, improve documentation for `core::hash::BuildHasherDefault`.
frewsxcv Dec 13, 2016
ca37604
tidy features: use 2-parameter form of internal try macro for open err
zackmdavis Dec 17, 2016
1e7bc90
stage0.txt: typo fix
est31 Dec 18, 2016
5f3b2c7
Rollup merge of #38158 - sourcefrog:doc-iter, r=GuillaumeGomez
GuillaumeGomez Dec 18, 2016
d808ae1
Rollup merge of #38215 - liigo:patch-12, r=petrochenkov
GuillaumeGomez Dec 18, 2016
1b90f83
Rollup merge of #38236 - GuillaumeGomez:unix_socket_doc, r=frewsxcv
GuillaumeGomez Dec 18, 2016
ca8f287
Rollup merge of #38334 - frewsxcv:BuildHasherDefault, r=GuillaumeGomez
GuillaumeGomez Dec 18, 2016
6f1a3c0
Rollup merge of #38346 - GuillaumeGomez:duration_doc, r=frewsxcv
GuillaumeGomez Dec 18, 2016
1fbcb3e
Rollup merge of #38395 - tshepang:nit, r=steveklabnik
GuillaumeGomez Dec 18, 2016
fdc9150
Rollup merge of #38397 - frewsxcv:platform-specific-process-exit, r=a…
GuillaumeGomez Dec 18, 2016
dae4eaa
Rollup merge of #38422 - zackmdavis:enjoy_tidy_path_error_macro_nicet…
GuillaumeGomez Dec 18, 2016
3e02adc
Rollup merge of #38445 - est31:master, r=apasel422
GuillaumeGomez Dec 18, 2016
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
tidy features: use 2-parameter form of internal try macro for open err
This tiny patch merely applies @bluss's suggestion for how to get a more
informative error message when the feature check can't open a file, a
matter that had briefly annoyed the present author, leading to the
filing of #38417.
  • Loading branch information
zackmdavis committed Dec 17, 2016
commit ca376049ca8204fa51c36dc7d4bf4991e972660c
2 changes: 1 addition & 1 deletion src/tools/tidy/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn check(path: &Path, bad: &mut bool) {
}

contents.truncate(0);
t!(t!(File::open(file)).read_to_string(&mut contents));
t!(t!(File::open(&file), &file).read_to_string(&mut contents));

for (i, line) in contents.lines().enumerate() {
let mut err = |msg: &str| {
Expand Down