use @ instead of space for link ambiguity markers

since spaces aren't allowed in link targets in commonmark, a new symbol
is needed to separate the marker from the rest of the path. hence, @

diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 5031dddfdf38fd0b9534d28856d5a4b55f76a93d..d4260c3dfb58cbd180d70fd88a45b4bb4d5d2657 100644 (file)
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -848,21 +848,21 @@ fn clean(&self, cx: &DocContext) -> Attributes {
                          "trait", "union"].iter()
                                           .find(|p| link.starts_with(**p)) {
                         kind = PathKind::Type;
-                        link.trim_left_matches(prefix).trim()
+                        link.trim_left_matches(prefix).trim_left_matches('@')
                     } else if let Some(prefix) =
                         ["const", "static"].iter()
                                            .find(|p| link.starts_with(**p)) {
                         kind = PathKind::Value;
-                        link.trim_left_matches(prefix).trim()
+                        link.trim_left_matches(prefix).trim_left_matches('@')
                     } else if link.ends_with("()") {
                         kind = PathKind::Value;
-                        link.trim_right_matches("()").trim()
+                        link.trim_right_matches("()")
                     } else if link.ends_with('!') {
                         kind = PathKind::Macro;
-                        link.trim_right_matches('!').trim()
+                        link.trim_right_matches('!')
                     } else {
-                        link.trim()
-                    };
+                        &link[..]
+                    }.trim();
 
                     // 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