Skip to content

Commit 98acf06

Browse files
committed
---
yaml --- r: 234791 b: refs/heads/tmp c: 78eee36 h: refs/heads/master i: 234789: 3775dce 234787: f04acdf 234783: 09ef606 v: v3
1 parent 6947dd6 commit 98acf06

File tree

7 files changed

+8
-140
lines changed

7 files changed

+8
-140
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: 547fd5c11e6902e2f9748e7b46893211b36da421
28+
refs/heads/tmp: 78eee36e5bb74f8e969d569a3a9372e47f9e5629
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/doc/complement-project-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Existing languages at this level of abstraction and efficiency are unsatisfactor
2222

2323
# Is any part of this thing production-ready?
2424

25-
Yes!
25+
No. Feel free to play around, but don't expect completeness or stability yet. Expect incompleteness and breakage.
2626

2727
# Is this a completely Mozilla-planned and orchestrated thing?
2828

branches/tmp/src/doc/trpl/error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ let err2: Box<Error> = From::from(parse_err);
12231223

12241224
There is a really important pattern to recognize here. Both `err1` and `err2`
12251225
have the *same type*. This is because they are existentially quantified types,
1226-
or trait objects. In particular, their underlying type is *erased* from the
1226+
or trait objects. In particularly, their underlying type is *erased* from the
12271227
compiler's knowledge, so it truly sees `err1` and `err2` as exactly the same.
12281228
Additionally, we constructed `err1` and `err2` using precisely the same
12291229
function call: `From::from`. This is because `From::from` is overloaded on both

branches/tmp/src/libcollections/vec.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ use alloc::heap::EMPTY;
6565
use core::cmp::Ordering;
6666
use core::fmt;
6767
use core::hash::{self, Hash};
68-
use core::intrinsics::{arith_offset, assume, drop_in_place, needs_drop};
68+
use core::intrinsics::{arith_offset, assume, drop_in_place};
6969
use core::iter::FromIterator;
7070
use core::mem;
7171
use core::ops::{Index, IndexMut, Deref};
@@ -1322,14 +1322,8 @@ impl<T> Drop for Vec<T> {
13221322
// OK because exactly when this stops being a valid assumption, we
13231323
// don't need unsafe_no_drop_flag shenanigans anymore.
13241324
if self.buf.unsafe_no_drop_flag_needs_drop() {
1325-
unsafe {
1326-
// The branch on needs_drop() is an -O1 performance optimization.
1327-
// Without the branch, dropping Vec<u8> takes linear time.
1328-
if needs_drop::<T>() {
1329-
for x in self.iter_mut() {
1330-
drop_in_place(x);
1331-
}
1332-
}
1325+
for x in self.iter_mut() {
1326+
unsafe { drop_in_place(x); }
13331327
}
13341328
}
13351329
// RawVec handles deallocation

branches/tmp/src/libcore/ptr.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,6 @@ fnptr_impls_args! { A, B }
385385
fnptr_impls_args! { A, B, C }
386386
fnptr_impls_args! { A, B, C, D }
387387
fnptr_impls_args! { A, B, C, D, E }
388-
fnptr_impls_args! { A, B, C, D, E, F }
389-
fnptr_impls_args! { A, B, C, D, E, F, G }
390-
fnptr_impls_args! { A, B, C, D, E, F, G, H }
391-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I }
392-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I, J }
393-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I, J, K }
394-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I, J, K, L }
395388

396389
// Comparison for pointers
397390
#[stable(feature = "rust1", since = "1.0.0")]

branches/tmp/src/test/bench/shootout-fasta-redux.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
use std::cmp::min;
4242
use std::env;
4343
use std::io;
44+
use std::io::BufWriter;
4445
use std::io::prelude::*;
4546

4647
const LINE_LEN: usize = 60;
@@ -214,7 +215,7 @@ fn main() {
214215
};
215216

216217
let stdout = io::stdout();
217-
let mut out = stdout.lock();
218+
let mut out = BufWriter::new(stdout.lock());
218219

219220
out.write_all(b">ONE Homo sapiens alu\n").unwrap();
220221
{

branches/tmp/src/test/run-pass/issue-28561.rs

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)