Skip to content
Merged
Changes from 1 commit
Commits
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
Merge branch 'main' into fix-dict-update-type-error
  • Loading branch information
2jiyong authored Jul 29, 2026
commit f012d4fc43d163b5045ebf58e7657b00efd60708
6 changes: 1 addition & 5 deletions crates/vm/src/builtins/dict.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ use crate::object::{Traverse, TraverseFn};
use crate::{
AsObject, Context, Py, PyExact, PyObject, PyObjectRef, PyPayload, PyRef, PyRefExact, PyResult,
TryFromObject, atomic_func,
builtins::{
PyList, PyTuple,
iter::{builtins_iter, builtins_reversed},
type_::PyAttributes,
},
builtins::{PyList, PyTuple, iter::builtins_iter, type_::PyAttributes},
class::{PyClassDef, PyClassImpl},
common::ascii,
dict_inner::{self, DictKey},
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.