From b964b1d043b8db7a39d7502c068f07cd399e375f Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Sat, 12 Dec 2015 07:55:28 -0500
Subject: [PATCH] remove deprecated APIs missed in #30182

---
 src/libstd/fs.rs                   | 2 +-
 src/libsyntax/ext/base.rs          | 7 -------
 src/libsyntax/util/small_vector.rs | 7 -------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 25a05efd026..715749f50d4 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -923,10 +923,10 @@ pub fn hard_link<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<(
 /// # Ok(())
 /// # }
 /// ```
+#[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_deprecated(since = "1.1.0",
              reason = "replaced with std::os::unix::fs::symlink and \
                        std::os::windows::fs::{symlink_file, symlink_dir}")]
-#[stable(feature = "rust1", since = "1.0.0")]
 pub fn soft_link<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<()> {
     fs_imp::symlink(src.as_ref(), dst.as_ref())
 }
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 3b613922bc9..22315454f89 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -601,13 +601,6 @@ impl<'a> ExtCtxt<'a> {
         }
     }
 
-    #[unstable(feature = "rustc_private", issue = "0")]
-    #[rustc_deprecated(since = "1.0.0",
-                 reason = "Replaced with `expander().fold_expr()`")]
-    pub fn expand_expr(&mut self, e: P<ast::Expr>) -> P<ast::Expr> {
-        self.expander().fold_expr(e)
-    }
-
     /// Returns a `Folder` for deeply expanding all macros in an AST node.
     pub fn expander<'b>(&'b mut self) -> expand::MacroExpander<'b, 'a> {
         expand::MacroExpander::new(self)
diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs
index ee183d7f3e9..8b07b21c578 100644
--- a/src/libsyntax/util/small_vector.rs
+++ b/src/libsyntax/util/small_vector.rs
@@ -127,13 +127,6 @@ impl<T> SmallVector<T> {
         }
     }
 
-    /// Deprecated: use `into_iter`.
-    #[unstable(feature = "rustc_private", issue = "0")]
-    #[rustc_deprecated(since = "1.0.0", reason = "use into_iter")]
-    pub fn move_iter(self) -> IntoIter<T> {
-        self.into_iter()
-    }
-
     pub fn len(&self) -> usize {
         match self.repr {
             Zero => 0,