From 31f8093037400afb7fad694aabcc0b620c14b8f2 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 27 Mar 2013 17:14:06 -0700
Subject: [PATCH 1/2] core: Remove unused import

---
 src/libstd/ebml.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index b82616d386af8..e686d5cd2b498 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -61,7 +61,6 @@ pub mod reader {
 
     use core::int;
     use core::io;
-    use core::ops;
     use core::prelude::*;
     use core::str;
     use core::vec;

From b0d1643fa6de6526368f9ebae62c29fb4680e574 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 27 Mar 2013 17:14:10 -0700
Subject: [PATCH 2/2] core/std: Remove uses of ++ mode

from stackwalk::frame_address and net_tcp::on_tcp_read_cb
As per #4425
---
 src/libcore/stackwalk.rs | 4 ++--
 src/libstd/net_tcp.rs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libcore/stackwalk.rs b/src/libcore/stackwalk.rs
index 955e486649b99..ceb7eb575f5ff 100644
--- a/src/libcore/stackwalk.rs
+++ b/src/libcore/stackwalk.rs
@@ -80,7 +80,7 @@ fn breakpoint() {
     }
 }
 
-fn frame_address(f: &fn(++x: *u8)) {
+fn frame_address(f: &fn(x: *u8)) {
     unsafe {
         rusti::frame_address(f)
     }
@@ -95,7 +95,7 @@ pub mod rustrt {
 pub mod rusti {
     #[abi = "rust-intrinsic"]
     pub extern {
-        pub fn frame_address(f: &once fn(++x: *u8));
+        pub fn frame_address(f: &once fn(x: *u8));
     }
 }
 
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index c1743c98c9bf1..a47a53caab98f 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -1281,7 +1281,7 @@ impl ToTcpErr for uv::ll::uv_err_data {
 
 extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
                     nread: libc::ssize_t,
-                    ++buf: uv::ll::uv_buf_t) {
+                    buf: uv::ll::uv_buf_t) {
     unsafe {
         debug!("entering on_tcp_read_cb stream: %? nread: %?",
                         stream, nread);