Merge remote-tracking branch 'remotes/origin/master'

serde-deprecated · Sep 5, 2015 · b1b7277 · b1b7277
2 parents 04888ff + 96651c4
commit b1b7277
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ Syntex Code Generation Framework
 [![Latest Version](https://img.shields.io/crates/v/syntex.svg)](https://crates.io/crates/syntex)
 
 `syntex` is a library that enables compile time syntax extension expansion.
-This allows users to use libraries like [regex\_macros]() in a rust 1.0
-compatible context.
+This allows users to use libraries like [serde](https://github.com/serde-rs/serde)
+on stable Rust.
 
 Configuring with Cargo
 ======================

diff --git a/syntex_syntax/src/test.rs b/syntex_syntax/src/test.rs
@@ -14,7 +14,6 @@
 #![allow(unused_imports)]
 use self::HasTestSignature::*;
 
-use std::iter;
 use std::slice;
 use std::mem;
 use std::vec;
@@ -225,7 +224,7 @@ impl fold::Folder for EntryPointCleaner {
                             .filter(|attr| {
                                 !attr.check_name("main") && !attr.check_name("start")
                             })
-                            .chain(iter::once(allow_dead_code))
+                            .chain(Some(allow_dead_code))
                             .collect(),
                         node: node,
                         vis: vis,