core: Fix clippy lints and format

This commit is contained in:
CUB3D 2020-08-24 18:02:15 +01:00 committed by Mike Welsh
parent a2c151677b
commit 143ba03754
4 changed files with 3 additions and 15 deletions

View File

@ -4,11 +4,9 @@ use crate::avm1::activation::Activation;
use crate::avm1::error::Error; use crate::avm1::error::Error;
use crate::avm1::function::{Executable, FunctionObject}; use crate::avm1::function::{Executable, FunctionObject};
use crate::avm1::object::blur_filter::BlurFilterObject; use crate::avm1::object::blur_filter::BlurFilterObject;
use crate::avm1::property::Attribute;
use crate::avm1::{Object, TObject, Value}; use crate::avm1::{Object, TObject, Value};
use enumset::EnumSet; use enumset::EnumSet;
use gc_arena::MutationContext; use gc_arena::MutationContext;
use quick_xml::events::attributes::Attributes;
pub fn constructor<'gc>( pub fn constructor<'gc>(
activation: &mut Activation<'_, 'gc, '_>, activation: &mut Activation<'_, 'gc, '_>,
@ -33,15 +31,11 @@ pub fn constructor<'gc>(
.coerce_to_i32(activation) .coerce_to_i32(activation)
.map(|x| x.max(0).min(15))?; .map(|x| x.max(0).min(15))?;
println!("args = {}, {}, {}", blur_x, blur_y, quality);
let blur_filter = this.as_blur_filter_object().unwrap(); let blur_filter = this.as_blur_filter_object().unwrap();
blur_filter.set_blur_x(activation.context.gc_context, blur_x.into()); blur_filter.set_blur_x(activation.context.gc_context, blur_x);
blur_filter.set_blur_y(activation.context.gc_context, blur_y.into()); blur_filter.set_blur_y(activation.context.gc_context, blur_y);
blur_filter.set_quality(activation.context.gc_context, quality.into()); blur_filter.set_quality(activation.context.gc_context, quality);
println!("constructor called, bf: {:?}", blur_filter);
Ok(Value::Undefined) Ok(Value::Undefined)
} }
@ -66,7 +60,6 @@ pub fn get_blur_x<'gc>(
this: Object<'gc>, this: Object<'gc>,
_args: &[Value<'gc>], _args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> { ) -> Result<Value<'gc>, Error<'gc>> {
println!("Get blur x");
Ok(this.as_blur_filter_object().unwrap().get_blur_x().into()) Ok(this.as_blur_filter_object().unwrap().get_blur_x().into())
} }
@ -150,7 +143,6 @@ pub fn create_proto<'gc>(
object.force_set_function("clone", clone, gc_context, EnumSet::empty(), Some(fn_proto)); object.force_set_function("clone", clone, gc_context, EnumSet::empty(), Some(fn_proto));
//TODO: check attribs
object.add_property( object.add_property(
gc_context, gc_context,
"blurX", "blurX",

View File

@ -34,7 +34,3 @@ false
255 255
// oob_over.quality // oob_over.quality
15 15
// prototype[clone] = [type Function]
// prototype[quality] = undefined
// prototype[blurY] = undefined
// prototype[blurX] = undefined