Skip to content

Commit 5d3c2ce

Browse files
author
kud1ing
committed
---
yaml --- r: 231845 b: refs/heads/auto c: 77a2b38 h: refs/heads/master i: 231843: 7f242e7 v: v3
1 parent 0ab05a1 commit 5d3c2ce

File tree

37 files changed

+277
-277
lines changed

37 files changed

+277
-277
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: b2b6c6b81159cda8785d0a2946b1aabb5f40de8f
11+
refs/heads/auto: 77a2b389f646ff3766e443091143c7e7203bce4d
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

‎branches/auto/RELEASES.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Version 1.2.0 (August 2015)
1+
Version 1.2.0 (2015-08-07)
22
===========================
33

44
* ~1200 changes, numerous bugfixes
@@ -156,7 +156,7 @@ Misc
156156
[ad]: https://github.com/rust-lang/rust/pull/27382
157157
[win]: https://github.com/rust-lang/rust/pull/25350
158158

159-
Version 1.1.0 (June 2015)
159+
Version 1.1.0 (2015-06-25)
160160
=========================
161161

162162
* ~850 changes, numerous bugfixes
@@ -267,7 +267,7 @@ Misc
267267
[`split_off`]: https://doc.rust-lang.org/nightly/collections/linked_list/struct.LinkedList.html#method.split_off
268268
[drop]: https://github.com/rust-lang/rust/pull/24935
269269

270-
Version 1.0.0 (May 2015)
270+
Version 1.0.0 (2015-05-15)
271271
========================
272272

273273
* ~1500 changes, numerous bugfixes

‎branches/auto/src/libarena/lib.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ impl<'longer_than_self> Arena<'longer_than_self> {
220220
*self.copy_head.borrow_mut() =
221221
chunk((new_min_chunk_size + 1).next_power_of_two(), true);
222222

223-
self.alloc_copy_inner(n_bytes, align)
223+
return self.alloc_copy_inner(n_bytes, align);
224224
}
225225

226226
#[inline]
@@ -247,7 +247,7 @@ impl<'longer_than_self> Arena<'longer_than_self> {
247247
mem::align_of::<T>());
248248
let ptr = ptr as *mut T;
249249
ptr::write(&mut (*ptr), op());
250-
&mut *ptr
250+
return &mut *ptr;
251251
}
252252
}
253253

@@ -261,7 +261,7 @@ impl<'longer_than_self> Arena<'longer_than_self> {
261261
*self.head.borrow_mut() =
262262
chunk((new_min_chunk_size + 1).next_power_of_two(), false);
263263

264-
self.alloc_noncopy_inner(n_bytes, align)
264+
return self.alloc_noncopy_inner(n_bytes, align);
265265
}
266266

267267
#[inline]
@@ -290,7 +290,7 @@ impl<'longer_than_self> Arena<'longer_than_self> {
290290

291291
unsafe {
292292
let buf = head.as_ptr();
293-
(buf.offset(tydesc_start as isize), buf.offset(start as isize))
293+
return (buf.offset(tydesc_start as isize), buf.offset(start as isize));
294294
}
295295
}
296296

@@ -312,7 +312,7 @@ impl<'longer_than_self> Arena<'longer_than_self> {
312312
// the object is there.
313313
*ty_ptr = bitpack_tydesc_ptr(tydesc, true);
314314

315-
&mut *ptr
315+
return &mut *ptr;
316316
}
317317
}
318318

@@ -486,12 +486,14 @@ impl<T> TypedArena<T> {
486486
self.grow()
487487
}
488488

489-
unsafe {
489+
let ptr: &mut T = unsafe {
490490
let ptr: &mut T = &mut *(self.ptr.get() as *mut T);
491491
ptr::write(ptr, object);
492492
self.ptr.set(self.ptr.get().offset(1));
493493
ptr
494-
}
494+
};
495+
496+
ptr
495497
}
496498

497499
/// Grows the arena.

‎branches/auto/src/libcore/str/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,10 +1558,10 @@ impl StrExt for str {
15581558
if w > 2 { val = utf8_acc_cont_byte(val, s.as_bytes()[i + 2]); }
15591559
if w > 3 { val = utf8_acc_cont_byte(val, s.as_bytes()[i + 3]); }
15601560

1561-
CharRange {ch: unsafe { char::from_u32_unchecked(val) }, next: i}
1561+
return CharRange {ch: unsafe { char::from_u32_unchecked(val) }, next: i};
15621562
}
15631563

1564-
multibyte_char_range_at_reverse(self, prev)
1564+
return multibyte_char_range_at_reverse(self, prev);
15651565
}
15661566

15671567
#[inline]
@@ -1683,7 +1683,7 @@ fn char_range_at_raw(bytes: &[u8], i: usize) -> (u32, usize) {
16831683
if w > 2 { val = utf8_acc_cont_byte(val, bytes[i + 2]); }
16841684
if w > 3 { val = utf8_acc_cont_byte(val, bytes[i + 3]); }
16851685

1686-
(val, i + w as usize)
1686+
return (val, i + w as usize);
16871687
}
16881688

16891689
multibyte_char_range_at(bytes, i)

‎branches/auto/src/libgetopts/lib.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,14 @@ impl Name {
229229
if nm.len() == 1 {
230230
Short(nm.char_at(0))
231231
} else {
232-
Long(nm.to_owned())
232+
Long(nm.to_string())
233233
}
234234
}
235235

236236
fn to_string(&self) -> String {
237237
match *self {
238238
Short(ch) => ch.to_string(),
239-
Long(ref s) => s.to_owned()
239+
Long(ref s) => s.to_string()
240240
}
241241
}
242242
}
@@ -375,7 +375,7 @@ impl Matches {
375375
} else {
376376
match vals[0] {
377377
Val(ref s) => Some((*s).clone()),
378-
_ => Some(def.to_owned())
378+
_ => Some(def.to_string())
379379
}
380380
}
381381
}
@@ -414,10 +414,10 @@ pub fn reqopt(short_name: &str, long_name: &str, desc: &str, hint: &str) -> OptG
414414
let len = short_name.len();
415415
assert!(len == 1 || len == 0);
416416
OptGroup {
417-
short_name: short_name.to_owned(),
418-
long_name: long_name.to_owned(),
419-
hint: hint.to_owned(),
420-
desc: desc.to_owned(),
417+
short_name: short_name.to_string(),
418+
long_name: long_name.to_string(),
419+
hint: hint.to_string(),
420+
desc: desc.to_string(),
421421
hasarg: Yes,
422422
occur: Req
423423
}
@@ -434,10 +434,10 @@ pub fn optopt(short_name: &str, long_name: &str, desc: &str, hint: &str) -> OptG
434434
let len = short_name.len();
435435
assert!(len == 1 || len == 0);
436436
OptGroup {
437-
short_name: short_name.to_owned(),
438-
long_name: long_name.to_owned(),
439-
hint: hint.to_owned(),
440-
desc: desc.to_owned(),
437+
short_name: short_name.to_string(),
438+
long_name: long_name.to_string(),
439+
hint: hint.to_string(),
440+
desc: desc.to_string(),
441441
hasarg: Yes,
442442
occur: Optional
443443
}
@@ -452,10 +452,10 @@ pub fn optflag(short_name: &str, long_name: &str, desc: &str) -> OptGroup {
452452
let len = short_name.len();
453453
assert!(len == 1 || len == 0);
454454
OptGroup {
455-
short_name: short_name.to_owned(),
456-
long_name: long_name.to_owned(),
457-
hint: "".to_owned(),
458-
desc: desc.to_owned(),
455+
short_name: short_name.to_string(),
456+
long_name: long_name.to_string(),
457+
hint: "".to_string(),
458+
desc: desc.to_string(),
459459
hasarg: No,
460460
occur: Optional
461461
}
@@ -471,10 +471,10 @@ pub fn optflagmulti(short_name: &str, long_name: &str, desc: &str) -> OptGroup {
471471
let len = short_name.len();
472472
assert!(len == 1 || len == 0);
473473
OptGroup {
474-
short_name: short_name.to_owned(),
475-
long_name: long_name.to_owned(),
476-
hint: "".to_owned(),
477-
desc: desc.to_owned(),
474+
short_name: short_name.to_string(),
475+
long_name: long_name.to_string(),
476+
hint: "".to_string(),
477+
desc: desc.to_string(),
478478
hasarg: No,
479479
occur: Multi
480480
}
@@ -491,10 +491,10 @@ pub fn optflagopt(short_name: &str, long_name: &str, desc: &str, hint: &str) ->
491491
let len = short_name.len();
492492
assert!(len == 1 || len == 0);
493493
OptGroup {
494-
short_name: short_name.to_owned(),
495-
long_name: long_name.to_owned(),
496-
hint: hint.to_owned(),
497-
desc: desc.to_owned(),
494+
short_name: short_name.to_string(),
495+
long_name: long_name.to_string(),
496+
hint: hint.to_string(),
497+
desc: desc.to_string(),
498498
hasarg: Maybe,
499499
occur: Optional
500500
}
@@ -512,10 +512,10 @@ pub fn optmulti(short_name: &str, long_name: &str, desc: &str, hint: &str) -> Op
512512
let len = short_name.len();
513513
assert!(len == 1 || len == 0);
514514
OptGroup {
515-
short_name: short_name.to_owned(),
516-
long_name: long_name.to_owned(),
517-
hint: hint.to_owned(),
518-
desc: desc.to_owned(),
515+
short_name: short_name.to_string(),
516+
long_name: long_name.to_string(),
517+
hint: hint.to_string(),
518+
desc: desc.to_string(),
519519
hasarg: Yes,
520520
occur: Multi
521521
}
@@ -531,10 +531,10 @@ pub fn opt(short_name: &str,
531531
let len = short_name.len();
532532
assert!(len == 1 || len == 0);
533533
OptGroup {
534-
short_name: short_name.to_owned(),
535-
long_name: long_name.to_owned(),
536-
hint: hint.to_owned(),
537-
desc: desc.to_owned(),
534+
short_name: short_name.to_string(),
535+
long_name: long_name.to_string(),
536+
hint: hint.to_string(),
537+
desc: desc.to_string(),
538538
hasarg: hasarg,
539539
occur: occur
540540
}
@@ -574,7 +574,7 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
574574
let opts: Vec<Opt> = optgrps.iter().map(|x| x.long_to_short()).collect();
575575
let n_opts = opts.len();
576576

577-
fn f(_x: usize) -> Vec<Optval> { Vec::new() }
577+
fn f(_x: usize) -> Vec<Optval> { return Vec::new(); }
578578

579579
let mut vals: Vec<_> = (0..n_opts).map(f).collect();
580580
let mut free: Vec<String> = Vec::new();
@@ -596,11 +596,11 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
596596
let tail = &cur[2..curlen];
597597
let tail_eq: Vec<&str> = tail.split('=').collect();
598598
if tail_eq.len() <= 1 {
599-
names = vec!(Long(tail.to_owned()));
599+
names = vec!(Long(tail.to_string()));
600600
} else {
601601
names =
602-
vec!(Long(tail_eq[0].to_owned()));
603-
i_arg = Some(tail_eq[1].to_owned());
602+
vec!(Long(tail_eq[0].to_string()));
603+
i_arg = Some(tail_eq[1].to_string());
604604
}
605605
} else {
606606
let mut j = 1;
@@ -630,7 +630,7 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
630630

631631
let next = j + ch.len_utf8();
632632
if arg_follows && next < curlen {
633-
i_arg = Some((&cur[next..curlen]).to_owned());
633+
i_arg = Some((&cur[next..curlen]).to_string());
634634
break;
635635
}
636636

@@ -769,7 +769,7 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String {
769769
// FIXME: #5516 should be graphemes not codepoints
770770
let mut desc_rows = Vec::new();
771771
each_split_within(&desc_normalized_whitespace[..], 54, |substr| {
772-
desc_rows.push(substr.to_owned());
772+
desc_rows.push(substr.to_string());
773773
true
774774
});
775775

@@ -936,7 +936,7 @@ fn each_split_within<F>(ss: &str, lim: usize, mut it: F) -> bool where
936936
machine(&mut cont, (fake_i, ' '));
937937
fake_i += 1;
938938
}
939-
cont
939+
return cont;
940940
}
941941

942942
#[test]

0 commit comments

Comments
 (0)