From e5bf656cbc7668014c8f5e3885267c751992e0b2 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 18 Nov 2017 07:20:03 -1000
Subject: [PATCH] revert pycls changes; fix word-cound-cls example

---
 CHANGES.txt                        | 12 ++++++++++++
 examples/word-count-cls/src/lib.rs |  4 ++--
 pyo3cls/Cargo.toml                 |  2 +-
 pyo3cls/src/py_method.rs           |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fcd0c928..0475339f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,18 @@
 Changes
 -------
 
+0.2.2 (09-26-2017)
+^^^^^^^^^^^^^^^^^^
+
+* Rustup to 1.22.0-nightly 2017-09-30
+
+
+0.2.1 (09-26-2017)
+^^^^^^^^^^^^^^^^^^
+
+* Fix rustc const_fn nightly breakage
+
+
 0.2.0 (08-12-2017)
 ^^^^^^^^^^^^^^^^^^
 
diff --git a/examples/word-count-cls/src/lib.rs b/examples/word-count-cls/src/lib.rs
index 9631d279..6e2f463e 100644
--- a/examples/word-count-cls/src/lib.rs
+++ b/examples/word-count-cls/src/lib.rs
@@ -22,8 +22,8 @@ struct Words {
 impl Words {
 
     #[new]
-    fn __new__(_cls: &PyType, py: Python, path: String) -> PyResult<PyObject> {
-        Ok(py.init(|t| Words {path: path, token: t})?.into())
+    fn __new__(obj: &PyRawObject, path: String) -> PyResult<()> {
+        obj.init(|t| Words {path: path, token: t})
     }
 
     fn search(&self, py: Python, search: String) -> PyResult<i32> {
diff --git a/pyo3cls/Cargo.toml b/pyo3cls/Cargo.toml
index 2995cf60..f2be9d64 100644
--- a/pyo3cls/Cargo.toml
+++ b/pyo3cls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyo3cls"
-version = "0.2.1"
+version = "0.2.0"
 description = "Proc macros for PyO3 package"
 authors = ["PyO3 Project and Contributors <https://github.com/PyO3"]
 homepage = "https://github.com/pyo3/pyo3"
diff --git a/pyo3cls/src/py_method.rs b/pyo3cls/src/py_method.rs
index 065ae981..80f245d3 100644
--- a/pyo3cls/src/py_method.rs
+++ b/pyo3cls/src/py_method.rs
@@ -128,7 +128,7 @@ pub fn impl_wrap_new(cls: &Box<syn::Ty>, name: &syn::Ident, spec: &FnSpec) -> To
         |item| if item.1.py {syn::Ident::from("_py")} else {
             syn::Ident::from(format!("arg{}", item.0))}).collect();
     let cb = quote! {{
-        #cls::#name(_obj.as_ref(), #(#names),*)
+        #cls::#name(&_obj, #(#names),*)
     }};
 
     let body = impl_arg_params(spec, cb);