chore: Appease clippy

Fix `bool_assert_comparison` and `from_iter_instead_of_collect` lints.
This commit is contained in:
Mike Welsh 2021-04-24 21:02:13 -07:00
parent d43b033caa
commit c422a66aa6
2 changed files with 14 additions and 15 deletions

View File

@ -989,7 +989,7 @@ mod tests {
Attribute::DONT_DELETE,
);
assert_eq!(object.delete(activation, "test"), false);
assert!(!object.delete(activation, "test"));
assert_eq!(object.get("test", activation).unwrap(), "initial".into());
object
@ -998,7 +998,7 @@ mod tests {
.set("test", "replaced".into(), activation)
.unwrap();
assert_eq!(object.delete(activation, "test"), false);
assert!(!object.delete(activation, "test"));
assert_eq!(object.get("test", activation).unwrap(), "replaced".into());
})
}
@ -1066,11 +1066,11 @@ mod tests {
Attribute::DONT_DELETE,
);
assert_eq!(object.delete(activation, "virtual"), true);
assert_eq!(object.delete(activation, "virtual_un"), false);
assert_eq!(object.delete(activation, "stored"), true);
assert_eq!(object.delete(activation, "stored_un"), false);
assert_eq!(object.delete(activation, "non_existent"), false);
assert!(object.delete(activation, "virtual"));
assert!(!object.delete(activation, "virtual_un"));
assert!(object.delete(activation, "stored"));
assert!(!object.delete(activation, "stored_un"));
assert!(!object.delete(activation, "non_existent"));
assert_eq!(object.get("virtual", activation).unwrap(), Value::Undefined);
assert_eq!(
@ -1124,10 +1124,10 @@ mod tests {
let keys: Vec<_> = object.get_keys(activation);
assert_eq!(keys.len(), 2);
assert_eq!(keys.contains(&"stored".to_string()), true);
assert_eq!(keys.contains(&"stored_hidden".to_string()), false);
assert_eq!(keys.contains(&"virtual".to_string()), true);
assert_eq!(keys.contains(&"virtual_hidden".to_string()), false);
assert!(keys.contains(&"stored".to_string()));
assert!(!keys.contains(&"stored_hidden".to_string()));
assert!(keys.contains(&"virtual".to_string()));
assert!(!keys.contains(&"virtual_hidden".to_string()));
})
}
}

View File

@ -6,8 +6,8 @@ use crate::avm1::{
Value as Avm1Value,
};
use crate::avm2::{
Activation as Avm2Activation, ArrayObject as Avm2ArrayObject, ArrayStorage as Avm2ArrayStorage,
Error as Avm2Error, Namespace as Avm2Namespace, Object as Avm2Object, QName as Avm2QName,
Activation as Avm2Activation, ArrayObject as Avm2ArrayObject, Error as Avm2Error,
Namespace as Avm2Namespace, Object as Avm2Object, QName as Avm2QName,
ScriptObject as Avm2ScriptObject, TObject as Avm2TObject, Value as Avm2Value,
};
use crate::context::UpdateContext;
@ -17,7 +17,6 @@ use crate::xml::{Step, XmlDocument, XmlName, XmlNode};
use gc_arena::{Collect, MutationContext};
use std::borrow::Cow;
use std::cmp::{min, Ordering};
use std::iter::FromIterator;
use std::sync::Arc;
/// Replace HTML entities with their equivalent characters.
@ -855,7 +854,7 @@ impl TextFormat {
)?;
if let Some(ts) = &self.tab_stops {
let tab_stop_storage = Avm2ArrayStorage::from_iter(ts.iter().copied());
let tab_stop_storage = ts.iter().copied().collect();
let tab_stops = Avm2ArrayObject::from_array(
tab_stop_storage,
activation.context.avm2.prototypes().array,