mirror of
https://github.com/servo/servo.git
synced 2025-07-10 17:03:40 +01:00
Remove unnecessary Result::ok calls
This commit is contained in:
parent
91077ee418
commit
9cadf0981a
2 changed files with 4 additions and 4 deletions
|
@ -246,7 +246,7 @@ unsafe extern fn native_handler_callback(cx: *mut JSContext, argc: u32, vp: *mut
|
||||||
assert!(v.get().is_object());
|
assert!(v.get().is_object());
|
||||||
|
|
||||||
let handler = root_from_object::<PromiseNativeHandler>(v.to_object())
|
let handler = root_from_object::<PromiseNativeHandler>(v.to_object())
|
||||||
.ok().expect("unexpected value for native handler in promise native handler callback");
|
.expect("unexpected value for native handler in promise native handler callback");
|
||||||
|
|
||||||
rooted!(in(cx) let v = *GetFunctionNativeReserved(args.callee(), SLOT_NATIVEHANDLER_TASK));
|
rooted!(in(cx) let v = *GetFunctionNativeReserved(args.callee(), SLOT_NATIVEHANDLER_TASK));
|
||||||
match v.to_int32() {
|
match v.to_int32() {
|
||||||
|
|
|
@ -151,7 +151,7 @@ impl Circle {
|
||||||
#[allow(missing_docs)]
|
#[allow(missing_docs)]
|
||||||
pub fn parse_function_arguments<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
|
pub fn parse_function_arguments<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
|
||||||
-> Result<Self, ParseError<'i>> {
|
-> Result<Self, ParseError<'i>> {
|
||||||
let radius = input.try(|i| ShapeRadius::parse(context, i)).ok().unwrap_or_default();
|
let radius = input.try(|i| ShapeRadius::parse(context, i)).unwrap_or_default();
|
||||||
let position = if input.try(|i| i.expect_ident_matching("at")).is_ok() {
|
let position = if input.try(|i| i.expect_ident_matching("at")).is_ok() {
|
||||||
Position::parse(context, input)?
|
Position::parse(context, input)?
|
||||||
} else {
|
} else {
|
||||||
|
@ -192,7 +192,7 @@ impl Ellipse {
|
||||||
-> Result<Self, ParseError<'i>> {
|
-> Result<Self, ParseError<'i>> {
|
||||||
let (a, b) = input.try(|i| -> Result<_, ParseError> {
|
let (a, b) = input.try(|i| -> Result<_, ParseError> {
|
||||||
Ok((ShapeRadius::parse(context, i)?, ShapeRadius::parse(context, i)?))
|
Ok((ShapeRadius::parse(context, i)?, ShapeRadius::parse(context, i)?))
|
||||||
}).ok().unwrap_or_default();
|
}).unwrap_or_default();
|
||||||
let position = if input.try(|i| i.expect_ident_matching("at")).is_ok() {
|
let position = if input.try(|i| i.expect_ident_matching("at")).is_ok() {
|
||||||
Position::parse(context, input)?
|
Position::parse(context, input)?
|
||||||
} else {
|
} else {
|
||||||
|
@ -319,7 +319,7 @@ impl Polygon {
|
||||||
let fill = FillRule::parse(i)?;
|
let fill = FillRule::parse(i)?;
|
||||||
i.expect_comma()?; // only eat the comma if there is something before it
|
i.expect_comma()?; // only eat the comma if there is something before it
|
||||||
Ok(fill)
|
Ok(fill)
|
||||||
}).ok().unwrap_or_default();
|
}).unwrap_or_default();
|
||||||
|
|
||||||
let buf = input.parse_comma_separated(|i| {
|
let buf = input.parse_comma_separated(|i| {
|
||||||
Ok((LengthOrPercentage::parse(context, i)?, LengthOrPercentage::parse(context, i)?))
|
Ok((LengthOrPercentage::parse(context, i)?, LengthOrPercentage::parse(context, i)?))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue