servo: Merge #14527 - Remove some redundant code around XMLHttpRequest::document_response() (from servo:xhr-doc); r=Manishearth

marco-c · marco-c · commit 3d4814e98cca · 2019-10-01T01:07:12.000Z
Source-Repo: https://github.com/servo/servo Source-Revision: c3c086e521b73d191d5de9239a6748691b0f96a3 UltraBlame original commit: e9324af352ad6a215543c5d0735ea615fa00c554
diff --git a/servo/components/script/dom/xmlhttprequest.rs b/servo/components/script/dom/xmlhttprequest.rs
@@ -193,21 +193,7 @@ js
 JS
 MutHeapJSVal
 MutNullableHeap
-}
-;
-use
-dom
-:
-:
-bindings
-:
-:
-js
-:
-:
-{
 Root
-RootedReference
 }
 ;
 use
@@ -5987,25 +5973,11 @@ Document
 =
 >
 {
-let
-op_doc
-=
 self
 .
 document_response
 (
 )
-;
-if
-let
-Some
-(
-doc
-)
-=
-op_doc
-{
-doc
 .
 to_jsval
 (
@@ -6018,19 +5990,6 @@ handle_mut
 )
 ;
 }
-else
-{
-/
-/
-Substep
-1
-return
-NullValue
-(
-)
-;
-}
-}
 XMLHttpRequestResponseType
 :
 :
@@ -6377,42 +6336,9 @@ Ok
 (
 self
 .
-response_xml
-.
-get
-(
-)
-.
-or_else
-(
-|
-|
-{
-let
-response
-=
-self
-.
 document_response
 (
 )
-;
-self
-.
-response_xml
-.
-set
-(
-response
-.
-r
-(
-)
-)
-;
-response
-}
-)
 )
 }
 else

Original file line number	Diff line number	Diff line change
`@@ -193,21 +193,7 @@ js`
`193`	`193`	`JS`
`194`	`194`	`MutHeapJSVal`
`195`	`195`	`MutNullableHeap`
`196`		`-}`
`197`		`-;`
`198`		`-use`
`199`		`-dom`
`200`		`-:`
`201`		`-:`
`202`		`-bindings`
`203`		`-:`
`204`		`-:`
`205`		`-js`
`206`		`-:`
`207`		`-:`
`208`		`-{`
`209`	`196`	`Root`
`210`		`-RootedReference`
`211`	`197`	`}`
`212`	`198`	`;`
`213`	`199`	`use`
`@@ -5987,25 +5973,11 @@ Document`
`5987`	`5973`	`=`
`5988`	`5974`	`>`
`5989`	`5975`	`{`
`5990`		`-let`
`5991`		`-op_doc`
`5992`		`-=`
`5993`	`5976`	`self`
`5994`	`5977`	`.`
`5995`	`5978`	`document_response`
`5996`	`5979`	`(`
`5997`	`5980`	`)`
`5998`		`-;`
`5999`		`-if`
`6000`		`-let`
`6001`		`-Some`
`6002`		`-(`
`6003`		`-doc`
`6004`		`-)`
`6005`		`-=`
`6006`		`-op_doc`
`6007`		`-{`
`6008`		`-doc`
`6009`	`5981`	`.`
`6010`	`5982`	`to_jsval`
`6011`	`5983`	`(`
`@@ -6018,19 +5990,6 @@ handle_mut`
`6018`	`5990`	`)`
`6019`	`5991`	`;`
`6020`	`5992`	`}`
`6021`		`-else`
`6022`		`-{`
`6023`		`-/`
`6024`		`-/`
`6025`		`-Substep`
`6026`		`-1`
`6027`		`-return`
`6028`		`-NullValue`
`6029`		`-(`
`6030`		`-)`
`6031`		`-;`
`6032`		`-}`
`6033`		`-}`
`6034`	`5993`	`XMLHttpRequestResponseType`
`6035`	`5994`	`:`
`6036`	`5995`	`:`
`@@ -6377,42 +6336,9 @@ Ok`
`6377`	`6336`	`(`
`6378`	`6337`	`self`
`6379`	`6338`	`.`
`6380`		`-response_xml`
`6381`		`-.`
`6382`		`-get`
`6383`		`-(`
`6384`		`-)`
`6385`		`-.`
`6386`		`-or_else`
`6387`		`-(`
`6388`		`-\|`
`6389`		`-\|`
`6390`		`-{`
`6391`		`-let`
`6392`		`-response`
`6393`		`-=`
`6394`		`-self`
`6395`		`-.`
`6396`	`6339`	`document_response`
`6397`	`6340`	`(`
`6398`	`6341`	`)`
`6399`		`-;`
`6400`		`-self`
`6401`		`-.`
`6402`		`-response_xml`
`6403`		`-.`
`6404`		`-set`
`6405`		`-(`
`6406`		`-response`
`6407`		`-.`
`6408`		`-r`
`6409`		`-(`
`6410`		`-)`
`6411`		`-)`
`6412`		`-;`
`6413`		`-response`
`6414`		`-}`
`6415`		`-)`
`6416`	`6342`	`)`
`6417`	`6343`	`}`
`6418`	`6344`	`else`