Fix build

michaelwu · Jan 23, 2015 · 4c1d2f1 · 4c1d2f1
1 parent 91e8aa6
commit 4c1d2f1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/src/bin/bindgen.rs b/src/bin/bindgen.rs
@@ -155,7 +155,6 @@ Options:
     io::stdio::print(s.as_slice());
 }
 
-#[main]
 pub fn main() {
     let mut bind_args = os::args();
     let bin = bind_args.remove(0);

diff --git a/src/clang.rs b/src/clang.rs
@@ -276,7 +276,7 @@ impl SourceLocation {
     }
 }
 
-impl fmt::String for SourceLocation {
+impl fmt::Display for SourceLocation {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let (file, line, col, _) = self.location();
         match file.is_null() {
@@ -317,7 +317,7 @@ pub struct String_ {
     x: CXString
 }
 
-impl fmt::String for String_ {
+impl fmt::Display for String_ {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if self.x.data.is_null() {
             return "".fmt(f);

diff --git a/src/gen.rs b/src/gen.rs
@@ -295,7 +295,6 @@ fn mk_extern(ctx: &mut GenCtx, links: &[(String, LinkType)],
     items.extend(foreign_items.into_iter());
     let ext = ast::ItemForeignMod(ast::ForeignMod {
         abi: abi,
-        view_items: Vec::new(),
         items: items
     });
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -93,7 +93,6 @@ impl Bindings
 
         let module = ast::Mod {
             inner: span,
-            view_items: Vec::new(),
             items: gen::gen_mod(options.links.as_slice(), globals, span)
         };
 

diff --git a/src/types.rs b/src/types.rs
@@ -54,7 +54,7 @@ impl Global {
     }
 }
 
-impl fmt::Show for Global {
+impl fmt::Debug for Global {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
             GType(ref ti) => ti.borrow().fmt(f),
@@ -193,7 +193,7 @@ impl CompInfo {
     }
 }
 
-impl fmt::Show for CompInfo {
+impl fmt::Debug for CompInfo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.name.fmt(f)
     }
@@ -235,7 +235,7 @@ impl EnumInfo {
     }
 }
 
-impl fmt::Show for EnumInfo {
+impl fmt::Debug for EnumInfo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.name.fmt(f)
     }
@@ -271,7 +271,7 @@ impl TypeInfo {
     }
 }
 
-impl fmt::Show for TypeInfo {
+impl fmt::Debug for TypeInfo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.name.fmt(f)
     }
@@ -294,7 +294,7 @@ impl VarInfo {
     }
 }
 
-impl fmt::Show for VarInfo {
+impl fmt::Debug for VarInfo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.name.fmt(f)
     }