diff options
| -rw-r--r-- | src/librustc_resolve/lib.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 07c940612b1..6b7ad839460 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -1440,7 +1440,8 @@ impl<'a> Resolver<'a> { /// isn't something that can be returned because it can't be made to live that long, /// and also it's a private type. Fortunately rustdoc doesn't need to know the error, /// just that an error occured. - pub fn resolve_str_path_error(&mut self, span: Span, path_str: &str, is_value: bool) -> Result<hir::Path, ()> { + pub fn resolve_str_path_error(&mut self, span: Span, path_str: &str, is_value: bool) + -> Result<hir::Path, ()> { use std::iter; let mut errored = false; diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index dcf12ed8180..59a797b55d0 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -834,8 +834,9 @@ impl Clean<Attributes> for [ast::Attribute] { let path = { let is_value; let path_str = if let Some(prefix) = - ["struct", "enum", "type", "trait", "union"].iter() - .find(|p| link.starts_with(**p)) { + ["struct", "enum", "type", + "trait", "union"].iter() + .find(|p| link.starts_with(**p)) { is_value = Some(false); link.trim_left_matches(prefix).trim() } else if let Some(prefix) = @@ -857,7 +858,8 @@ impl Clean<Attributes> for [ast::Attribute] { // avoid resolving things (i.e. regular links) which aren't like paths // FIXME(Manishearth) given that most links have slashes in them might be worth // doing a check for slashes first - if path_str.contains(|ch: char| !(ch.is_alphanumeric() || ch == ':' || ch == '_')) { + if path_str.contains(|ch: char| !(ch.is_alphanumeric() || + ch == ':' || ch == '_')) { continue; } @@ -867,7 +869,8 @@ impl Clean<Attributes> for [ast::Attribute] { if let Some(id) = cx.mod_ids.borrow().last() { cx.resolver.borrow_mut() .with_scope(*id, |resolver| { - resolver.resolve_str_path_error(DUMMY_SP, &path_str, is_val) + resolver.resolve_str_path_error(DUMMY_SP, + &path_str, is_val) }) } else { // FIXME(Manishearth) this branch doesn't seem to ever be hit, really |