Skip to content

struct: remove redundant fields #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/blame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ impl<'repo> Binding for Blame<'repo> {

unsafe fn from_raw(raw: *mut raw::git_blame) -> Blame<'repo> {
Blame {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand All @@ -268,7 +268,7 @@ impl<'blame> Binding for BlameHunk<'blame> {

unsafe fn from_raw(raw: *mut raw::git_blame_hunk) -> BlameHunk<'blame> {
BlameHunk {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/blob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl<'repo> Binding for Blob<'repo> {

unsafe fn from_raw(raw: *mut raw::git_blob) -> Blob<'repo> {
Blob {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -110,7 +110,7 @@ impl<'repo> Binding for BlobWriter<'repo> {

unsafe fn from_raw(raw: *mut raw::git_writestream) -> BlobWriter<'repo> {
BlobWriter {
raw: raw,
raw,
need_cleanup: true,
_marker: marker::PhantomData,
}
Expand Down
2 changes: 1 addition & 1 deletion src/branch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl<'repo> Branches<'repo> {
/// pointer.
pub unsafe fn from_raw(raw: *mut raw::git_branch_iterator) -> Branches<'repo> {
Branches {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/cert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl<'a> Binding for Cert<'a> {
type Raw = *mut raw::git_cert;
unsafe fn from_raw(raw: *mut raw::git_cert) -> Cert<'a> {
Cert {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ impl<'repo> Binding for Commit<'repo> {
type Raw = *mut raw::git_commit;
unsafe fn from_raw(raw: *mut raw::git_commit) -> Commit<'repo> {
Commit {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ impl Config {
impl Binding for Config {
type Raw = *mut raw::git_config;
unsafe fn from_raw(raw: *mut raw::git_config) -> Config {
Config { raw: raw }
Config { raw }
}
fn raw(&self) -> *mut raw::git_config {
self.raw
Expand Down Expand Up @@ -534,7 +534,7 @@ impl<'cfg> Binding for ConfigEntry<'cfg> {

unsafe fn from_raw(raw: *mut raw::git_config_entry) -> ConfigEntry<'cfg> {
ConfigEntry {
raw: raw,
raw,
_marker: marker::PhantomData,
owned: true,
}
Expand All @@ -549,7 +549,7 @@ impl<'cfg> Binding for ConfigEntries<'cfg> {

unsafe fn from_raw(raw: *mut raw::git_config_iterator) -> ConfigEntries<'cfg> {
ConfigEntries {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand All @@ -571,7 +571,7 @@ impl<'cfg, 'b> Iterator for &'b ConfigEntries<'cfg> {
try_call_iter!(raw::git_config_next(&mut raw, self.raw));
Some(Ok(ConfigEntry {
owned: false,
raw: raw,
raw,
_marker: marker::PhantomData,
}))
}
Expand Down
2 changes: 1 addition & 1 deletion src/cred.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl Binding for Cred {
type Raw = *mut raw::git_cred;

unsafe fn from_raw(raw: *mut raw::git_cred) -> Cred {
Cred { raw: raw }
Cred { raw }
}
fn raw(&self) -> *mut raw::git_cred {
self.raw
Expand Down
2 changes: 1 addition & 1 deletion src/describe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl<'repo> Binding for Describe<'repo> {

unsafe fn from_raw(raw: *mut raw::git_describe_result) -> Describe<'repo> {
Describe {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ impl<'repo> Binding for Diff<'repo> {
type Raw = *mut raw::git_diff;
unsafe fn from_raw(raw: *mut raw::git_diff) -> Diff<'repo> {
Diff {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -545,7 +545,7 @@ impl<'a> Binding for DiffDelta<'a> {
type Raw = *mut raw::git_diff_delta;
unsafe fn from_raw(raw: *mut raw::git_diff_delta) -> DiffDelta<'a> {
DiffDelta {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -630,7 +630,7 @@ impl<'a> Binding for DiffFile<'a> {
type Raw = *const raw::git_diff_file;
unsafe fn from_raw(raw: *const raw::git_diff_file) -> DiffFile<'a> {
DiffFile {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -1081,7 +1081,7 @@ impl<'a> Binding for DiffLine<'a> {
type Raw = *const raw::git_diff_line;
unsafe fn from_raw(raw: *const raw::git_diff_line) -> DiffLine<'a> {
DiffLine {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -1143,7 +1143,7 @@ impl<'a> Binding for DiffHunk<'a> {
type Raw = *const raw::git_diff_hunk;
unsafe fn from_raw(raw: *const raw::git_diff_hunk) -> DiffHunk<'a> {
DiffHunk {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -1199,7 +1199,7 @@ impl Binding for DiffStats {
type Raw = *mut raw::git_diff_stats;

unsafe fn from_raw(raw: *mut raw::git_diff_stats) -> DiffStats {
DiffStats { raw: raw }
DiffStats { raw }
}
fn raw(&self) -> *mut raw::git_diff_stats {
self.raw
Expand Down Expand Up @@ -1248,7 +1248,7 @@ impl<'a> Binding for DiffBinary<'a> {
type Raw = *const raw::git_diff_binary;
unsafe fn from_raw(raw: *const raw::git_diff_binary) -> DiffBinary<'a> {
DiffBinary {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -1280,7 +1280,7 @@ impl<'a> Binding for DiffBinaryFile<'a> {
type Raw = *const raw::git_diff_binary_file;
unsafe fn from_raw(raw: *const raw::git_diff_binary_file) -> DiffBinaryFile<'a> {
DiffBinaryFile {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ impl Error {
}

unsafe fn from_raw(code: c_int, ptr: *const raw::git_error) -> Error {
let msg = CStr::from_ptr((*ptr).message as *const _).to_bytes();
let msg = String::from_utf8_lossy(msg).into_owned();
let message = CStr::from_ptr((*ptr).message as *const _).to_bytes();
let message = String::from_utf8_lossy(message).into_owned();
Error {
code: code,
code,
klass: (*ptr).klass,
message: msg,
message,
}
}

Expand Down
22 changes: 11 additions & 11 deletions src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ impl Index {
gid: entry.gid,
file_size: entry.file_size,
id: *entry.id.raw(),
flags: flags,
flags,
flags_extended: entry.flags_extended,
path: path.as_ptr(),
mtime: raw::git_index_time {
Expand Down Expand Up @@ -223,7 +223,7 @@ impl Index {
gid: entry.gid,
file_size: entry.file_size,
id: *entry.id.raw(),
flags: flags,
flags,
flags_extended: entry.flags_extended,
path: path.as_ptr(),
mtime: raw::git_index_time {
Expand Down Expand Up @@ -600,7 +600,7 @@ impl Index {
impl Binding for Index {
type Raw = *mut raw::git_index;
unsafe fn from_raw(raw: *mut raw::git_index) -> Index {
Index { raw: raw }
Index { raw }
}
fn raw(&self) -> *mut raw::git_index {
self.raw
Expand Down Expand Up @@ -718,15 +718,15 @@ impl Binding for IndexEntry {
let path = slice::from_raw_parts(path as *const u8, pathlen);

IndexEntry {
dev: dev,
ino: ino,
mode: mode,
uid: uid,
gid: gid,
file_size: file_size,
dev,
ino,
mode,
uid,
gid,
file_size,
id: Binding::from_raw(&id as *const _),
flags: flags,
flags_extended: flags_extended,
flags,
flags_extended,
path: path.to_vec(),
mtime: Binding::from_raw(mtime),
ctime: Binding::from_raw(ctime),
Expand Down
2 changes: 1 addition & 1 deletion src/mempack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl<'odb> Binding for Mempack<'odb> {

unsafe fn from_raw(raw: *mut raw::git_odb_backend) -> Mempack<'odb> {
Mempack {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl<'repo> Binding for AnnotatedCommit<'repo> {
type Raw = *mut raw::git_annotated_commit;
unsafe fn from_raw(raw: *mut raw::git_annotated_commit) -> AnnotatedCommit<'repo> {
AnnotatedCommit {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/note.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl<'repo> Binding for Note<'repo> {
type Raw = *mut raw::git_note;
unsafe fn from_raw(raw: *mut raw::git_note) -> Note<'repo> {
Note {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand All @@ -80,7 +80,7 @@ impl<'repo> Binding for Notes<'repo> {
type Raw = *mut raw::git_note_iterator;
unsafe fn from_raw(raw: *mut raw::git_note_iterator) -> Notes<'repo> {
Notes {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ impl<'repo> Binding for Object<'repo> {

unsafe fn from_raw(raw: *mut raw::git_object) -> Object<'repo> {
Object {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/odb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl<'repo> Binding for Odb<'repo> {

unsafe fn from_raw(raw: *mut raw::git_odb) -> Odb<'repo> {
Odb {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -273,7 +273,7 @@ impl<'a> Binding for OdbObject<'a> {

unsafe fn from_raw(raw: *mut raw::git_odb_object) -> OdbObject<'a> {
OdbObject {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -327,7 +327,7 @@ impl<'repo> Binding for OdbReader<'repo> {

unsafe fn from_raw(raw: *mut raw::git_odb_stream) -> OdbReader<'repo> {
OdbReader {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down Expand Up @@ -386,7 +386,7 @@ impl<'repo> Binding for OdbWriter<'repo> {

unsafe fn from_raw(raw: *mut raw::git_odb_stream) -> OdbWriter<'repo> {
OdbWriter {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/oid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl Oid {
s.len() as libc::size_t
));
}
Ok(Oid { raw: raw })
Ok(Oid { raw })
}

/// Parse a raw object id into an Oid structure.
Expand All @@ -52,7 +52,7 @@ impl Oid {
unsafe {
try_call!(raw::git_oid_fromraw(&mut raw, bytes.as_ptr()));
}
Ok(Oid { raw: raw })
Ok(Oid { raw })
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/oid_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl Deref for OidArray {
impl Binding for OidArray {
type Raw = raw::git_oidarray;
unsafe fn from_raw(raw: raw::git_oidarray) -> OidArray {
OidArray { raw: raw }
OidArray { raw }
}
fn raw(&self) -> raw::git_oidarray {
self.raw
Expand Down
2 changes: 1 addition & 1 deletion src/patch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl<'buffers> Binding for Patch<'buffers> {
type Raw = *mut raw::git_patch;
unsafe fn from_raw(raw: Self::Raw) -> Self {
Patch {
raw: raw,
raw,
buffers: PhantomData,
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/pathspec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ impl Binding for Pathspec {
type Raw = *mut raw::git_pathspec;

unsafe fn from_raw(raw: *mut raw::git_pathspec) -> Pathspec {
Pathspec { raw: raw }
Pathspec { raw }
}
fn raw(&self) -> *mut raw::git_pathspec {
self.raw
Expand Down Expand Up @@ -268,7 +268,7 @@ impl<'ps> Binding for PathspecMatchList<'ps> {

unsafe fn from_raw(raw: *mut raw::git_pathspec_match_list) -> PathspecMatchList<'ps> {
PathspecMatchList {
raw: raw,
raw,
_marker: marker::PhantomData,
}
}
Expand Down
Loading