Skip to content

Commit f81ad04

Browse files
youknowoneyouknowone
committed
PyString -> PyStr
1 parent c501103 commit f81ad04

58 files changed

Lines changed: 401 additions & 443 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/shell/helper.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustpython_vm::obj::objstr::PyStringRef;
1+
use rustpython_vm::obj::objstr::PyStrRef;
22
use rustpython_vm::pyobject::{BorrowValue, PyIterable, PyResult, TryFromObject};
33
use rustpython_vm::scope::{NameProtocol, Scope};
44
use rustpython_vm::VirtualMachine;
@@ -59,16 +59,13 @@ impl<'vm> ShellHelper<'vm> {
5959
fn get_available_completions<'w>(
6060
&self,
6161
words: &'w [String],
62-
) -> Option<(
63-
&'w str,
64-
Box<dyn Iterator<Item = PyResult<PyStringRef>> + 'vm>,
65-
)> {
62+
) -> Option<(&'w str, Box<dyn Iterator<Item = PyResult<PyStrRef>> + 'vm>)> {
6663
// the very first word and then all the ones after the dot
6764
let (first, rest) = words.split_first().unwrap();
6865

6966
let str_iter_method = |obj, name| {
7067
let iter = self.vm.call_method(obj, name, vec![])?;
71-
PyIterable::<PyStringRef>::try_from_object(self.vm, iter)?.iter(self.vm)
68+
PyIterable::<PyStrRef>::try_from_object(self.vm, iter)?.iter(self.vm)
7269
};
7370

7471
if let Some((last, parents)) = rest.split_last() {

‎vm/src/builtins.rs‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mod decl {
2929
use crate::obj::objiter;
3030
use crate::obj::objlist::{PyList, SortOptions};
3131
use crate::obj::objsequence;
32-
use crate::obj::objstr::{PyString, PyStringRef};
32+
use crate::obj::objstr::{PyStr, PyStrRef};
3333
use crate::obj::objtype::{self, PyClassRef};
3434
use crate::pyobject::{
3535
BorrowValue, Either, IdProtocol, ItemProtocol, PyCallable, PyIterable, PyObjectRef,
@@ -108,11 +108,11 @@ mod decl {
108108
#[allow(dead_code)]
109109
struct CompileArgs {
110110
#[pyarg(positional_only, optional = false)]
111-
source: Either<PyStringRef, PyBytesRef>,
111+
source: Either<PyStrRef, PyBytesRef>,
112112
#[pyarg(positional_only, optional = false)]
113-
filename: PyStringRef,
113+
filename: PyStrRef,
114114
#[pyarg(positional_only, optional = false)]
115-
mode: PyStringRef,
115+
mode: PyStrRef,
116116
#[pyarg(positional_or_keyword, optional = true)]
117117
flags: OptionalArg<PyIntRef>,
118118
#[pyarg(positional_or_keyword, optional = true)]
@@ -162,7 +162,7 @@ mod decl {
162162
}
163163

164164
#[pyfunction]
165-
fn delattr(obj: PyObjectRef, attr: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
165+
fn delattr(obj: PyObjectRef, attr: PyStrRef, vm: &VirtualMachine) -> PyResult<()> {
166166
vm.del_attr(&obj, attr.into_object())
167167
}
168168

@@ -200,7 +200,7 @@ mod decl {
200200
#[cfg(feature = "rustpython-compiler")]
201201
#[pyfunction]
202202
fn eval(
203-
source: Either<PyStringRef, PyCodeRef>,
203+
source: Either<PyStrRef, PyCodeRef>,
204204
scope: ScopeArgs,
205205
vm: &VirtualMachine,
206206
) -> PyResult {
@@ -212,7 +212,7 @@ mod decl {
212212
#[cfg(feature = "rustpython-compiler")]
213213
#[pyfunction]
214214
fn exec(
215-
source: Either<PyStringRef, PyCodeRef>,
215+
source: Either<PyStrRef, PyCodeRef>,
216216
scope: ScopeArgs,
217217
vm: &VirtualMachine,
218218
) -> PyResult {
@@ -222,7 +222,7 @@ mod decl {
222222
#[cfg(feature = "rustpython-compiler")]
223223
fn run_code(
224224
vm: &VirtualMachine,
225-
source: Either<PyStringRef, PyCodeRef>,
225+
source: Either<PyStrRef, PyCodeRef>,
226226
scope: ScopeArgs,
227227
mode: compile::Mode,
228228
) -> PyResult {
@@ -272,12 +272,12 @@ mod decl {
272272
#[pyfunction]
273273
fn format(
274274
value: PyObjectRef,
275-
format_spec: OptionalArg<PyStringRef>,
275+
format_spec: OptionalArg<PyStrRef>,
276276
vm: &VirtualMachine,
277-
) -> PyResult<PyStringRef> {
277+
) -> PyResult<PyStrRef> {
278278
let format_spec = format_spec
279279
.into_option()
280-
.unwrap_or_else(|| PyString::from("").into_ref(vm));
280+
.unwrap_or_else(|| PyStr::from("").into_ref(vm));
281281

282282
vm.call_method(&value, "__format__", vec![format_spec.into_object()])?
283283
.downcast()
@@ -304,7 +304,7 @@ mod decl {
304304
#[pyfunction]
305305
fn getattr(
306306
obj: PyObjectRef,
307-
attr: PyStringRef,
307+
attr: PyStrRef,
308308
default: OptionalArg<PyObjectRef>,
309309
vm: &VirtualMachine,
310310
) -> PyResult {
@@ -322,7 +322,7 @@ mod decl {
322322
}
323323

324324
#[pyfunction]
325-
fn hasattr(obj: PyObjectRef, attr: PyStringRef, vm: &VirtualMachine) -> PyResult<bool> {
325+
fn hasattr(obj: PyObjectRef, attr: PyStrRef, vm: &VirtualMachine) -> PyResult<bool> {
326326
if let Err(ex) = vm.get_attribute(obj, attr) {
327327
catch_attr_exception(ex, false, vm)
328328
} else {
@@ -355,7 +355,7 @@ mod decl {
355355
}
356356

357357
#[pyfunction]
358-
fn input(prompt: OptionalArg<PyStringRef>, vm: &VirtualMachine) -> PyResult {
358+
fn input(prompt: OptionalArg<PyStrRef>, vm: &VirtualMachine) -> PyResult {
359359
let stdin = sysmodule::get_stdin(vm)?;
360360
let stdout = sysmodule::get_stdout(vm)?;
361361
let stderr = sysmodule::get_stderr(vm)?;
@@ -590,7 +590,7 @@ mod decl {
590590
}
591591

592592
#[pyfunction]
593-
fn ord(string: Either<PyBytesLike, PyStringRef>, vm: &VirtualMachine) -> PyResult<u32> {
593+
fn ord(string: Either<PyBytesLike, PyStrRef>, vm: &VirtualMachine) -> PyResult<u32> {
594594
match string {
595595
Either::A(bytes) => bytes.with_ref(|bytes| {
596596
let bytes_len = bytes.len();
@@ -670,9 +670,9 @@ mod decl {
670670
#[derive(Debug, Default, FromArgs)]
671671
pub struct PrintOptions {
672672
#[pyarg(keyword_only, default = "None")]
673-
sep: Option<PyStringRef>,
673+
sep: Option<PyStrRef>,
674674
#[pyarg(keyword_only, default = "None")]
675-
end: Option<PyStringRef>,
675+
end: Option<PyStrRef>,
676676
#[pyarg(keyword_only, default = "IntoPyBool::FALSE")]
677677
flush: IntoPyBool,
678678
#[pyarg(keyword_only, default = "None")]
@@ -685,11 +685,9 @@ mod decl {
685685
Some(f) => f,
686686
None => sysmodule::get_stdout(vm)?,
687687
};
688-
let write = |obj: PyStringRef| vm.call_method(&file, "write", vec![obj.into_object()]);
688+
let write = |obj: PyStrRef| vm.call_method(&file, "write", vec![obj.into_object()]);
689689

690-
let sep = options
691-
.sep
692-
.unwrap_or_else(|| PyString::from(" ").into_ref(vm));
690+
let sep = options.sep.unwrap_or_else(|| PyStr::from(" ").into_ref(vm));
693691

694692
let mut first = true;
695693
for object in objects {
@@ -704,7 +702,7 @@ mod decl {
704702

705703
let end = options
706704
.end
707-
.unwrap_or_else(|| PyString::from("\n").into_ref(vm));
705+
.unwrap_or_else(|| PyStr::from("\n").into_ref(vm));
708706
write(end)?;
709707

710708
if options.flush.to_bool() {
@@ -715,7 +713,7 @@ mod decl {
715713
}
716714

717715
#[pyfunction]
718-
fn repr(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyStringRef> {
716+
fn repr(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyStrRef> {
719717
vm.to_repr(&obj)
720718
}
721719

@@ -759,7 +757,7 @@ mod decl {
759757
#[pyfunction]
760758
fn setattr(
761759
obj: PyObjectRef,
762-
attr: PyStringRef,
760+
attr: PyStrRef,
763761
value: PyObjectRef,
764762
vm: &VirtualMachine,
765763
) -> PyResult<()> {
@@ -804,7 +802,7 @@ mod decl {
804802
#[pyfunction]
805803
pub fn __build_class__(
806804
function: PyFunctionRef,
807-
qualified_name: PyStringRef,
805+
qualified_name: PyStrRef,
808806
bases: Args<PyClassRef>,
809807
mut kwargs: KwArgs,
810808
vm: &VirtualMachine,

‎vm/src/bytesinner.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::obj::objsequence::{
1515
};
1616
use crate::obj::objsingletons::PyNoneRef;
1717
use crate::obj::objslice::PySliceRef;
18-
use crate::obj::objstr::{self, PyString, PyStringRef};
18+
use crate::obj::objstr::{self, PyStr, PyStrRef};
1919
use crate::pyobject::{
2020
BorrowValue, Either, PyComparisonValue, PyIterable, PyIterator, PyObjectRef, PyResult,
2121
TryFromObject, TypeProtocol,
@@ -67,9 +67,9 @@ pub struct ByteInnerNewOptions {
6767
#[pyarg(positional_or_keyword, optional = true)]
6868
source: OptionalArg<PyObjectRef>,
6969
#[pyarg(positional_or_keyword, optional = true)]
70-
encoding: OptionalArg<PyStringRef>,
70+
encoding: OptionalArg<PyStrRef>,
7171
#[pyarg(positional_or_keyword, optional = true)]
72-
errors: OptionalArg<PyStringRef>,
72+
errors: OptionalArg<PyStrRef>,
7373
}
7474

7575
impl ByteInnerNewOptions {
@@ -87,7 +87,7 @@ impl ByteInnerNewOptions {
8787
}
8888
}
8989
OptionalArg::Present(obj) => {
90-
match obj.downcast::<PyString>() {
90+
match obj.downcast::<PyStr>() {
9191
Ok(s) => {
9292
// Handle bytes(string, encoding[, errors])
9393
if let OptionalArg::Present(enc) = self.encoding {
@@ -1188,19 +1188,19 @@ impl<'s> PyCommonString<'s, u8> for [u8] {
11881188
#[derive(FromArgs)]
11891189
pub struct DecodeArgs {
11901190
#[pyarg(positional_or_keyword, default = "None")]
1191-
encoding: Option<PyStringRef>,
1191+
encoding: Option<PyStrRef>,
11921192
#[pyarg(positional_or_keyword, default = "None")]
1193-
errors: Option<PyStringRef>,
1193+
errors: Option<PyStrRef>,
11941194
}
11951195

11961196
pub fn bytes_decode(
11971197
zelf: PyObjectRef,
11981198
args: DecodeArgs,
11991199
vm: &VirtualMachine,
1200-
) -> PyResult<PyStringRef> {
1200+
) -> PyResult<PyStrRef> {
12011201
let DecodeArgs { encoding, errors } = args;
12021202
vm.decode(zelf, encoding.clone(), errors)?
1203-
.downcast::<PyString>()
1203+
.downcast::<PyStr>()
12041204
.map_err(|obj| {
12051205
vm.new_type_error(format!(
12061206
"'{}' decoder returned '{}' instead of 'str'; use codecs.encode() to \

‎vm/src/dictdatatype.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/// And: https://www.youtube.com/watch?v=p33CVV29OG8
44
/// And: http://code.activestate.com/recipes/578375/
55
use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
6-
use crate::obj::objstr::{PyString, PyStringRef};
6+
use crate::obj::objstr::{PyStr, PyStrRef};
77
use crate::pyobject::{BorrowValue, IdProtocol, IntoPyObject, PyObjectRef, PyResult};
88
use crate::vm::VirtualMachine;
99
use rustpython_common::hash;
@@ -455,7 +455,7 @@ impl DictKey for PyObjectRef {
455455
}
456456
}
457457

458-
impl DictKey for PyStringRef {
458+
impl DictKey for PyStrRef {
459459
fn key_hash(&self, vm: &VirtualMachine) -> PyResult<HashValue> {
460460
Ok(self.hash(vm))
461461
}
@@ -467,7 +467,7 @@ impl DictKey for PyStringRef {
467467
fn key_eq(&self, vm: &VirtualMachine, other_key: &PyObjectRef) -> PyResult<bool> {
468468
if self.is(other_key) {
469469
Ok(true)
470-
} else if let Some(py_str_value) = other_key.payload::<PyString>() {
470+
} else if let Some(py_str_value) = other_key.payload::<PyStr>() {
471471
Ok(py_str_value.borrow_value() == self.borrow_value())
472472
} else {
473473
vm.bool_eq(self.clone().into_object(), other_key.clone())
@@ -481,7 +481,7 @@ impl DictKey for PyStringRef {
481481
/// to index dictionaries.
482482
impl DictKey for &str {
483483
fn key_hash(&self, vm: &VirtualMachine) -> PyResult<HashValue> {
484-
// follow a similar route as the hashing of PyStringRef
484+
// follow a similar route as the hashing of PyStrRef
485485
Ok(vm.state.hash_secret.hash_str(*self))
486486
}
487487

@@ -492,7 +492,7 @@ impl DictKey for &str {
492492
}
493493

494494
fn key_eq(&self, vm: &VirtualMachine, other_key: &PyObjectRef) -> PyResult<bool> {
495-
if let Some(py_str_value) = other_key.payload::<PyString>() {
495+
if let Some(py_str_value) = other_key.payload::<PyStr>() {
496496
Ok(py_str_value.borrow_value() == *self)
497497
} else {
498498
// Fall back to PyObjectRef implementation.

‎vm/src/exceptions.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::common::cell::PyRwLock;
22
use crate::function::PyFuncArgs;
33
use crate::obj::objsingletons::{PyNone, PyNoneRef};
4-
use crate::obj::objstr::{PyString, PyStringRef};
4+
use crate::obj::objstr::{PyStr, PyStrRef};
55
use crate::obj::objtraceback::PyTracebackRef;
66
use crate::obj::objtuple::{PyTuple, PyTupleRef};
77
use crate::obj::objtype::{self, PyClass, PyClassRef};
@@ -131,12 +131,12 @@ impl PyBaseException {
131131
}
132132

133133
#[pymethod(name = "__str__")]
134-
fn str(&self, vm: &VirtualMachine) -> PyStringRef {
134+
fn str(&self, vm: &VirtualMachine) -> PyStrRef {
135135
let str_args = exception_args_as_string(vm, self.args(), true);
136136
match str_args.into_iter().exactly_one() {
137-
Err(i) if i.len() == 0 => PyString::from("").into_ref(vm),
137+
Err(i) if i.len() == 0 => PyStr::from("").into_ref(vm),
138138
Ok(s) => s,
139-
Err(i) => PyString::from(format!("({})", i.format(", "))).into_ref(vm),
139+
Err(i) => PyStr::from(format!("({})", i.format(", "))).into_ref(vm),
140140
}
141141
}
142142

@@ -269,25 +269,25 @@ fn exception_args_as_string(
269269
vm: &VirtualMachine,
270270
varargs: PyTupleRef,
271271
str_single: bool,
272-
) -> Vec<PyStringRef> {
272+
) -> Vec<PyStrRef> {
273273
let varargs = varargs.borrow_value();
274274
match varargs.len() {
275275
0 => vec![],
276276
1 => {
277277
let args0_repr = if str_single {
278278
vm.to_str(&varargs[0])
279-
.unwrap_or_else(|_| PyString::from("<element str() failed>").into_ref(vm))
279+
.unwrap_or_else(|_| PyStr::from("<element str() failed>").into_ref(vm))
280280
} else {
281281
vm.to_repr(&varargs[0])
282-
.unwrap_or_else(|_| PyString::from("<element repr() failed>").into_ref(vm))
282+
.unwrap_or_else(|_| PyStr::from("<element repr() failed>").into_ref(vm))
283283
};
284284
vec![args0_repr]
285285
}
286286
_ => varargs
287287
.iter()
288288
.map(|vararg| {
289289
vm.to_repr(vararg)
290-
.unwrap_or_else(|_| PyString::from("<element repr() failed>").into_ref(vm))
290+
.unwrap_or_else(|_| PyStr::from("<element repr() failed>").into_ref(vm))
291291
})
292292
.collect(),
293293
}
@@ -644,7 +644,7 @@ fn make_arg_getter(idx: usize) -> impl Fn(PyBaseExceptionRef) -> Option<PyObject
644644
move |exc| exc.args.read().borrow_value().get(idx).cloned()
645645
}
646646

647-
fn key_error_str(exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyStringRef {
647+
fn key_error_str(exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyStrRef {
648648
let args = exc.args();
649649
if args.borrow_value().len() == 1 {
650650
exception_args_as_string(vm, args, false)

0 commit comments

Comments
 (0)