Skip to content

Commit 646fd24

Browse files
committed
Rust edition = 2024
- Collapse nested if-let statements into single conditions using && - Reorder use statements to group types and functions - Simplify conditional expressions and fix minor syntax issues
1 parent ff77e64 commit 646fd24

40 files changed

Lines changed: 1024 additions & 1003 deletions

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "javascript"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
chrono = { version = "0.4", features = ["serde"] }

examples/js.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@ struct Cli {
1313
}
1414

1515
unsafe fn get_js_string(val: &JSValue) -> String {
16-
if val.get_tag() != JS_TAG_STRING {
17-
return String::new();
18-
}
19-
let p = val.get_ptr() as *mut JSString;
20-
if p.is_null() {
21-
return String::new();
16+
unsafe {
17+
if val.get_tag() != JS_TAG_STRING {
18+
return String::new();
19+
}
20+
let p = val.get_ptr() as *mut JSString;
21+
if p.is_null() {
22+
return String::new();
23+
}
24+
let len = (*p).len as usize;
25+
let str_data = (p as *mut u8).add(std::mem::size_of::<JSString>());
26+
let bytes = std::slice::from_raw_parts(str_data, len);
27+
String::from_utf8_lossy(bytes).to_string()
2228
}
23-
let len = (*p).len as usize;
24-
let str_data = (p as *mut u8).add(std::mem::size_of::<JSString>());
25-
let bytes = std::slice::from_raw_parts(str_data, len);
26-
String::from_utf8_lossy(bytes).to_string()
2729
}
2830

2931
fn main() {

0 commit comments

Comments
 (0)