Skip to content

Commit 5d9f711

Browse files
committed
fix: remove unnecessary derive for git_merge_file_input and update from_raw implementation
1 parent 9005d57 commit 5d9f711

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

libgit2-sys/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,6 @@ pub struct git_merge_file_options {
15611561
}
15621562

15631563
#[repr(C)]
1564-
#[derive(Copy, Clone)]
15651564
pub struct git_merge_file_input {
15661565
pub version: c_uint,
15671566
pub ptr: *const c_char,

src/merge.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,12 +428,8 @@ impl Default for MergeFileInput<'_> {
428428
impl Binding for MergeFileInput<'_> {
429429
type Raw = *const raw::git_merge_file_input;
430430

431-
unsafe fn from_raw(raw: *const raw::git_merge_file_input) -> MergeFileInput<'static> {
432-
MergeFileInput {
433-
raw: *raw,
434-
path: None,
435-
content: None,
436-
}
431+
unsafe fn from_raw(_raw: *const raw::git_merge_file_input) -> MergeFileInput<'static> {
432+
panic!("unimplemened")
437433
}
438434

439435
fn raw(&self) -> *const raw::git_merge_file_input {

0 commit comments

Comments
 (0)