Skip to content

Commit c6191c8

Browse files
committed
---
yaml --- r: 13050 b: refs/heads/master c: 842f9d8 h: refs/heads/master v: v3
1 parent 4f56db7 commit c6191c8

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 266fdd032b3b5ab7c573352f8bfbcb948d794dd6
2+
refs/heads/master: 842f9d8616af2b652bbfe6d568a45106c6a12ffe
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/vec.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,6 @@ fn from_mut<T>(+v: [mut T]) -> [T] unsafe {
199199
r
200200
}
201201

202-
// This function only exists to work around bugs in the type checker.
203-
fn from_const<T>(+v: [const T]) -> [T] unsafe {
204-
let r = ::unsafe::reinterpret_cast(v);
205-
::unsafe::forget(v);
206-
r
207-
}
208-
209202
// Accessors
210203

211204
#[doc = "Returns the first element of a vector"]
@@ -534,7 +527,7 @@ Flattens a vector of vectors of T into a single vector of T.
534527
"]
535528
fn concat<T: copy>(v: [const [const T]]) -> [T] {
536529
let mut r = [];
537-
for each(v) {|inner| r += from_const(inner); }
530+
for each(v) {|inner| r += inner; }
538531
ret r;
539532
}
540533

@@ -546,7 +539,7 @@ fn connect<T: copy>(v: [const [const T]], sep: T) -> [T] {
546539
let mut first = true;
547540
for each(v) {|inner|
548541
if first { first = false; } else { push(r, sep); }
549-
r += from_const(inner);
542+
r += inner;
550543
}
551544
ret r;
552545
}

0 commit comments

Comments
 (0)