Merge pull request #1 from mcoffin/extend-335_removal-of-getident

ioreg: Fix type mismatches
hackndev · Jul 31, 2015 · f64ad8e · f64ad8e
2 parents f1ff3b9 + 9b9901d
commit f64ad8e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/ioreg/src/builder/accessors.rs b/ioreg/src/builder/accessors.rs
@@ -18,7 +18,6 @@ use syntax::ptr::P;
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::build::AstBuilder;
 use syntax::ext::quote::rt::ToTokens;
-use syntax::parse::token;
 
 use super::Builder;
 use super::utils;

diff --git a/ioreg/src/builder/getter.rs b/ioreg/src/builder/getter.rs
@@ -22,7 +22,6 @@ use syntax::ext::base::ExtCtxt;
 use syntax::codemap::{respan, Span};
 use syntax::ext::build::AstBuilder;
 use syntax::ext::quote::rt::ToTokens;
-use syntax::parse::token;
 
 use super::Builder;
 use super::super::node;
@@ -75,8 +74,8 @@ fn build_type(cx: &ExtCtxt, path: &Vec<String>,
     .expect("Unexpected non-primitive register");
   let name = utils::getter_name(cx, path);
   let reg_doc = match reg.docstring {
-    Some(d) => d.node.name.as_str(),
-    None => "no documentation".to_string(),
+    Some(d) => String::from(d.node.name.as_str().deref()),
+    None => String::from("no documentation"),
   };
   let docstring = format!("`{}`: {}", reg.name.node, reg_doc);
   let doc_attr = utils::doc_attribute(cx, utils::intern_string(cx, docstring));

diff --git a/ioreg/src/builder/register.rs b/ioreg/src/builder/register.rs
@@ -23,7 +23,6 @@ use syntax::codemap::{respan, mk_sp};
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::build::AstBuilder;
 use syntax::ext::quote::rt::ToTokens;
-use syntax::parse::token;
 
 use super::Builder;
 use super::utils;

diff --git a/ioreg/src/builder/setter.rs b/ioreg/src/builder/setter.rs
@@ -21,7 +21,6 @@ use syntax::ptr::P;
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::build::AstBuilder;
 use syntax::ext::quote::rt::ToTokens;
-use syntax::parse::token;
 
 use super::Builder;
 use super::super::node;

diff --git a/ioreg/src/builder/union.rs b/ioreg/src/builder/union.rs
@@ -21,7 +21,6 @@ use syntax::ast_util::empty_generics;
 use syntax::codemap::{DUMMY_SP, dummy_spanned, respan, Spanned};
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::build::AstBuilder;
-use syntax::parse::token;
 
 use node;
 use super::Builder;