PyFuncArgs Kwargs defaults to IndexMap

youknowone · youknowone · commit 4640be4c0d2b · 2020-10-11T09:35:15.000+09:00
diff --git a/vm/src/function.rs b/vm/src/function.rs
@@ -278,10 +278,10 @@ impl<T: TryFromObject> FromArgOptional for T {
 /// KwArgs is only for functions that accept arbitrary keyword arguments. For
 /// functions that accept only *specific* named arguments, a rust struct with
 /// an appropriate FromArgs implementation must be created.
-pub struct KwArgs<T = PyObjectRef>(HashMap<String, T>);
+pub struct KwArgs<T = PyObjectRef>(IndexMap<String, T>);
 
 impl<T> KwArgs<T> {
-    pub fn new(map: HashMap<String, T>) -> Self {
+    pub fn new(map: IndexMap<String, T>) -> Self {
         KwArgs(map)
     }
 
@@ -290,13 +290,13 @@ impl<T> KwArgs<T> {
     }
 }
 impl<T> From<HashMap<String, T>> for KwArgs<T> {
-    fn from(map: HashMap<String, T>) -> Self {
-        KwArgs(map)
+    fn from(kwargs: HashMap<String, T>) -> Self {
+        KwArgs(kwargs.into_iter().collect())
     }
 }
 impl<T> Default for KwArgs<T> {
     fn default() -> Self {
-        KwArgs(HashMap::new())
+        KwArgs(IndexMap::new())
     }
 }
 
@@ -305,7 +305,7 @@ where
     T: TryFromObject,
 {
     fn from_args(vm: &VirtualMachine, args: &mut PyFuncArgs) -> Result<Self, ArgumentError> {
-        let mut kwargs = HashMap::new();
+        let mut kwargs = IndexMap::new();
         for (name, value) in args.remaining_keywords() {
             kwargs.insert(name, T::try_from_object(vm, value)?);
         }
@@ -315,7 +315,7 @@ where
 
 impl<T> IntoIterator for KwArgs<T> {
     type Item = (String, T);
-    type IntoIter = std::collections::hash_map::IntoIter<String, T>;
+    type IntoIter = indexmap::map::IntoIter<String, T>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.0.into_iter()
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -1253,7 +1253,7 @@ mod _io {
             &file_io_class,
             PyFuncArgs::from((
                 Args::new(vec![file, vm.ctx.new_str(mode.clone())]),
-                KwArgs::new(maplit::hashmap! {
+                KwArgs::from(maplit::hashmap! {
                     "closefd".to_owned() => vm.ctx.new_bool(opts.closefd),
                     "opener".to_owned() => vm.unwrap_or_none(opts.opener),
                 }),

Original file line number	Diff line number	Diff line change
`@@ -278,10 +278,10 @@ impl<T: TryFromObject> FromArgOptional for T {`
`278`	`278`	`/// KwArgs is only for functions that accept arbitrary keyword arguments. For`
`279`	`279`	`/// functions that accept only specific named arguments, a rust struct with`
`280`	`280`	`/// an appropriate FromArgs implementation must be created.`
`281`		`-pub struct KwArgs<T = PyObjectRef>(HashMap<String, T>);`
	`281`	`+pub struct KwArgs<T = PyObjectRef>(IndexMap<String, T>);`
`282`	`282`
`283`	`283`	`impl<T> KwArgs<T> {`
`284`		`- pub fn new(map: HashMap<String, T>) -> Self {`
	`284`	`+ pub fn new(map: IndexMap<String, T>) -> Self {`
`285`	`285`	`KwArgs(map)`
`286`	`286`	`}`
`287`	`287`
`@@ -290,13 +290,13 @@ impl<T> KwArgs<T> {`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`	`impl<T> From<HashMap<String, T>> for KwArgs<T> {`
`293`		`- fn from(map: HashMap<String, T>) -> Self {`
`294`		`- KwArgs(map)`
	`293`	`+ fn from(kwargs: HashMap<String, T>) -> Self {`
	`294`	`+ KwArgs(kwargs.into_iter().collect())`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`	`impl<T> Default for KwArgs<T> {`
`298`	`298`	`fn default() -> Self {`
`299`		`- KwArgs(HashMap::new())`
	`299`	`+ KwArgs(IndexMap::new())`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
`@@ -305,7 +305,7 @@ where`
`305`	`305`	`T: TryFromObject,`
`306`	`306`	`{`
`307`	`307`	`fn from_args(vm: &VirtualMachine, args: &mut PyFuncArgs) -> Result<Self, ArgumentError> {`
`308`		`- let mut kwargs = HashMap::new();`
	`308`	`+ let mut kwargs = IndexMap::new();`
`309`	`309`	`for (name, value) in args.remaining_keywords() {`
`310`	`310`	`kwargs.insert(name, T::try_from_object(vm, value)?);`
`311`	`311`	`}`
`@@ -315,7 +315,7 @@ where`
`315`	`315`
`316`	`316`	`impl<T> IntoIterator for KwArgs<T> {`
`317`	`317`	`type Item = (String, T);`
`318`		`- type IntoIter = std::collections::hash_map::IntoIter<String, T>;`
	`318`	`+ type IntoIter = indexmap::map::IntoIter<String, T>;`
`319`	`319`
`320`	`320`	`fn into_iter(self) -> Self::IntoIter {`
`321`	`321`	`self.0.into_iter()`