Move Cursor and TokenBuffer into buffer module
diff --git a/tests/common/parse.rs b/tests/common/parse.rs
index dfce4c9..2135c58 100644
--- a/tests/common/parse.rs
+++ b/tests/common/parse.rs
@@ -19,7 +19,8 @@
 
 use std::panic;
 
-use self::syn::synom::{Synom, SynomBuffer};
+use self::syn::buffer::TokenBuffer;
+use self::syn::synom::Synom;
 
 pub fn libsyntax_expr(input: &str) -> Option<P<ast::Expr>> {
     match panic::catch_unwind(|| {
@@ -58,7 +59,7 @@
 }
 
 pub fn syn<T: Synom>(tokens: proc_macro2::TokenStream) -> T {
-    let buf = SynomBuffer::new(tokens);
+    let buf = TokenBuffer::new(tokens);
     let result = T::parse(buf.begin());
     match result {
         Ok((t, rest)) => {
diff --git a/tests/test_meta_item.rs b/tests/test_meta_item.rs
index 3ad0128..283ef22 100644
--- a/tests/test_meta_item.rs
+++ b/tests/test_meta_item.rs
@@ -12,7 +12,7 @@
 extern crate syn;
 
 use syn::*;
-use syn::synom::SynomBuffer;
+use syn::buffer::TokenBuffer;
 use proc_macro2::{Literal, TokenStream};
 
 #[macro_use]
@@ -122,7 +122,7 @@
 
 fn run_test<T: Into<MetaItem>>(input: &str, expected: T) {
     let tokens = input.parse::<TokenStream>().unwrap();
-    let buf = SynomBuffer::new(tokens);
+    let buf = TokenBuffer::new(tokens);
     let attr = match Attribute::parse_outer(buf.begin()) {
         Ok((e, rest)) => {
             assert!(rest.eof());