Merge branch 'master' into pyclass-new-layout

Author: kngwyu

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+* Support for `#[name = "foo"]` attribute for `#[pyfunction]` and in `#[pymethods]`. [#692](https://github.com/PyO3/pyo3/pull/692)
+
+## [0.8.4]
+
 ### Added
 
 * Support for `#[text_signature]` attribute. [#675](https://github.com/PyO3/pyo3/pull/675)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyo3"
-version = "0.8.3"
+version = "0.8.4"
 description = "Bindings to Python interpreter"
 authors = ["PyO3 Project and Contributors <https://github.com/PyO3>"]
 readme = "README.md"
@@ -22,7 +22,7 @@ appveyor = { repository = "fafhrd91/pyo3" }
 libc = "0.2.62"
 spin = "0.5.1"
 num-traits = "0.2.8"
-pyo3cls = { path = "pyo3cls", version = "=0.8.3" }
+pyo3cls = { path = "pyo3cls", version = "=0.8.4" }
 num-complex = { version = ">= 0.2", optional = true }
 num-bigint = { version = ">= 0.2", optional = true }
 inventory = "0.1.4"

README.md

@@ -50,7 +50,7 @@ name = "string_sum"
 crate-type = ["cdylib"]
 
 [dependencies.pyo3]
-version = "0.8.3"
+version = "0.8.4"
 features = ["extension-module"]
 ```
 
@@ -95,7 +95,7 @@ Add `pyo3` to your `Cargo.toml` like this:
 
 ```toml
 [dependencies]
-pyo3 = "0.8.3"
+pyo3 = "0.8.4"
 ```
 
 Example program displaying the value of `sys.version` and the current user name:

guide/src/get_started.md

@@ -44,7 +44,7 @@ name = "string_sum"
 crate-type = ["cdylib"]
 
 [dependencies.pyo3]
-version = "0.8.3"
+version = "0.8.4"
 features = ["extension-module"]
 ```
 
@@ -89,7 +89,7 @@ Add `pyo3` to your `Cargo.toml` like this:
 
 ```toml
 [dependencies]
-pyo3 = "0.8.3"
+pyo3 = "0.8.4"
 ```
 
 Example program displaying the value of `sys.version` and the current user name:

pyo3-derive-backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyo3-derive-backend"
-version = "0.8.3"
+version = "0.8.4"
 description = "Code generation for PyO3 package"
 authors = ["PyO3 Project and Contributors <https://github.com/PyO3>"]
 keywords = ["pyo3", "python", "cpython", "ffi"]

pyo3-derive-backend/src/func.rs

@@ -55,16 +55,16 @@ pub enum MethodProto {
     },
 }
 
-impl PartialEq<str> for MethodProto {
-    fn eq(&self, name: &str) -> bool {
+impl MethodProto {
+    pub fn name(&self) -> &str {
         match *self {
-            MethodProto::Free { name: n, .. } => n == name,
-            MethodProto::Unary { name: n, .. } => n == name,
-            MethodProto::Binary { name: n, .. } => n == name,
-            MethodProto::BinaryS { name: n, .. } => n == name,
-            MethodProto::Ternary { name: n, .. } => n == name,
-            MethodProto::TernaryS { name: n, .. } => n == name,
-            MethodProto::Quaternary { name: n, .. } => n == name,
+            MethodProto::Free { ref name, .. } => name,
+            MethodProto::Unary { ref name, .. } => name,
+            MethodProto::Binary { ref name, .. } => name,
+            MethodProto::BinaryS { ref name, .. } => name,
+            MethodProto::Ternary { ref name, .. } => name,
+            MethodProto::TernaryS { ref name, .. } => name,
+            MethodProto::Quaternary { ref name, .. } => name,
         }
     }
 }

pyo3-derive-backend/src/lib.rs

@@ -16,7 +16,7 @@ mod utils;
 
 pub use module::{add_fn_to_module, process_functions_in_module, py_init};
 pub use pyclass::{build_py_class, PyClassArgs};
-pub use pyfunction::PyFunctionAttr;
+pub use pyfunction::{build_py_function, PyFunctionAttr};
 pub use pyimpl::{build_py_methods, impl_methods};
 pub use pyproto::build_py_proto;
 pub use utils::get_doc;