From 9aa4e308594cbe8ad755f660c57e35b2638083ea Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 27 Dec 2017 07:56:38 -0800
Subject: [PATCH] Update to `syn` master

---
 .../stdarch/stdsimd-test/assert-instr-macro/Cargo.toml   | 1 -
 .../stdarch/stdsimd-test/assert-instr-macro/src/lib.rs   | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/library/stdarch/stdsimd-test/assert-instr-macro/Cargo.toml b/library/stdarch/stdsimd-test/assert-instr-macro/Cargo.toml
index 6f224d1f406e..26afcb4cc0ce 100644
--- a/library/stdarch/stdsimd-test/assert-instr-macro/Cargo.toml
+++ b/library/stdarch/stdsimd-test/assert-instr-macro/Cargo.toml
@@ -11,4 +11,3 @@ test = false
 proc-macro2 = { version = "0.1", features = ["unstable"] }
 quote = { git = 'https://github.com/dtolnay/quote' }
 syn = { git = 'https://github.com/dtolnay/syn', features = ["full"] }
-synom = { git = 'https://github.com/dtolnay/syn' }
diff --git a/library/stdarch/stdsimd-test/assert-instr-macro/src/lib.rs b/library/stdarch/stdsimd-test/assert-instr-macro/src/lib.rs
index e31aa4cf94b2..5dd70f679303 100644
--- a/library/stdarch/stdsimd-test/assert-instr-macro/src/lib.rs
+++ b/library/stdarch/stdsimd-test/assert-instr-macro/src/lib.rs
@@ -14,9 +14,8 @@ extern crate proc_macro2;
 extern crate proc_macro;
 #[macro_use]
 extern crate quote;
-extern crate syn;
 #[macro_use]
-extern crate synom;
+extern crate syn;
 
 use proc_macro2::TokenStream;
 
@@ -124,13 +123,13 @@ struct Invoc {
     args: Vec<(syn::Ident, syn::Expr)>,
 }
 
-impl synom::Synom for Invoc {
+impl syn::synom::Synom for Invoc {
     named!(parse -> Self, map!(parens!(do_parse!(
         instr: syn!(syn::Ident) >>
         args: many0!(do_parse!(
-            syn!(syn::tokens::Comma) >>
+            syn!(syn::token::Comma) >>
             name: syn!(syn::Ident) >>
-            syn!(syn::tokens::Eq) >>
+            syn!(syn::token::Eq) >>
             expr: syn!(syn::Expr) >>
             (name, expr)
         )) >>