fix build on master rust

5 files changed, 58 insertions, 58 deletions

diff --git a/src/clang.rs b/src/clang.rs
index 8d1b58bf..547de2e6 100644
--- a/src/clang.rs
+++ b/src/clang.rs
@@ -11,7 +11,7 @@ pub use clangll as ll;
 use clangll::*;
 
 // Cursor
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct Cursor {
     x: CXCursor
 }
diff --git a/src/clangll.rs b/src/clangll.rs
index af8167dd..7c478b67 100644
--- a/src/clangll.rs
+++ b/src/clangll.rs
@@ -11,7 +11,7 @@ pub type ptrdiff_t = ::libc::c_long;
 pub type size_t = ::libc::c_ulong;
 pub type wchar_t = ::libc::c_int;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXString {
     pub data: *const ::libc::c_void,
     pub private_flags: ::libc::c_uint,
@@ -21,7 +21,7 @@ pub enum Struct_CXTranslationUnitImpl { }
 pub type CXTranslationUnit = *mut Struct_CXTranslationUnitImpl;
 pub type CXClientData = *mut ::libc::c_void;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct Struct_CXUnsavedFile {
     pub Filename: *const ::libc::c_char,
     pub Contents: *const ::libc::c_char,
@@ -33,7 +33,7 @@ pub const CXAvailability_Deprecated: ::libc::c_uint = 1;
 pub const CXAvailability_NotAvailable: ::libc::c_uint = 2;
 pub const CXAvailability_NotAccessible: ::libc::c_uint = 3;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct Struct_CXVersion {
     pub Major: ::libc::c_int,
     pub Minor: ::libc::c_int,
@@ -48,20 +48,20 @@ pub const CXGlobalOpt_ThreadBackgroundPriorityForEditing: ::libc::c_uint = 2;
 pub const CXGlobalOpt_ThreadBackgroundPriorityForAll: ::libc::c_uint = 3;
 pub type CXFile = *mut ::libc::c_void;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXFileUniqueID {
-    pub data: [::libc::c_ulonglong, ..3u],
+    pub data: [::libc::c_ulonglong; 3u],
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXSourceLocation {
-    pub ptr_data: [*const ::libc::c_void, ..2u],
+    pub ptr_data: [*const ::libc::c_void; 2u],
     pub int_data: ::libc::c_uint,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXSourceRange {
-    pub ptr_data: [*const ::libc::c_void, ..2u],
+    pub ptr_data: [*const ::libc::c_void; 2u],
     pub begin_int_data: ::libc::c_uint,
     pub end_int_data: ::libc::c_uint,
 }
@@ -132,14 +132,14 @@ pub const CXTUResourceUsage_MEMORY_IN_BYTES_END: ::libc::c_uint = 14;
 pub const CXTUResourceUsage_First: ::libc::c_uint = 1;
 pub const CXTUResourceUsage_Last: ::libc::c_uint = 14;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct Struct_CXTUResourceUsageEntry {
     pub kind: Enum_CXTUResourceUsageKind,
     pub amount: ::libc::c_ulong,
 }
 pub type CXTUResourceUsageEntry = Struct_CXTUResourceUsageEntry;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct Struct_CXTUResourceUsage {
     pub data: *mut ::libc::c_void,
     pub numEntries: ::libc::c_uint,
@@ -315,14 +315,14 @@ pub const CXCursor_ModuleImportDecl: ::libc::c_uint = 600;
 pub const CXCursor_FirstExtraDecl: ::libc::c_uint = 600;
 pub const CXCursor_LastExtraDecl: ::libc::c_uint = 600;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXCursor {
     pub kind: Enum_CXCursorKind,
     pub xdata: ::libc::c_int,
-    pub data: [*const ::libc::c_void, ..3u],
+    pub data: [*const ::libc::c_void; 3u],
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXComment {
     pub ASTNode: *const ::libc::c_void,
     pub TranslationUnit: CXTranslationUnit,
@@ -334,7 +334,7 @@ pub const CXLinkage_Internal: ::libc::c_uint = 2;
 pub const CXLinkage_UniqueExternal: ::libc::c_uint = 3;
 pub const CXLinkage_External: ::libc::c_uint = 4;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct Struct_CXPlatformAvailability {
     pub Platform: CXString,
     pub Introduced: CXVersion,
@@ -418,10 +418,10 @@ pub const CXCallingConv_X86_64SysV: ::libc::c_uint = 11;
 pub const CXCallingConv_Invalid: ::libc::c_uint = 100;
 pub const CXCallingConv_Unexposed: ::libc::c_uint = 200;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXType {
     pub kind: Enum_CXTypeKind,
-    pub data: [*mut ::libc::c_void, ..2u],
+    pub data: [*mut ::libc::c_void; 2u],
 }
 pub type Enum_CXTypeLayoutError = ::libc::c_int;
 pub const CXTypeLayoutError_Invalid: ::libc::c_int = -1;
@@ -505,14 +505,14 @@ pub const CXToken_Literal: ::libc::c_uint = 3;
 pub const CXToken_Comment: ::libc::c_uint = 4;
 pub type CXTokenKind = Enum_CXTokenKind;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXToken {
-    pub int_data: [::libc::c_uint, ..4u],
+    pub int_data: [::libc::c_uint; 4u],
     pub ptr_data: *mut ::libc::c_void,
 }
 pub type CXCompletionString = *mut ::libc::c_void;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXCompletionResult {
     pub CursorKind: Enum_CXCursorKind,
     pub CompletionString: CXCompletionString,
@@ -540,7 +540,7 @@ pub const CXCompletionChunk_Equal: ::libc::c_uint = 18;
 pub const CXCompletionChunk_HorizontalSpace: ::libc::c_uint = 19;
 pub const CXCompletionChunk_VerticalSpace: ::libc::c_uint = 20;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXCodeCompleteResults {
     pub Results: *mut CXCompletionResult,
     pub NumResults: ::libc::c_uint,
@@ -583,7 +583,7 @@ pub type Enum_CXVisitorResult = ::libc::c_uint;
 pub const CXVisit_Break: ::libc::c_uint = 0;
 pub const CXVisit_Continue: ::libc::c_uint = 1;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXCursorAndRangeVisitor {
     pub context: *mut ::libc::c_void,
     pub visit: ::std::option::Option<extern "C" fn
@@ -600,13 +600,13 @@ pub type CXIdxClientEntity = *mut ::libc::c_void;
 pub type CXIdxClientContainer = *mut ::libc::c_void;
 pub type CXIdxClientASTFile = *mut ::libc::c_void;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxLoc {
-    pub ptr_data: [*mut ::libc::c_void, ..2u],
+    pub ptr_data: [*mut ::libc::c_void; 2u],
     pub int_data: ::libc::c_uint,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxIncludedFileInfo {
     pub hashLoc: CXIdxLoc,
     pub filename: *const ::libc::c_char,
@@ -616,7 +616,7 @@ pub struct CXIdxIncludedFileInfo {
     pub isModuleImport: ::libc::c_int,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxImportedASTFileInfo {
     pub file: CXFile,
     pub module: CXModule,
@@ -667,14 +667,14 @@ pub const CXIdxAttr_IBAction: ::libc::c_uint = 1;
 pub const CXIdxAttr_IBOutlet: ::libc::c_uint = 2;
 pub const CXIdxAttr_IBOutletCollection: ::libc::c_uint = 3;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxAttrInfo {
     pub kind: CXIdxAttrKind,
     pub cursor: CXCursor,
     pub loc: CXIdxLoc,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxEntityInfo {
     pub kind: CXIdxEntityKind,
     pub templateKind: CXIdxEntityCXXTemplateKind,
@@ -686,12 +686,12 @@ pub struct CXIdxEntityInfo {
     pub numAttributes: ::libc::c_uint,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxContainerInfo {
     pub cursor: CXCursor,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxIBOutletCollectionAttrInfo {
     pub attrInfo: *const CXIdxAttrInfo,
     pub objcClass: *const CXIdxEntityInfo,
@@ -701,7 +701,7 @@ pub struct CXIdxIBOutletCollectionAttrInfo {
 pub type CXIdxDeclInfoFlags = ::libc::c_uint;
 pub const CXIdxDeclFlag_Skipped: ::libc::c_uint = 1;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxDeclInfo {
     pub entityInfo: *const CXIdxEntityInfo,
     pub cursor: CXCursor,
@@ -722,40 +722,40 @@ pub const CXIdxObjCContainer_ForwardRef: ::libc::c_uint = 0;
 pub const CXIdxObjCContainer_Interface: ::libc::c_uint = 1;
 pub const CXIdxObjCContainer_Implementation: ::libc::c_uint = 2;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxObjCContainerDeclInfo {
     pub declInfo: *const CXIdxDeclInfo,
     pub kind: CXIdxObjCContainerKind,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxBaseClassInfo {
     pub base: *const CXIdxEntityInfo,
     pub cursor: CXCursor,
     pub loc: CXIdxLoc,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxObjCProtocolRefInfo {
     pub protocol: *const CXIdxEntityInfo,
     pub cursor: CXCursor,
     pub loc: CXIdxLoc,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxObjCProtocolRefListInfo {
     pub protocols: *const *const CXIdxObjCProtocolRefInfo,
     pub numProtocols: ::libc::c_uint,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxObjCInterfaceDeclInfo {
     pub containerInfo: *const CXIdxObjCContainerDeclInfo,
     pub superInfo: *const CXIdxBaseClassInfo,
     pub protocols: *const CXIdxObjCProtocolRefListInfo,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxObjCCategoryDeclInfo {
     pub containerInfo: *const CXIdxObjCContainerDeclInfo,
     pub objcClass: *const CXIdxEntityInfo,
@@ -764,14 +764,14 @@ pub struct CXIdxObjCCategoryDeclInfo {
     pub protocols: *const CXIdxObjCProtocolRefListInfo,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxObjCPropertyDeclInfo {
     pub declInfo: *const CXIdxDeclInfo,
     pub getter: *const CXIdxEntityInfo,
     pub setter: *const CXIdxEntityInfo,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxCXXClassDeclInfo {
     pub declInfo: *const CXIdxDeclInfo,
     pub bases: *const *const CXIdxBaseClassInfo,
@@ -781,7 +781,7 @@ pub type CXIdxEntityRefKind = ::libc::c_uint;
 pub const CXIdxEntityRef_Direct: ::libc::c_uint = 1;
 pub const CXIdxEntityRef_Implicit: ::libc::c_uint = 2;
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct CXIdxEntityRefInfo {
     pub kind: CXIdxEntityRefKind,
     pub cursor: CXCursor,
@@ -791,7 +791,7 @@ pub struct CXIdxEntityRefInfo {
     pub container: *const CXIdxContainerInfo,
 }
 #[repr(C)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub struct IndexerCallbacks {
     pub abortQuery: ::std::option::Option<extern "C" fn
                                               (arg1: CXClientData,
diff --git a/src/lib.rs b/src/lib.rs
index 4c8ed045..04ab19f0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,7 +58,7 @@ impl Default for BindgenOptions {
     }
 }
 
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum LinkType {
     Default,
     Static,
diff --git a/src/macro.rs b/src/macro.rs
index 0a2425c2..d4bc58b4 100644
--- a/src/macro.rs
+++ b/src/macro.rs
@@ -205,7 +205,7 @@ fn as_str<'a>(owned: &'a Option<String>) -> Option<&'a str> {
     }
 }
 
-#[deriving(PartialEq, Eq)]
+#[derive(PartialEq, Eq)]
 enum QuoteState {
     InNone,
     InSingleQuotes,
diff --git a/src/types.rs b/src/types.rs
index c80333d9..4addf0a3 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -9,7 +9,7 @@ pub use self::Type::*;
 pub use self::IKind::*;
 pub use self::FKind::*;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub enum Global {
     GType(Rc<RefCell<TypeInfo>>),
     GComp(Rc<RefCell<CompInfo>>),
@@ -69,7 +69,7 @@ impl fmt::Show for Global {
     }
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct FuncSig {
     pub ret_ty: Box<Type>,
     pub args: Vec<(String, Type)>,
@@ -77,7 +77,7 @@ pub struct FuncSig {
     pub abi: abi::Abi,
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub enum Type {
     TVoid,
     TInt(IKind, Layout),
@@ -124,7 +124,7 @@ impl Type {
     }
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub struct Layout {
     pub size: uint,
     pub align: uint,
@@ -140,7 +140,7 @@ impl Layout {
     }
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum IKind {
     IBool,
     ISChar,
@@ -155,26 +155,26 @@ pub enum IKind {
     IULongLong
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum FKind {
     FFloat,
     FDouble
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub enum CompMember {
     Field(FieldInfo),
     Comp(Rc<RefCell<CompInfo>>),
     CompField(Rc<RefCell<CompInfo>>, FieldInfo),
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum CompKind {
     Struct,
     Union,
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct CompInfo {
     pub kind: CompKind,
     pub name: String,
@@ -199,7 +199,7 @@ impl fmt::Show for CompInfo {
     }
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct FieldInfo {
     pub name: String,
     pub ty: Type,
@@ -216,7 +216,7 @@ impl FieldInfo {
     }
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct EnumInfo {
     pub name: String,
     pub items: Vec<EnumItem>,
@@ -241,7 +241,7 @@ impl fmt::Show for EnumInfo {
     }
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct EnumItem {
     pub name: String,
     pub val: i64
@@ -256,7 +256,7 @@ impl EnumItem {
     }
 }
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct TypeInfo {
     pub name: String,
     pub ty: Type
@@ -277,7 +277,7 @@ impl fmt::Show for TypeInfo {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct VarInfo {
     pub name: String,
     pub ty: Type,