move base.rs into api.rs

No real change here, just consolidating files because I keep clicking on
the wrong one. :-)

src/select/api.rs

@@ -1,6 +1,5 @@
 use crate::parse_common::Position;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
 use crate::select::sel_block_quote::BlockQuoteSelector;
 use crate::select::sel_code_block::CodeBlockSelector;
 use crate::select::sel_html::HtmlSelector;
@@ -18,6 +17,18 @@ pub type ParseResult<T> = Result<T, ParseErrorReason>;
 
 pub const SELECTOR_SEPARATOR: char = '|';
 
+pub trait Selector<'a, I: Copy + Into<MdElemRef<'a>>> {
+    fn matches(&self, item: I) -> bool;
+
+    fn try_select(&self, item: I) -> Option<MdElemRef<'a>> {
+        if self.matches(item) {
+            Some(item.into())
+        } else {
+            None
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub struct ParseError {
     pub position: Position,

src/select/mod.rs

@@ -1,5 +1,4 @@
 mod api;
-mod base;
 mod sel_block_quote;
 mod sel_code_block;
 mod sel_html;

src/select/sel_block_quote.rs

@@ -1,7 +1,6 @@
 use crate::matcher::StringMatcher;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::{ParseResult, SELECTOR_SEPARATOR};
+use crate::select::{ParseResult, Selector, SELECTOR_SEPARATOR};
 use crate::tree::BlockQuote;
 
 #[derive(Debug, PartialEq)]

src/select/sel_code_block.rs

@@ -1,7 +1,6 @@
 use crate::matcher::{CharEnd, StringMatcher};
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::{ParseResult, SELECTOR_SEPARATOR};
+use crate::select::{ParseResult, Selector, SELECTOR_SEPARATOR};
 use crate::tree::{CodeBlock, CodeVariant};
 
 #[derive(Debug, PartialEq)]

src/select/sel_html.rs

@@ -1,7 +1,6 @@
 use crate::matcher::StringMatcher;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::{ParseResult, SELECTOR_SEPARATOR};
+use crate::select::{ParseResult, Selector, SELECTOR_SEPARATOR};
 use crate::tree_ref::HtmlRef;
 
 #[derive(Debug, PartialEq)]

src/select/sel_image.rs

@@ -1,7 +1,6 @@
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
 use crate::select::sel_link::LinkMatchers;
-use crate::select::ParseResult;
+use crate::select::{ParseResult, Selector};
 use crate::tree::Image;
 
 #[derive(Debug, PartialEq)]

src/select/sel_link.rs

@@ -1,7 +1,6 @@
 use crate::matcher::StringMatcher;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::ParseResult;
+use crate::select::{ParseResult, Selector};
 use crate::tree::Link;
 
 #[derive(Debug, PartialEq)]

src/select/sel_list_item.rs

@@ -1,7 +1,6 @@
 use crate::matcher::StringMatcher;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::{ParseErrorReason, ParseResult, SELECTOR_SEPARATOR};
+use crate::select::{ParseErrorReason, ParseResult, Selector, SELECTOR_SEPARATOR};
 use crate::tree_ref::ListItemRef;
 
 #[derive(Debug, PartialEq)]

src/select/sel_paragraph.rs

@@ -1,7 +1,6 @@
 use crate::matcher::StringMatcher;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::{ParseResult, SELECTOR_SEPARATOR};
+use crate::select::{ParseResult, Selector, SELECTOR_SEPARATOR};
 use crate::tree::Paragraph;
 
 #[derive(Debug, PartialEq)]

src/select/sel_section.rs

@@ -1,7 +1,6 @@
 use crate::matcher::StringMatcher;
 use crate::parsing_iter::ParsingIterator;
-use crate::select::base::Selector;
-use crate::select::{ParseResult, SELECTOR_SEPARATOR};
+use crate::select::{ParseResult, Selector, SELECTOR_SEPARATOR};
 use crate::tree::Section;
 
 #[derive(Debug, PartialEq)]