mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Rename AsBuffer::{as_buffer -> tp_as_buffer, get_buffer -> as_buffer}

Browse Source
This commit is contained in:
Jeong YunWon
2021-09-26 03:31:27 +09:00
parent c38e78a8f6
commit 3ba42dbd4c
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vm/src/builtins/bytearray.rs
View File

@@ -667,7 +667,7 @@ impl Comparable for PyByteArray {
}
impl AsBuffer for PyByteArray {
fn get_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
fn as_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
let buffer = PyBuffer::new(
zelf.as_object().clone(),
zelf.clone(),

2
vm/src/builtins/bytes.rs
View File

@@ -515,7 +515,7 @@ impl PyBytes {
}
impl AsBuffer for PyBytes {
fn get_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
fn as_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
let buf = PyBuffer::new(
zelf.as_object().clone(),
zelf.clone(),

2
vm/src/builtins/memory.rs
View File

@@ -676,7 +676,7 @@ impl PyMemoryView {
}
impl AsBuffer for PyMemoryView {
fn get_buffer(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyBuffer> {
fn as_buffer(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyBuffer> {
if zelf.released.load() {
Err(vm.new_value_error("operation forbidden on released memoryview object".to_owned()))
} else {

8
vm/src/slots.rs
View File

@@ -520,14 +520,14 @@ pub trait SlotSetattro: PyValue {
pub trait AsBuffer: PyValue {
// TODO: `flags` parameter
#[pyslot]
fn as_buffer(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyBuffer> {
fn tp_as_buffer(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyBuffer> {
let zelf = zelf
.downcast_ref()
.ok_or_else(|| vm.new_type_error("unexpected payload for get_buffer".to_owned()))?;
Self::get_buffer(zelf, vm)
.ok_or_else(|| vm.new_type_error("unexpected payload for as_buffer".to_owned()))?;
Self::as_buffer(zelf, vm)
}
fn get_buffer(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyBuffer>;
fn as_buffer(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyBuffer>;
}
#[pyimpl]

2
vm/src/stdlib/array.rs
View File

@@ -1123,7 +1123,7 @@ mod array {
}
impl AsBuffer for PyArray {
fn get_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
fn as_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
let array = zelf.read();
let buf = PyBuffer::new(
zelf.as_object().clone(),