update servo-url and fix detection (#789)

Author: anonrig

benchmarks/CMakeLists.txt

@@ -207,7 +207,7 @@ endif()
 # Boost
 if(ADA_BOOST_URL)
 find_package(
-    Boost 1.80
+    Boost 1.86
     COMPONENTS system
 )
 endif(ADA_BOOST_URL)
@@ -258,7 +258,7 @@ if(NOT WIN32)
 CPMAddPackage(
   NAME corrosion
   GITHUB_REPOSITORY corrosion-rs/corrosion
-  VERSION 0.4.4
+  VERSION 0.5.0
   DOWNLOAD_ONLY ON
   OPTIONS "Rust_FIND_QUIETLY OFF"
 )
@@ -272,22 +272,24 @@ if(RUST_FOUND)
   corrosion_import_crate(MANIFEST_PATH "competitors/servo-url/Cargo.toml" NO_LINKER_OVERRIDE PROFILE release)
 
   # Check if servo-url target was created successfully
-  if(TARGET servo-url)
-    message(STATUS "servo-url target was created. Linking benchmarks and servo-url.")
-    target_link_libraries(bench PRIVATE servo-url)
+  if(TARGET servo_url)
+    message(STATUS "servo_url target was created. Linking benchmarks and servo_url. ")
+    target_link_libraries(bench PRIVATE servo_url)
     target_compile_definitions(bench PRIVATE ADA_RUST_VERSION="${Rust_VERSION}")
 
-    target_link_libraries(benchdata PRIVATE servo-url)
+    target_link_libraries(benchdata PRIVATE servo_url)
     target_compile_definitions(benchdata PRIVATE ADA_RUST_VERSION="${Rust_VERSION}")
 
-    target_link_libraries(bbc_bench PRIVATE servo-url)
+    target_link_libraries(bbc_bench PRIVATE servo_url)
     target_compile_definitions(bbc_bench PRIVATE ADA_RUST_VERSION="${Rust_VERSION}")
 
-    target_link_libraries(percent_encode PRIVATE servo-url)
+    target_link_libraries(percent_encode PRIVATE servo_url)
     target_compile_definitions(percent_encode PRIVATE ADA_RUST_VERSION="${Rust_VERSION}")
 
-    target_link_libraries(wpt_bench PRIVATE servo-url)
+    target_link_libraries(wpt_bench PRIVATE servo_url)
     target_compile_definitions(wpt_bench PRIVATE ADA_RUST_VERSION="${Rust_VERSION}")
+  else()
+    message(SEND_ERROR "Rust servo-url target was not created successfully. Likely due to a bug.")
   endif()
 else()
   message(STATUS "Rust/Cargo is unavailable." )

benchmarks/competitors/servo-url/Cargo.lock

@@ -1,13 +1,14 @@
 [package]
 name = "servo-url"
 version = "0.1.0"
+edition = "2021"
 
 [lib]
 path = "lib.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-url = "2.5.3"
+url = "2.5.4"
 libc = "0.2"
 
 [profile.release]

benchmarks/competitors/servo-url/Cargo.toml

@@ -5,9 +5,9 @@ use libc::{c_char, size_t};
 extern crate url;
 extern crate libc;
 
-#[no_mangle]
-pub unsafe extern "C" fn parse_url(raw_input: *const c_char, raw_input_length: size_t) -> *mut Url {
-  let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
+#[unsafe(no_mangle)]
+pub extern "C" fn parse_url(raw_input: *const c_char, raw_input_length: size_t) -> *mut Url {
+  let input = unsafe { std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length)) };
   // This code would assume that the URL is parsed successfully:
   // let result = Url::parse(input).unwrap();
   // Box::into_raw(Box::new(result))
@@ -19,26 +19,26 @@ pub unsafe extern "C" fn parse_url(raw_input: *const c_char, raw_input_length: s
   }
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn parse_url_to_href(raw_input: *const c_char, raw_input_length: size_t) -> *const c_char {
-  let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
+#[unsafe(no_mangle)]
+pub extern "C" fn parse_url_to_href(raw_input: *const c_char, raw_input_length: size_t) -> *const c_char {
+  let input = unsafe { std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length)) };
   match Url::parse(input) {
     Ok(result) => std::ffi::CString::new(result.as_str()).unwrap().into_raw(),
     Err(_) => std::ptr::null_mut(),
   }
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn free_url(raw: *mut Url) {
+#[unsafe(no_mangle)]
+pub extern "C" fn free_url(raw: *mut Url) {
   if raw.is_null() {
     return;
   }
 
-  drop(Box::from_raw(raw))
+  unsafe { drop(Box::from_raw(raw)) }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern fn free_string(ptr: *const c_char) {
     // Take the ownership back to rust and drop the owner
-    let _ = std::ffi::CString::from_raw(ptr as *mut _);
+    let _ = unsafe { std::ffi::CString::from_raw(ptr as *mut _) };
 }