Skip to content

Commit b783f49

Browse files
committed
refactor: use cstr_to_string (again)
Most places where cstr_to_string can be used are now using it, except for 2 places left, where it's not trivial to replace, due to borrow checker restrictions (mostly, because of stupidly written Rust code, that needs some extra refactoring).
1 parent 869c85f commit b783f49

File tree

1 file changed

+1
-6
lines changed
  • gems/codetracer-ruby-recorder/ext/native_tracer/src

1 file changed

+1
-6
lines changed

gems/codetracer-ruby-recorder/ext/native_tracer/src/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -802,12 +802,7 @@ unsafe extern "C" fn event_hook_raw(data: VALUE, arg: *mut rb_trace_arg_t) {
802802
args.extend(register_parameter_values(recorder, param_vals));
803803
}
804804
TraceWriter::register_step(&mut *recorder.tracer, Path::new(&path), Line(line));
805-
let name_c = rb_id2name(mid);
806-
let mut name = if !name_c.is_null() {
807-
CStr::from_ptr(name_c).to_str().unwrap_or("").to_string()
808-
} else {
809-
String::new()
810-
};
805+
let mut name = cstr_to_string(rb_id2name(mid)).unwrap_or_default();
811806
if class_name != "Object" {
812807
name = format!("{}#{}", class_name, name);
813808
}

0 commit comments

Comments
 (0)