Cleanup

- Revert unused changes
- Remove unused lifetime parameter
- Don't needless repeat full path

Author: jyn514

src/clang.rs

@@ -6,7 +6,6 @@
 
 use crate::ir::context::BindgenContext;
 use clang_sys::*;
-use regex;
 use std::ffi::{CStr, CString};
 use std::fmt;
 use std::hash::Hash;
@@ -696,7 +695,7 @@ impl Cursor {
     }
 
     /// Gets the tokens that correspond to that cursor as `rcc` tokens.
-    pub fn rcc_tokens<'a>(self) -> Vec<rcc::Locatable<rcc::Token>> {
+    pub fn rcc_tokens(self) -> Vec<rcc::Locatable<rcc::Token>> {
         use rcc::{Literal, Token, Files, Lexer};
 
         self.tokens()
@@ -803,7 +802,6 @@ impl<'a> Drop for RawTokens<'a> {
 /// string.
 #[derive(Debug)]
 pub struct ClangToken {
-    raw: CXToken,
     spelling: CXString,
     /// The kind of token, this is the same as the relevant member from
     /// `CXToken`.
@@ -836,20 +834,11 @@ impl<'a> Iterator for ClangTokenIterator<'a> {
     type Item = ClangToken;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let raw = *self.raw.next()?;
+        let raw = self.raw.next()?;
         unsafe {
-            let kind = clang_getTokenKind(raw);
-            let spelling = clang_getTokenSpelling(self.tu, raw);
-            Some(ClangToken { raw, kind, spelling })
-        }
-    }
-}
-
-impl ClangTokenIterator<'_> {
-    /// Get the location of a token (prior to macro expansion)
-    pub fn span(&self, raw: CXToken) -> CXSourceRange {
-        unsafe {
-            clang_getTokenExtent(self.tu, raw)
+            let kind = clang_getTokenKind(*raw);
+            let spelling = clang_getTokenSpelling(self.tu, *raw);
+            Some(ClangToken { kind, spelling })
         }
     }
 }

src/ir/context.rs

@@ -352,7 +352,7 @@ pub struct BindgenContext {
     /// expression parsing.
     ///
     /// This needs to be an std::HashMap because the rcc API requires it.
-    parsed_macros: StdHashMap<rcc::InternedStr, rcc::Definition>,
+    parsed_macros: StdHashMap<InternedStr, rcc::Definition>,
 
     /// The active replacements collected from replaces="xxx" annotations.
     replacements: HashMap<Vec<String>, ItemId>,