summaryrefslogtreecommitdiff
path: root/src/parse.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/parse.rs')
-rw-r--r--src/parse.rs26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/parse.rs b/src/parse.rs
index 0e4164f0..73bb7b25 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -49,7 +49,7 @@ pub trait ClangItemParser: Sized {
/// Parse this item from the given Clang type.
fn from_ty(ty: &clang::Type,
- location: Option<clang::Cursor>,
+ location: clang::Cursor,
parent: Option<ItemId>,
ctx: &mut BindgenContext)
-> Result<ItemId, ParseError>;
@@ -58,7 +58,7 @@ pub trait ClangItemParser: Sized {
/// newly parsed item.
fn from_ty_with_id(id: ItemId,
ty: &clang::Type,
- location: Option<clang::Cursor>,
+ location: clang::Cursor,
parent: Option<ItemId>,
ctx: &mut BindgenContext)
-> Result<ItemId, ParseError>;
@@ -66,7 +66,7 @@ pub trait ClangItemParser: Sized {
/// Parse this item from the given Clang type, or if we haven't resolved all
/// the other items this one depends on, an unresolved reference.
fn from_ty_or_ref(ty: clang::Type,
- location: Option<clang::Cursor>,
+ location: clang::Cursor,
parent_id: Option<ItemId>,
context: &mut BindgenContext)
-> ItemId;
@@ -75,26 +75,16 @@ pub trait ClangItemParser: Sized {
/// `ItemId` for the newly parsed item.
fn from_ty_or_ref_with_id(potential_id: ItemId,
ty: clang::Type,
- location: Option<clang::Cursor>,
+ location: clang::Cursor,
parent_id: Option<ItemId>,
context: &mut BindgenContext)
-> ItemId;
/// Create a named template type.
- fn named_type<S>(name: S,
- parent: ItemId,
- context: &mut BindgenContext)
- -> ItemId
- where S: Into<String>;
-
- /// Identical to `named_type`, but use `id` as the resulting item's
- /// `ItemId`.
- fn named_type_with_id<S>(id: ItemId,
- name: S,
- parent: ItemId,
- context: &mut BindgenContext)
- -> ItemId
- where S: Into<String>;
+ fn named_type(with_id: Option<ItemId>,
+ location: clang::Cursor,
+ ctx: &mut BindgenContext)
+ -> Option<ItemId>;
/// Create a builtin type.
fn builtin_type(kind: TypeKind,