mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Remove usage of String::from_str, deprecated in #6377
This commit is contained in:
parent
24af4c4ec6
commit
5428226e04
6 changed files with 11 additions and 13 deletions
|
@ -211,7 +211,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 6
|
// Step 6
|
||||||
let mut synthesized_declaration = String::from_str(&property);
|
let mut synthesized_declaration = property;
|
||||||
synthesized_declaration.push_str(": ");
|
synthesized_declaration.push_str(": ");
|
||||||
synthesized_declaration.push_str(&value);
|
synthesized_declaration.push_str(&value);
|
||||||
|
|
||||||
|
|
|
@ -101,10 +101,10 @@ impl<'a> WebGLRenderingContextMethods for JSRef<'a, WebGLRenderingContext> {
|
||||||
// TODO(ecoal95): Implement the missing parameters from the spec
|
// TODO(ecoal95): Implement the missing parameters from the spec
|
||||||
match parameter {
|
match parameter {
|
||||||
WebGLRenderingContextConstants::VERSION =>
|
WebGLRenderingContextConstants::VERSION =>
|
||||||
DOMString::from_str("WebGL 1.0").to_jsval(cx),
|
"WebGL 1.0".to_jsval(cx),
|
||||||
WebGLRenderingContextConstants::RENDERER |
|
WebGLRenderingContextConstants::RENDERER |
|
||||||
WebGLRenderingContextConstants::VENDOR =>
|
WebGLRenderingContextConstants::VENDOR =>
|
||||||
DOMString::from_str("Mozilla/Servo").to_jsval(cx),
|
"Mozilla/Servo".to_jsval(cx),
|
||||||
_ => NullValue(),
|
_ => NullValue(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1038,7 +1038,7 @@ fn should_move_clip_rect(clip_rect: Rect<Au>, new_viewport: Rect<f32>) -> bool{
|
||||||
}
|
}
|
||||||
|
|
||||||
fn debug_reflow_events(goal: &ReflowGoal, query_type: &ReflowQueryType, reason: &ReflowReason) {
|
fn debug_reflow_events(goal: &ReflowGoal, query_type: &ReflowQueryType, reason: &ReflowReason) {
|
||||||
let mut debug_msg = String::from_str("****");
|
let mut debug_msg = "****".to_owned();
|
||||||
debug_msg.push_str(match *goal {
|
debug_msg.push_str(match *goal {
|
||||||
ReflowGoal::ForDisplay => "\tForDisplay",
|
ReflowGoal::ForDisplay => "\tForDisplay",
|
||||||
ReflowGoal::ForScriptQuery => "\tForScriptQuery",
|
ReflowGoal::ForScriptQuery => "\tForScriptQuery",
|
||||||
|
|
|
@ -36,7 +36,7 @@ pub fn command_line_init(argc: c_int, argv: *const *const u8) {
|
||||||
for i in 0..(argc as usize) {
|
for i in 0..(argc as usize) {
|
||||||
let slice = ffi::CStr::from_ptr(*argv.offset(i as isize) as *const c_char);
|
let slice = ffi::CStr::from_ptr(*argv.offset(i as isize) as *const c_char);
|
||||||
let s = str::from_utf8(slice.to_bytes()).unwrap();
|
let s = str::from_utf8(slice.to_bytes()).unwrap();
|
||||||
a.push(String::from_str(s));
|
a.push(s.to_owned());
|
||||||
}
|
}
|
||||||
let cl = command_line_new();
|
let cl = command_line_new();
|
||||||
(*cl).argc = argc;
|
(*cl).argc = argc;
|
||||||
|
|
|
@ -40,10 +40,9 @@ pub extern "C" fn cef_string_map_append(sm: *mut cef_string_map_t, key: *const c
|
||||||
if sm.is_null() { return 0; }
|
if sm.is_null() { return 0; }
|
||||||
let v = string_map_to_treemap(sm);
|
let v = string_map_to_treemap(sm);
|
||||||
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
||||||
let s = String::from_str(result);
|
|
||||||
let csv = cef_string_userfree_utf16_alloc();
|
let csv = cef_string_userfree_utf16_alloc();
|
||||||
cef_string_utf16_set((*value).str as *const u16, (*value).length, csv, 1);
|
cef_string_utf16_set((*value).str as *const u16, (*value).length, csv, 1);
|
||||||
(*v).insert(s, csv);
|
(*v).insert(result.to_owned(), csv);
|
||||||
1
|
1
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -55,7 +54,7 @@ pub extern "C" fn cef_string_map_find(sm: *mut cef_string_map_t, key: *const cef
|
||||||
if sm.is_null() { return 0; }
|
if sm.is_null() { return 0; }
|
||||||
let v = string_map_to_treemap(sm);
|
let v = string_map_to_treemap(sm);
|
||||||
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
||||||
match (*v).get(&String::from_str(result)) {
|
match (*v).get(result) {
|
||||||
Some(s) => {
|
Some(s) => {
|
||||||
cef_string_utf16_set((**s).str as *const u16, (**s).length, value, 1);
|
cef_string_utf16_set((**s).str as *const u16, (**s).length, value, 1);
|
||||||
1
|
1
|
||||||
|
|
|
@ -44,7 +44,7 @@ pub extern "C" fn cef_string_multimap_find_count(smm: *mut cef_string_multimap_t
|
||||||
if smm.is_null() { return 0; }
|
if smm.is_null() { return 0; }
|
||||||
let v = string_multimap_to_treemap(smm);
|
let v = string_multimap_to_treemap(smm);
|
||||||
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
||||||
match (*v).get(&String::from_str(result)) {
|
match (*v).get(result) {
|
||||||
Some(s) => s.len() as c_int,
|
Some(s) => s.len() as c_int,
|
||||||
None => 0
|
None => 0
|
||||||
}
|
}
|
||||||
|
@ -58,12 +58,11 @@ pub extern "C" fn cef_string_multimap_append(smm: *mut cef_string_multimap_t, ke
|
||||||
if smm.is_null() { return 0; }
|
if smm.is_null() { return 0; }
|
||||||
let v = string_multimap_to_treemap(smm);
|
let v = string_multimap_to_treemap(smm);
|
||||||
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
||||||
let s = String::from_str(result);
|
|
||||||
let csv = cef_string_userfree_utf16_alloc();
|
let csv = cef_string_userfree_utf16_alloc();
|
||||||
cef_string_utf16_set((*value).str as *const u16, (*value).length, csv, 1);
|
cef_string_utf16_set((*value).str as *const u16, (*value).length, csv, 1);
|
||||||
match (*v).get_mut(&s) {
|
match (*v).get_mut(result) {
|
||||||
Some(vc) => (*vc).push(csv),
|
Some(vc) => (*vc).push(csv),
|
||||||
None => { (*v).insert(s, vec!(csv)); }
|
None => { (*v).insert(result.to_owned(), vec!(csv)); }
|
||||||
}
|
}
|
||||||
1
|
1
|
||||||
})
|
})
|
||||||
|
@ -76,7 +75,7 @@ pub extern "C" fn cef_string_multimap_enumerate(smm: *mut cef_string_multimap_t,
|
||||||
if smm.is_null() { return 0; }
|
if smm.is_null() { return 0; }
|
||||||
let v = string_multimap_to_treemap(smm);
|
let v = string_multimap_to_treemap(smm);
|
||||||
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
|
||||||
match (*v).get(&String::from_str(result)) {
|
match (*v).get(result) {
|
||||||
Some(s) => {
|
Some(s) => {
|
||||||
if (*s).len() <= index as usize {
|
if (*s).len() <= index as usize {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue