Rustup to 1.22.0-nightly 2017-09-30
This commit is contained in:
parent
8975ce5088
commit
95d94c19b3
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "pyo3"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2-dev"
|
||||
description = "Bindings to Python interpreter"
|
||||
authors = ["PyO3 Project and Contributors"]
|
||||
readme = "README.md"
|
||||
|
|
4
build.rs
4
build.rs
|
@ -10,8 +10,8 @@ use regex::Regex;
|
|||
use version_check::{supports_features, is_min_version, is_min_date};
|
||||
|
||||
// Specifies the minimum nightly version needed to compile pyo3.
|
||||
const MIN_DATE: &'static str = "2017-07-20";
|
||||
const MIN_VERSION: &'static str = "1.20.0-nightly";
|
||||
const MIN_DATE: &'static str = "2017-09-30";
|
||||
const MIN_VERSION: &'static str = "1.22.0-nightly";
|
||||
|
||||
#[derive(Debug)]
|
||||
struct PythonVersion {
|
||||
|
|
|
@ -59,7 +59,7 @@ impl IntoPyObject for bool {
|
|||
///
|
||||
/// Fails with `TypeError` if the input is not a Python `bool`.
|
||||
pyobject_extract!(obj to bool => {
|
||||
Ok(PyBool::try_from(obj)?.is_true())
|
||||
Ok(<PyBool as PyTryFrom>::try_from(obj)?.is_true())
|
||||
});
|
||||
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ impl<'source> ::FromPyObject<'source> for Cow<'source, str>
|
|||
/// Allows extracting strings from Python objects.
|
||||
/// Accepts Python `str` and `unicode` objects.
|
||||
pyobject_extract!(obj to String => {
|
||||
PyString::try_from(obj)?.to_string().map(Cow::into_owned)
|
||||
<PyString as PyTryFrom>::try_from(obj)?.to_string().map(Cow::into_owned)
|
||||
});
|
||||
|
||||
impl RefFromPyObject for str {
|
||||
|
|
Loading…
Reference in New Issue