Skip to content

nitpicks #5886

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

Merged
youknowone merged 12 commits into from
Jul 2, 2025
Merged

nitpicks #5886

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
319065e
Use `Self` instead of struct name
ShaharNaveh Jun 30, 2025
8c8ccdc
General fixes
ShaharNaveh Jun 30, 2025
df03be4
General
ShaharNaveh Jun 29, 2025
bcfe02a
General fixes
ShaharNaveh Jul 2, 2025
91b5666
More nitpicks
ShaharNaveh Jul 2, 2025
9aed7aa
Added newlines
ShaharNaveh Jul 2, 2025
d9aeed7
More nitpicks
ShaharNaveh Jul 2, 2025
3992208
Use Self where possible
ShaharNaveh Jul 2, 2025
7a6e815
Use Self where possible
ShaharNaveh Jul 2, 2025
48b332c
Use Self
ShaharNaveh Jul 2, 2025
75ac4c4
Use Self more
ShaharNaveh Jul 2, 2025
da95cca
Use Self
ShaharNaveh Jul 2, 2025
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
Prev Previous commit
Next Next commit
Added newlines
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jul 2, 2025
commit 9aed7aa94bc76a0006f253b46be29006c24295fc
19 changes: 18 additions & 1 deletion vm/src/stdlib/marshal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ mod decl {
impl marshal::Dumpable for PyObjectRef {
type Error = DumpError;
type Constant = Literal;

fn with_dump<R>(
&self,
f: impl FnOnce(marshal::DumpableValue<'_, Self>) -> R,
Expand Down Expand Up @@ -126,46 +127,60 @@ mod decl {

impl<'a> marshal::MarshalBag for PyMarshalBag<'a> {
type Value = PyObjectRef;
type ConstantBag = PyObjBag<'a>;

fn make_bool(&self, value: bool) -> Self::Value {
self.0.ctx.new_bool(value).into()
}

fn make_none(&self) -> Self::Value {
self.0.ctx.none()
}

fn make_ellipsis(&self) -> Self::Value {
self.0.ctx.ellipsis()
}

fn make_float(&self, value: f64) -> Self::Value {
self.0.ctx.new_float(value).into()
}

fn make_complex(&self, value: Complex64) -> Self::Value {
self.0.ctx.new_complex(value).into()
}

fn make_str(&self, value: &Wtf8) -> Self::Value {
self.0.ctx.new_str(value).into()
}

fn make_bytes(&self, value: &[u8]) -> Self::Value {
self.0.ctx.new_bytes(value.to_vec()).into()
}

fn make_int(&self, value: BigInt) -> Self::Value {
self.0.ctx.new_int(value).into()
}

fn make_tuple(&self, elements: impl Iterator<Item = Self::Value>) -> Self::Value {
let elements = elements.collect();
self.0.ctx.new_tuple(elements).into()
}

fn make_code(&self, code: CodeObject) -> Self::Value {
self.0.ctx.new_code(code).into()
}

fn make_stop_iter(&self) -> Result<Self::Value, marshal::MarshalError> {
Ok(self.0.ctx.exceptions.stop_iteration.to_owned().into())
}

fn make_list(
&self,
it: impl Iterator<Item = Self::Value>,
) -> Result<Self::Value, marshal::MarshalError> {
Ok(self.0.ctx.new_list(it.collect()).into())
}

fn make_set(
&self,
it: impl Iterator<Item = Self::Value>,
Expand All @@ -177,13 +192,15 @@ mod decl {
}
Ok(set.into())
}

fn make_frozenset(
&self,
it: impl Iterator<Item = Self::Value>,
) -> Result<Self::Value, marshal::MarshalError> {
let vm = self.0;
Ok(PyFrozenSet::from_iter(vm, it).unwrap().to_pyobject(vm))
}

fn make_dict(
&self,
it: impl Iterator<Item = (Self::Value, Self::Value)>,
Expand All @@ -195,7 +212,7 @@ mod decl {
}
Ok(dict.into())
}
type ConstantBag = PyObjBag<'a>;

fn constant_bag(self) -> Self::ConstantBag {
PyObjBag(&self.0.ctx)
}
Expand Down