Skip to content

Commit db3799a

Browse files
HorkiHorki
authored
struct: remove redundant fields (rust-lang#716)
* struct: remove redundant fields * redundant: fix revspec fmt
1 parent 0454efb commit db3799a

37 files changed

+81
-84
lines changed

‎src/blame.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ impl<'repo> Binding for Blame<'repo> {
247247

248248
unsafe fn from_raw(raw: *mut raw::git_blame) -> Blame<'repo> {
249249
Blame {
250-
raw: raw,
250+
raw,
251251
_marker: marker::PhantomData,
252252
}
253253
}
@@ -268,7 +268,7 @@ impl<'blame> Binding for BlameHunk<'blame> {
268268

269269
unsafe fn from_raw(raw: *mut raw::git_blame_hunk) -> BlameHunk<'blame> {
270270
BlameHunk {
271-
raw: raw,
271+
raw,
272272
_marker: marker::PhantomData,
273273
}
274274
}

‎src/blob.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<'repo> Binding for Blob<'repo> {
5656

5757
unsafe fn from_raw(raw: *mut raw::git_blob) -> Blob<'repo> {
5858
Blob {
59-
raw: raw,
59+
raw,
6060
_marker: marker::PhantomData,
6161
}
6262
}
@@ -110,7 +110,7 @@ impl<'repo> Binding for BlobWriter<'repo> {
110110

111111
unsafe fn from_raw(raw: *mut raw::git_writestream) -> BlobWriter<'repo> {
112112
BlobWriter {
113-
raw: raw,
113+
raw,
114114
need_cleanup: true,
115115
_marker: marker::PhantomData,
116116
}

‎src/branch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl<'repo> Branches<'repo> {
130130
/// pointer.
131131
pub unsafe fn from_raw(raw: *mut raw::git_branch_iterator) -> Branches<'repo> {
132132
Branches {
133-
raw: raw,
133+
raw,
134134
_marker: marker::PhantomData,
135135
}
136136
}

‎src/cert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl<'a> Binding for Cert<'a> {
100100
type Raw = *mut raw::git_cert;
101101
unsafe fn from_raw(raw: *mut raw::git_cert) -> Cert<'a> {
102102
Cert {
103-
raw: raw,
103+
raw,
104104
_marker: marker::PhantomData,
105105
}
106106
}

‎src/commit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ impl<'repo> Binding for Commit<'repo> {
313313
type Raw = *mut raw::git_commit;
314314
unsafe fn from_raw(raw: *mut raw::git_commit) -> Commit<'repo> {
315315
Commit {
316-
raw: raw,
316+
raw,
317317
_marker: marker::PhantomData,
318318
}
319319
}

‎src/config.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ impl Config {
465465
impl Binding for Config {
466466
type Raw = *mut raw::git_config;
467467
unsafe fn from_raw(raw: *mut raw::git_config) -> Config {
468-
Config { raw: raw }
468+
Config { raw }
469469
}
470470
fn raw(&self) -> *mut raw::git_config {
471471
self.raw
@@ -534,7 +534,7 @@ impl<'cfg> Binding for ConfigEntry<'cfg> {
534534

535535
unsafe fn from_raw(raw: *mut raw::git_config_entry) -> ConfigEntry<'cfg> {
536536
ConfigEntry {
537-
raw: raw,
537+
raw,
538538
_marker: marker::PhantomData,
539539
owned: true,
540540
}
@@ -549,7 +549,7 @@ impl<'cfg> Binding for ConfigEntries<'cfg> {
549549

550550
unsafe fn from_raw(raw: *mut raw::git_config_iterator) -> ConfigEntries<'cfg> {
551551
ConfigEntries {
552-
raw: raw,
552+
raw,
553553
_marker: marker::PhantomData,
554554
}
555555
}
@@ -571,7 +571,7 @@ impl<'cfg, 'b> Iterator for &'b ConfigEntries<'cfg> {
571571
try_call_iter!(raw::git_config_next(&mut raw, self.raw));
572572
Some(Ok(ConfigEntry {
573573
owned: false,
574-
raw: raw,
574+
raw,
575575
_marker: marker::PhantomData,
576576
}))
577577
}

‎src/cred.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl Binding for Cred {
171171
type Raw = *mut raw::git_cred;
172172

173173
unsafe fn from_raw(raw: *mut raw::git_cred) -> Cred {
174-
Cred { raw: raw }
174+
Cred { raw }
175175
}
176176
fn raw(&self) -> *mut raw::git_cred {
177177
self.raw

‎src/describe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl<'repo> Binding for Describe<'repo> {
4444

4545
unsafe fn from_raw(raw: *mut raw::git_describe_result) -> Describe<'repo> {
4646
Describe {
47-
raw: raw,
47+
raw,
4848
_marker: marker::PhantomData,
4949
}
5050
}

‎src/diff.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ impl<'repo> Binding for Diff<'repo> {
447447
type Raw = *mut raw::git_diff;
448448
unsafe fn from_raw(raw: *mut raw::git_diff) -> Diff<'repo> {
449449
Diff {
450-
raw: raw,
450+
raw,
451451
_marker: marker::PhantomData,
452452
}
453453
}
@@ -545,7 +545,7 @@ impl<'a> Binding for DiffDelta<'a> {
545545
type Raw = *mut raw::git_diff_delta;
546546
unsafe fn from_raw(raw: *mut raw::git_diff_delta) -> DiffDelta<'a> {
547547
DiffDelta {
548-
raw: raw,
548+
raw,
549549
_marker: marker::PhantomData,
550550
}
551551
}
@@ -630,7 +630,7 @@ impl<'a> Binding for DiffFile<'a> {
630630
type Raw = *const raw::git_diff_file;
631631
unsafe fn from_raw(raw: *const raw::git_diff_file) -> DiffFile<'a> {
632632
DiffFile {
633-
raw: raw,
633+
raw,
634634
_marker: marker::PhantomData,
635635
}
636636
}
@@ -1081,7 +1081,7 @@ impl<'a> Binding for DiffLine<'a> {
10811081
type Raw = *const raw::git_diff_line;
10821082
unsafe fn from_raw(raw: *const raw::git_diff_line) -> DiffLine<'a> {
10831083
DiffLine {
1084-
raw: raw,
1084+
raw,
10851085
_marker: marker::PhantomData,
10861086
}
10871087
}
@@ -1143,7 +1143,7 @@ impl<'a> Binding for DiffHunk<'a> {
11431143
type Raw = *const raw::git_diff_hunk;
11441144
unsafe fn from_raw(raw: *const raw::git_diff_hunk) -> DiffHunk<'a> {
11451145
DiffHunk {
1146-
raw: raw,
1146+
raw,
11471147
_marker: marker::PhantomData,
11481148
}
11491149
}
@@ -1199,7 +1199,7 @@ impl Binding for DiffStats {
11991199
type Raw = *mut raw::git_diff_stats;
12001200

12011201
unsafe fn from_raw(raw: *mut raw::git_diff_stats) -> DiffStats {
1202-
DiffStats { raw: raw }
1202+
DiffStats { raw }
12031203
}
12041204
fn raw(&self) -> *mut raw::git_diff_stats {
12051205
self.raw
@@ -1248,7 +1248,7 @@ impl<'a> Binding for DiffBinary<'a> {
12481248
type Raw = *const raw::git_diff_binary;
12491249
unsafe fn from_raw(raw: *const raw::git_diff_binary) -> DiffBinary<'a> {
12501250
DiffBinary {
1251-
raw: raw,
1251+
raw,
12521252
_marker: marker::PhantomData,
12531253
}
12541254
}
@@ -1280,7 +1280,7 @@ impl<'a> Binding for DiffBinaryFile<'a> {
12801280
type Raw = *const raw::git_diff_binary_file;
12811281
unsafe fn from_raw(raw: *const raw::git_diff_binary_file) -> DiffBinaryFile<'a> {
12821282
DiffBinaryFile {
1283-
raw: raw,
1283+
raw,
12841284
_marker: marker::PhantomData,
12851285
}
12861286
}

‎src/error.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ impl Error {
6969
}
7070

7171
unsafe fn from_raw(code: c_int, ptr: *const raw::git_error) -> Error {
72-
let msg = CStr::from_ptr((*ptr).message as *const _).to_bytes();
73-
let msg = String::from_utf8_lossy(msg).into_owned();
72+
let message = CStr::from_ptr((*ptr).message as *const _).to_bytes();
73+
let message = String::from_utf8_lossy(message).into_owned();
7474
Error {
75-
code: code,
75+
code,
7676
klass: (*ptr).klass,
77-
message: msg,
77+
message,
7878
}
7979
}
8080

‎src/index.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl Index {
166166
gid: entry.gid,
167167
file_size: entry.file_size,
168168
id: *entry.id.raw(),
169-
flags: flags,
169+
flags,
170170
flags_extended: entry.flags_extended,
171171
path: path.as_ptr(),
172172
mtime: raw::git_index_time {
@@ -223,7 +223,7 @@ impl Index {
223223
gid: entry.gid,
224224
file_size: entry.file_size,
225225
id: *entry.id.raw(),
226-
flags: flags,
226+
flags,
227227
flags_extended: entry.flags_extended,
228228
path: path.as_ptr(),
229229
mtime: raw::git_index_time {
@@ -600,7 +600,7 @@ impl Index {
600600
impl Binding for Index {
601601
type Raw = *mut raw::git_index;
602602
unsafe fn from_raw(raw: *mut raw::git_index) -> Index {
603-
Index { raw: raw }
603+
Index { raw }
604604
}
605605
fn raw(&self) -> *mut raw::git_index {
606606
self.raw
@@ -718,15 +718,15 @@ impl Binding for IndexEntry {
718718
let path = slice::from_raw_parts(path as *const u8, pathlen);
719719

720720
IndexEntry {
721-
dev: dev,
722-
ino: ino,
723-
mode: mode,
724-
uid: uid,
725-
gid: gid,
726-
file_size: file_size,
721+
dev,
722+
ino,
723+
mode,
724+
uid,
725+
gid,
726+
file_size,
727727
id: Binding::from_raw(&id as *const _),
728-
flags: flags,
729-
flags_extended: flags_extended,
728+
flags,
729+
flags_extended,
730730
path: path.to_vec(),
731731
mtime: Binding::from_raw(mtime),
732732
ctime: Binding::from_raw(ctime),

‎src/mempack.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl<'odb> Binding for Mempack<'odb> {
1616

1717
unsafe fn from_raw(raw: *mut raw::git_odb_backend) -> Mempack<'odb> {
1818
Mempack {
19-
raw: raw,
19+
raw,
2020
_marker: marker::PhantomData,
2121
}
2222
}

‎src/merge.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl<'repo> Binding for AnnotatedCommit<'repo> {
178178
type Raw = *mut raw::git_annotated_commit;
179179
unsafe fn from_raw(raw: *mut raw::git_annotated_commit) -> AnnotatedCommit<'repo> {
180180
AnnotatedCommit {
181-
raw: raw,
181+
raw,
182182
_marker: marker::PhantomData,
183183
}
184184
}

‎src/note.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl<'repo> Binding for Note<'repo> {
5353
type Raw = *mut raw::git_note;
5454
unsafe fn from_raw(raw: *mut raw::git_note) -> Note<'repo> {
5555
Note {
56-
raw: raw,
56+
raw,
5757
_marker: marker::PhantomData,
5858
}
5959
}
@@ -80,7 +80,7 @@ impl<'repo> Binding for Notes<'repo> {
8080
type Raw = *mut raw::git_note_iterator;
8181
unsafe fn from_raw(raw: *mut raw::git_note_iterator) -> Notes<'repo> {
8282
Notes {
83-
raw: raw,
83+
raw,
8484
_marker: marker::PhantomData,
8585
}
8686
}

‎src/object.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl<'repo> Binding for Object<'repo> {
232232

233233
unsafe fn from_raw(raw: *mut raw::git_object) -> Object<'repo> {
234234
Object {
235-
raw: raw,
235+
raw,
236236
_marker: marker::PhantomData,
237237
}
238238
}

‎src/odb.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl<'repo> Binding for Odb<'repo> {
2323

2424
unsafe fn from_raw(raw: *mut raw::git_odb) -> Odb<'repo> {
2525
Odb {
26-
raw: raw,
26+
raw,
2727
_marker: marker::PhantomData,
2828
}
2929
}
@@ -273,7 +273,7 @@ impl<'a> Binding for OdbObject<'a> {
273273

274274
unsafe fn from_raw(raw: *mut raw::git_odb_object) -> OdbObject<'a> {
275275
OdbObject {
276-
raw: raw,
276+
raw,
277277
_marker: marker::PhantomData,
278278
}
279279
}
@@ -327,7 +327,7 @@ impl<'repo> Binding for OdbReader<'repo> {
327327

328328
unsafe fn from_raw(raw: *mut raw::git_odb_stream) -> OdbReader<'repo> {
329329
OdbReader {
330-
raw: raw,
330+
raw,
331331
_marker: marker::PhantomData,
332332
}
333333
}
@@ -386,7 +386,7 @@ impl<'repo> Binding for OdbWriter<'repo> {
386386

387387
unsafe fn from_raw(raw: *mut raw::git_odb_stream) -> OdbWriter<'repo> {
388388
OdbWriter {
389-
raw: raw,
389+
raw,
390390
_marker: marker::PhantomData,
391391
}
392392
}

‎src/oid.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl Oid {
3535
s.len() as libc::size_t
3636
));
3737
}
38-
Ok(Oid { raw: raw })
38+
Ok(Oid { raw })
3939
}
4040

4141
/// Parse a raw object id into an Oid structure.
@@ -52,7 +52,7 @@ impl Oid {
5252
unsafe {
5353
try_call!(raw::git_oid_fromraw(&mut raw, bytes.as_ptr()));
5454
}
55-
Ok(Oid { raw: raw })
55+
Ok(Oid { raw })
5656
}
5757
}
5858

‎src/oid_array.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl Deref for OidArray {
3232
impl Binding for OidArray {
3333
type Raw = raw::git_oidarray;
3434
unsafe fn from_raw(raw: raw::git_oidarray) -> OidArray {
35-
OidArray { raw: raw }
35+
OidArray { raw }
3636
}
3737
fn raw(&self) -> raw::git_oidarray {
3838
self.raw

‎src/patch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl<'buffers> Binding for Patch<'buffers> {
2121
type Raw = *mut raw::git_patch;
2222
unsafe fn from_raw(raw: Self::Raw) -> Self {
2323
Patch {
24-
raw: raw,
24+
raw,
2525
buffers: PhantomData,
2626
}
2727
}

‎src/pathspec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl Binding for Pathspec {
168168
type Raw = *mut raw::git_pathspec;
169169

170170
unsafe fn from_raw(raw: *mut raw::git_pathspec) -> Pathspec {
171-
Pathspec { raw: raw }
171+
Pathspec { raw }
172172
}
173173
fn raw(&self) -> *mut raw::git_pathspec {
174174
self.raw
@@ -268,7 +268,7 @@ impl<'ps> Binding for PathspecMatchList<'ps> {
268268

269269
unsafe fn from_raw(raw: *mut raw::git_pathspec_match_list) -> PathspecMatchList<'ps> {
270270
PathspecMatchList {
271-
raw: raw,
271+
raw,
272272
_marker: marker::PhantomData,
273273
}
274274
}

0 commit comments

Comments
 (0)