foster/rusty-v8
0
0
Fork 0
mirror of https://github.com/denoland/rusty_v8.git synced 2025-03-09 13:38:51 -04:00
Code Issues Activity

Add Value::to_rust_string_lossy() (#530)

Browse source 
If it's convenient to have on String objects, then it's convenient to
have on all Value instances.
This commit is contained in:
Ben Noordhuis 2020-11-19 11:58:23 +01:00 • committed by GitHub
parent b9f48ebd26
commit 64faf683d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/string.rs
View file

@ -134,7 +134,7 @@ impl String {
Self::new_from_utf8(scope, value.as_ref(), NewStringType::Normal)
}
// Convenience function not present in the original V8 API.
/// Convenience function not present in the original V8 API.
pub fn to_rust_string_lossy(
&self,
scope: &mut Isolate,

10
src/value.rs
View file

@ -478,6 +478,16 @@ impl Value {
}
}
/// Convenience function not present in the original V8 API.
pub fn to_rust_string_lossy<'s>(
&self,
scope: &mut HandleScope<'s>,
) -> std::string::String {
self
.to_string(scope)
.map_or_else(std::string::String::new, |s| s.to_rust_string_lossy(scope))
}
pub fn to_detail_string<'s>(
&self,
scope: &mut HandleScope<'s>,

30
tests/test_api.rs
View file

@ -702,11 +702,7 @@ fn try_catch_caught_lifetime() {
(caught_exc, caught_msg)
};
// This should not crash.
assert!(caught_exc
.to_string(scope)
.unwrap()
.to_rust_string_lossy(scope)
.contains("DANG"));
assert!(caught_exc.to_rust_string_lossy(scope).contains("DANG"));
assert!(caught_msg
.get(scope)
.to_rust_string_lossy(scope)
@ -941,7 +937,6 @@ fn script_compile_and_run() {
let script = v8::Script::compile(scope, source, None).unwrap();
source.to_rust_string_lossy(scope);
let result = script.run(scope).unwrap();
let result = result.to_string(scope).unwrap();
assert_eq!(result.to_rust_string_lossy(scope), "Hello 13th planet");
}
}
@ -1512,15 +1507,13 @@ fn promise_resolved() {
resolver.resolve(scope, value.into());
assert_eq!(promise.state(), v8::PromiseState::Fulfilled);
let result = promise.result(scope);
let result_str = result.to_string(scope).unwrap();
assert_eq!(result_str.to_rust_string_lossy(scope), "test".to_string());
assert_eq!(result.to_rust_string_lossy(scope), "test".to_string());
// Resolve again with different value, since promise is already in
// `Fulfilled` state it should be ignored.
let value = v8::String::new(scope, "test2").unwrap();
resolver.resolve(scope, value.into());
let result = promise.result(scope);
let result_str = result.to_string(scope).unwrap();
assert_eq!(result_str.to_rust_string_lossy(scope), "test".to_string());
assert_eq!(result.to_rust_string_lossy(scope), "test".to_string());
}
}
@ -1543,15 +1536,13 @@ fn promise_rejected() {
assert!(rejected.unwrap());
assert_eq!(promise.state(), v8::PromiseState::Rejected);
let result = promise.result(scope);
let result_str = result.to_string(scope).unwrap();
assert_eq!(result_str.to_rust_string_lossy(scope), "test".to_string());
assert_eq!(result.to_rust_string_lossy(scope), "test".to_string());
// Reject again with different value, since promise is already in `Rejected`
// state it should be ignored.
let value = v8::String::new(scope, "test2").unwrap();
resolver.reject(scope, value.into());
let result = promise.result(scope);
let result_str = result.to_string(scope).unwrap();
assert_eq!(result_str.to_rust_string_lossy(scope), "test".to_string());
assert_eq!(result.to_rust_string_lossy(scope), "test".to_string());
}
}
#[test]
@ -1656,9 +1647,8 @@ fn function() {
let value = function
.call(scope, recv, &[arg1.into(), arg2.into()])
.unwrap();
let value_str = value.to_string(scope).unwrap();
let rust_str = value_str.to_rust_string_lossy(scope);
assert_eq!(rust_str, "Hello callback!".to_string());
let value_str = value.to_rust_string_lossy(scope);
assert_eq!(value_str, "Hello callback!".to_string());
// create a function with associated data
let true_data = v8::Boolean::new(scope, true);
let function = v8::Function::new_with_data(
@ -1701,9 +1691,8 @@ extern "C" fn promise_reject_callback(msg: v8::PromiseRejectMessage) {
let value = msg.get_value().unwrap();
{
let scope = &mut v8::HandleScope::new(scope);
let value_str = value.to_string(scope).unwrap();
let rust_str = value_str.to_rust_string_lossy(scope);
assert_eq!(rust_str, "promise rejected".to_string());
let value_str = value.to_rust_string_lossy(scope);
assert_eq!(value_str, "promise rejected".to_string());
}
}
@ -3445,7 +3434,6 @@ fn test_prototype_api() {
let sub_gotten = obj.get(scope, key_local).unwrap();
assert!(sub_gotten.is_string());
let sub_gotten = sub_gotten.to_string(scope).unwrap();
assert_eq!(sub_gotten.to_rust_string_lossy(scope), "test_proto_value");
}
{