Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master into abi3 branch to resolve conflicts #1237

Merged
merged 21 commits into from
Oct 12, 2020
Merged

merge master into abi3 branch to resolve conflicts #1237

Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
06b1586
contributing.md: add note on benchmarking
davidhewitt Oct 9, 2020
23d9d25
migration guide: tiny typo fix
davidhewitt Oct 10, 2020
f6644d5
Tweak doc for PyDowncastError
davidhewitt Oct 10, 2020
bac1771
Update Python versions on CI
davidhewitt Oct 10, 2020
6c9d26f
Merge pull request #1218 from davidhewitt/contributing-benchmarks
davidhewitt Oct 10, 2020
1dcb3da
Merge pull request #1222 from davidhewitt/tweak-migration-guide
davidhewitt Oct 10, 2020
8641852
Merge pull request #1223 from davidhewitt/tweak-downcast-error-doc
davidhewitt Oct 10, 2020
21463a9
Merge pull request #1226 from davidhewitt/ci-python-versions
kngwyu Oct 11, 2020
f45242f
Move From<&T> for Py<T> impl to pyobject_native_type_core
kngwyu Oct 12, 2020
1749747
Merge pull request #1228 from PyO3/exclude-py-coversion
davidhewitt Oct 12, 2020
1cecad8
Release 0.12.2
davidhewitt Oct 10, 2020
41cfa6b
Don't watch PYTHON_SYS_EXECUTABLE and PATH when unnecessary
kngwyu Oct 12, 2020
7b3dd68
Fix support for MSRV
davidhewitt Oct 12, 2020
576c6b1
Merge pull request #1231 from PyO3/dont-watch-path
davidhewitt Oct 12, 2020
d6e624b
Merge pull request #1225 from PyO3/release-0.12.2
davidhewitt Oct 12, 2020
f855daf
Update environment setting for Github Actions API updates
alex Oct 12, 2020
6e46bca
Merge pull request #1233 from alex/patch-1
davidhewitt Oct 12, 2020
fc7cb2e
Merge pull request #1234 from davidhewitt/fix-msrv-ci
davidhewitt Oct 12, 2020
9e34835
Merge branch 'master' into abi3-merge-master
alex Oct 12, 2020
5060379
Fix changelog
alex Oct 12, 2020
2923b4d
Fix for MSRV
alex Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/err/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ unsafe impl Sync for PyErr {}
/// Represents the result of a Python call.
pub type PyResult<T> = Result<T, PyErr>;

/// Marker type that indicates an error while downcasting
/// Error that indicates a failure to convert a PyAny to a more specific Python type.
#[derive(Debug)]
pub struct PyDowncastError<'a> {
from: &'a PyAny,
Expand Down