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

Handle symlinks to directories #6817

Merged
merged 10 commits into from
Jul 31, 2019
Prev Previous commit
Next Next commit
Fix doctests that used ignore to hide code that didn't compile.
  • Loading branch information
thomwiggers committed Jul 30, 2019
commit ca176eed6a1380c6b4b704fd1753f20d7603f895
2 changes: 1 addition & 1 deletion src/cargo/core/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
//! 3. To actually perform the feature gate, you'll want to have code that looks
//! like:
//!
//! ```rust,ignore
//! ```rust,compile_fail
//! use core::{Feature, Features};
//!
//! let feature = Feature::launch_into_space();
Expand Down
9 changes: 6 additions & 3 deletions src/cargo/util/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ fn maybe_spurious(err: &Error) -> bool {
///
/// # Examples
///
/// ```ignore
/// use util::network;
/// cargo_result = network::with_retry(&config, || something.download());
/// ```
/// # use crate::cargo::util::{CargoResult, Config};
/// # let download_something = || return Ok(());
/// # let config = Config::default().unwrap();
/// use cargo::util::network;
/// let cargo_result = network::with_retry(&config, || download_something());
/// ```
pub fn with_retry<T, F>(config: &Config, mut callback: F) -> CargoResult<T>
where
Expand Down