Use underlying symbol whenever we string-ify DefPathData

Converting an `Ident` to a string will cause us to try to guess if the
identifier is 'raw', potentially inserting a 'r#' prefix. However, all
of the existing code that string-ifys `DefPathData` is expecting to be
working with a `Symbol`, which never has a `r#` suffix.

This was causing Rustdoc to generate links containing `r#` for
structs/traits with raw identifiers (e.g. `r#struct`), leading to broken
links when the actual html files were generated without the `r#` suffix.

Author: Aaron1011

src/librustc/hir/map/definitions.rs

@@ -211,7 +211,7 @@ impl DefPath {
         let mut s = String::with_capacity(self.data.len() * 16);
 
         for component in &self.data {
-            write!(s, "::{}[{}]", component.data.as_ident(), component.disambiguator).unwrap();
+            write!(s, "::{}[{}]", component.data.as_ident().name, component.disambiguator).unwrap();
         }
 
         s
@@ -230,9 +230,10 @@ impl DefPath {
 
         for component in &self.data {
             if component.disambiguator == 0 {
-                write!(s, "::{}", component.data.as_ident()).unwrap();
+                write!(s, "::{}", component.data.as_ident().name).unwrap();
             } else {
-                write!(s, "{}[{}]", component.data.as_ident(), component.disambiguator).unwrap();
+                write!(s, "{}[{}]", component.data.as_ident().name, component.disambiguator)
+                    .unwrap();
             }
         }
 
@@ -250,9 +251,10 @@ impl DefPath {
             opt_delimiter.map(|d| s.push(d));
             opt_delimiter = Some('-');
             if component.disambiguator == 0 {
-                write!(s, "{}", component.data.as_ident()).unwrap();
+                write!(s, "{}", component.data.as_ident().name).unwrap();
             } else {
-                write!(s, "{}[{}]", component.data.as_ident(), component.disambiguator).unwrap();
+                write!(s, "{}[{}]", component.data.as_ident().name, component.disambiguator)
+                    .unwrap();
             }
         }
         s
@@ -568,6 +570,6 @@ impl DefPathData {
     }
 
     pub fn to_string(&self) -> String {
-        self.as_ident().to_string()
+        self.as_ident().name.to_string()
     }
 }

src/librustc/ty/print/obsolete.rs

@@ -186,9 +186,9 @@ impl DefPathBasedNames<'tcx> {
         // foo::bar::ItemName::
         for part in self.tcx.def_path(def_id).data {
             if self.omit_disambiguators {
-                write!(output, "{}::", part.data.as_ident()).unwrap();
+                write!(output, "{}::", part.data.as_ident().name).unwrap();
             } else {
-                write!(output, "{}[{}]::", part.data.as_ident(), part.disambiguator).unwrap();
+                write!(output, "{}[{}]::", part.data.as_ident().name, part.disambiguator).unwrap();
             }
         }
 

src/test/rustdoc/auxiliary/raw-foreign.rs

@@ -0,0 +1,6 @@
+pub mod r#try {
+    // @has raw_idents/try/struct.struct.html
+    pub struct r#struct;
+
+    pub trait r#trait {}
+}

src/test/rustdoc/raw_idents.rs

@@ -0,0 +1,14 @@
+// aux-build:raw-foreign.rs
+// build-aux-docs
+
+extern crate raw_foreign;
+
+// has 'raw_idents/trait.MyTrait.html' '//a[@href="../raw_foreign/try/trait.trait.html"]' 'trait'
+// has 'raw_idents/trait.MyTrait.html' '//a[@href="../raw_foreign/try/struct.struct.html"]' 'struct'
+pub trait MyTrait {
+    fn foo<T>() where T: raw_foreign::r#try::r#trait {}
+}
+
+impl MyTrait for raw_foreign::r#try::r#struct {
+    fn foo<T>() where T: raw_foreign::r#try::r#trait {}
+}