Merge pull request #564 from kngwyu/paste

Replace mashup with paste

.travis.yml

@@ -21,7 +21,7 @@ matrix:
     - name: Minimum nightly
       python: "3.7"
       # Keep this synced up with build.rs
-      env: TRAVIS_RUST_VERSION=nightly-2019-06-22
+      env: TRAVIS_RUST_VERSION=nightly-2019-07-19
       # Tested via anaconda PyPy (since travis's PyPy version is too old)
     - name: PyPy3.5 7.0
       python: "3.7"

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
  * Implementing the Using the `gc` parameter for `pyclass` (e.g. `#[pyclass(gc)]`) without implementing the `class::PyGCProtocol` trait is now a compile-time error. Failing to implement this trait could lead to segfaults. [#532](https://github.com/PyO3/pyo3/pull/532)
  * `PyByteArray::data` has been replaced with `PyDataArray::to_vec` because returning a `&[u8]` is unsound. (See [this comment](https://github.com/PyO3/pyo3/issues/373#issuecomment-512332696) for a great write-up for why that was unsound)
+ * Replace `mashup` with `paste`.
 
 ## [0.7.0] - 2018-05-26
 

Cargo.toml

@@ -23,11 +23,11 @@ libc = "0.2.54"
 spin = "0.5.0"
 num-traits = "0.2.6"
 pyo3cls = { path = "pyo3cls", version = "=0.7.0" }
-mashup = "0.1.9"
 num-complex = { version = "0.2.1", optional = true }
 inventory = "0.1.3"
 indoc = "0.3.3"
 unindent = "0.1.3"
+paste = "0.1.5"
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"

README.md

@@ -16,7 +16,7 @@ A comparison with rust-cpython can be found [in the guide](https://pyo3.rs/maste
 
 ## Usage
 
-PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.34.0-nightly 2019-02-06.
+PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.37.0-nightly 2019-07-19.
 
 PyPy is also supported (via cpyext) for Python 3.5 only, targeted PyPy version is 7.0.0.
 Please refer to the guide for installation instruction against PyPy.

build.rs

@@ -16,7 +16,7 @@ use version_check::{Channel, Date, Version};
 /// Specifies the minimum nightly version needed to compile pyo3.
 /// Keep this synced up with the travis ci config,
 /// But note that this is the rustc version which can be lower than the nightly version
-const MIN_DATE: &'static str = "2019-06-21";
+const MIN_DATE: &'static str = "2019-07-18";
 const MIN_VERSION: &'static str = "1.37.0-nightly";
 
 /// Information returned from python interpreter

ci/travis/setup.sh

@@ -51,4 +51,4 @@ if [ ! -f "$HOME/.cargo/bin/kcov" ]; then
     make
     install src/kcov $HOME/.cargo/bin/kcov
     cd $TRAVIS_BUILD_DIR
-fi
+fi

guide/src/get_started.md

@@ -10,7 +10,7 @@ A comparison with rust-cpython can be found [in the guide](https://pyo3.rs/maste
 
 ## Usage
 
-PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.34.0-nightly 2019-02-06.
+PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.37.0-nightly 2019-07-19.
 
 PyPy is also supported (via cpyext) for Python 3.5 only, targeted PyPy version is 7.0.0.
 Please refer to the guide for installation instruction against PyPy.

src/lib.rs

@@ -132,7 +132,7 @@ pub use crate::type_object::{PyObjectAlloc, PyRawObject, PyTypeInfo};
 
 // Re-exported for wrap_function
 #[doc(hidden)]
-pub use mashup;
+pub use paste;
 // Re-exported for py_run
 #[doc(hidden)]
 pub use indoc;
@@ -183,18 +183,8 @@ pub mod proc_macro {
 /// Use this together with `#[pyfunction]` and [types::PyModule::add_wrapped].
 #[macro_export]
 macro_rules! wrap_pyfunction {
-    ($function_name:ident) => {{
+    ($function_name: ident) => {{
-        // Get the mashup macro and its helpers into scope
+        &pyo3::paste::expr! { [<__pyo3_get_function_ $function_name>] }
-        use pyo3::mashup::*;
-
-        mashup! {
-            // Make sure this ident matches the one in function_wrapper_ident
-            m["method"] = __pyo3_get_function_ $function_name;
-        }
-
-        m! {
-            &"method"
-        }
     }};
 }
 
@@ -204,14 +194,8 @@ macro_rules! wrap_pyfunction {
 #[macro_export]
 macro_rules! wrap_pymodule {
     ($module_name:ident) => {{
-        use pyo3::mashup::*;
+        pyo3::paste::expr! {
-
+            &|py| unsafe { pyo3::PyObject::from_owned_ptr(py, [<PyInit_ $module_name>]()) }
-        mashup! {
-            m["method"] = PyInit_ $module_name;
-        }
-
-        m! {
-            &|py| unsafe { pyo3::PyObject::from_owned_ptr(py, "method"()) }
         }
     }};
 }

tests/ui/reject_generics.stderr

@@ -3,3 +3,5 @@ error: #[pyclass] cannot have generic parameters
   |
 4 | struct ClassWithGenerics<A> {
   |                         ^^^
+
+error: Could not compile `pyo3-tests`.

tests/ui/too_many_args_to_getter.stderr

@@ -3,3 +3,5 @@ error: Getter function can only have one argument of type pyo3::Python!
    |
 11 |     fn get_num(&self, index: u32) {}
    |                              ^^^
+
+error: Could not compile `pyo3-tests`.