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

env: remove unwrap in examples in favor of try op #50736

Merged
merged 1 commit into from
May 17, 2018
Merged

env: remove unwrap in examples in favor of try op #50736

merged 1 commit into from
May 17, 2018

Conversation

udoprog
Copy link
Contributor

@udoprog udoprog commented May 14, 2018

No description provided.

@rust-highfive
Copy link
Collaborator

r? @shepmaster

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 14, 2018
@shepmaster
Copy link
Member

shepmaster commented May 15, 2018

I think I'm generally in favor of this, but I'm hesitant to accept it as-is because doctests will be getting the ability to use ? as well. Exposing the main here is thus annoying visual churn.

I could see if we used the # to hide the main:

+/// # fn main() -> std::io::Result<()> {
+/// let path = env::current_dir()?;
+/// println!("The current directory is {}", path.display());
+/// # Ok(())
+/// # }

But I wonder if hiding the Ok is too much.

@udoprog
Copy link
Contributor Author

udoprog commented May 15, 2018

@shepmaster this is only documentation, we can patch it again when try-op is available for doctests.

This change puts it in line with other similar doctests (e.g. https://doc.rust-lang.org/std/io/trait.Read.html) which will also have to be patched later.

@shepmaster
Copy link
Member

Ah, alright then.

@bors r+

@bors
Copy link
Contributor

bors commented May 16, 2018

📌 Commit f73c4a4 has been approved by shepmaster

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 16, 2018
@shepmaster
Copy link
Member

@bors rollup

@shepmaster
Copy link
Member

Thanks!

kennytm added a commit to kennytm/rust that referenced this pull request May 16, 2018
env: remove unwrap in examples in favor of try op
bors added a commit that referenced this pull request May 17, 2018
Rollup of 17 pull requests

Successful merges:

 - #50170 (Implement From for more types on Cow)
 - #50638 (Don't unconditionally set CLOEXEC twice on every fd we open on Linux)
 - #50656 (Fix `fn main() -> impl Trait` for non-`Termination` trait)
 - #50669 (rustdoc: deprecate `#![doc(passes, plugins, no_default_passes)]`)
 - #50726 (read2: Use inner function instead of closure)
 - #50728 (Fix rustdoc panic with `impl Trait` in type parameters)
 - #50736 (env: remove unwrap in examples in favor of try op)
 - #50740 (Remove LazyBTreeMap.)
 - #50752 (Add missing error codes in libsyntax-ext asm)
 - #50779 (Make mutable_noalias and arg_align_attributes be tracked)
 - #50787 (Fix run-make wasm tests)
 - #50788 (Fix an ICE when casting a nonexistent const)
 - #50789 (Ensure libraries built in stage0 have unique metadata)
 - #50793 (tidy: Add a check for empty UI test files)
 - #50797 (fix a typo in signed-integer::from_str_radix())
 - #50808 (Stabilize num::NonZeroU*)
 - #50809 (GitHub: Stop treating Cargo.lock as a generated file.)

Failed merges:
@bors bors merged commit f73c4a4 into rust-lang:master May 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants