diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-17 18:45:49 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-17 18:45:49 -0700 |
| commit | fbf42c951b2f53d91e2f32f8035484a07ea83493 (patch) | |
| tree | 1d7bfb30cbddebba633fe1f2c8844cf4133aabc1 /components/script/devtools.rs | |
| parent | b8900782b0fcb409f37189bdc08eb7f8b3564a5f (diff) | |
| parent | 1a9be88a1d1f9138287f5b1ee04300b7e1bd7025 (diff) | |
| download | servo-fbf42c951b2f53d91e2f32f8035484a07ea83493.tar.gz servo-fbf42c951b2f53d91e2f32f8035484a07ea83493.zip | |
auto merge of #4405 : servo/servo/rustup_20141124, r=jdm
Diffstat (limited to 'components/script/devtools.rs')
| -rw-r--r-- | components/script/devtools.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs index a829a68293f..c92098db2be 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -4,8 +4,8 @@ use devtools_traits; use devtools_traits::{EvaluateJSReply, NodeInfo, Modification}; -use dom::bindings::conversions; use dom::bindings::conversions::FromJSValConvertible; +use dom::bindings::conversions::StringificationBehavior; use dom::bindings::js::{JSRef, Temporary, OptionalRootable}; use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast}; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; @@ -36,7 +36,7 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r devtools_traits::NumberValue(FromJSValConvertible::from_jsval(cx, rval, ()).unwrap()) } else if rval.is_string() { //FIXME: use jsstring_to_str when jsval grows to_jsstring - devtools_traits::StringValue(FromJSValConvertible::from_jsval(cx, rval, conversions::Default).unwrap()) + devtools_traits::StringValue(FromJSValConvertible::from_jsval(cx, rval, StringificationBehavior::Default).unwrap()) } else if rval.is_null() { devtools_traits::NullValue } else { |