Skip to content

Commit 758abd7

Browse files
borsbors
committed
---
yaml --- r: 139024 b: refs/heads/try2 c: 6859a6d h: refs/heads/master v: v3
1 parent 129aaf6 commit 758abd7

File tree

11 files changed

+70
-43
lines changed

11 files changed

+70
-43
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 38ac809cc7f0d4da8cc16951f8a9852f4b052c1f
8+
refs/heads/try2: 6859a6d9a327d7fcd81a38c8e3af6aa0005f7944
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/src/libcore/core.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Implicitly, all crates behave as if they included the following prologue:
5656

5757
// On Linux, link to the runtime with -lrt.
5858
#[cfg(target_os = "linux")]
59+
#[doc(hidden)]
5960
pub mod linkhack {
6061
#[link_args="-lrustrt -lrt"]
6162
#[link_args = "-lpthread"]
@@ -252,7 +253,7 @@ pub mod rt;
252253
// A curious inner-module that's not exported that contains the binding
253254
// 'core' so that macro-expanded references to core::error and such
254255
// can be resolved within libcore.
255-
#[doc(hidden)] // FIXME #3538
256+
#[doc(hidden)]
256257
pub mod core {
257258
#[cfg(stage0)]
258259
pub const error : u32 = 1_u32;

‎branches/try2/src/libcore/iter.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ pub trait ReverseIter<A>: BaseIter<A> {
3131
pure fn each_reverse(&self, blk: &fn(&A) -> bool);
3232
}
3333

34+
pub trait MutableIter<A>: BaseIter<A> {
35+
fn each_mut(&mut self, blk: &fn(&mut A) -> bool);
36+
}
37+
3438
pub trait ExtendedIter<A> {
3539
pure fn eachi(&self, blk: &fn(uint, v: &A) -> bool);
3640
pure fn all(&self, blk: &fn(&A) -> bool) -> bool;

‎branches/try2/src/libcore/option.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use ops::Add;
4646
use kinds::Copy;
4747
use util;
4848
use num::Zero;
49-
use iter::BaseIter;
49+
use iter::{BaseIter, MutableIter};
5050

5151
#[cfg(test)] use ptr;
5252
#[cfg(test)] use str;
@@ -323,6 +323,13 @@ impl<T> BaseIter<T> for Option<T> {
323323
}
324324
}
325325
326+
impl<T> MutableIter<T> for Option<T> {
327+
#[inline(always)]
328+
fn each_mut(&mut self, f: &fn(&'self mut T) -> bool) {
329+
match *self { None => (), Some(ref mut t) => { f(t); } }
330+
}
331+
}
332+
326333
pub impl<T> Option<T> {
327334
/// Returns true if the option equals `none`
328335
#[inline(always)]

‎branches/try2/src/libcore/prelude.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ pub use clone::Clone;
2727
pub use cmp::{Eq, Ord, TotalOrd, Ordering, Less, Equal, Greater};
2828
pub use container::{Container, Mutable, Map, Set};
2929
pub use hash::Hash;
30-
pub use iter::{BaseIter, ReverseIter, ExtendedIter, EqIter, CopyableIter};
31-
pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
30+
pub use iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};
31+
pub use iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
32+
pub use iter::Times;
3233
pub use num::NumCast;
3334
pub use path::GenericPath;
3435
pub use path::Path;
@@ -43,6 +44,10 @@ pub use vec::{CopyableVector, ImmutableVector};
4344
pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
4445
pub use vec::{OwnedVector, OwnedCopyableVector};
4546

47+
/* Reexported runtime types */
48+
pub use comm::{stream, Port, Chan, GenericChan, GenericSmartChan, GenericPort, Peekable};
49+
pub use task::spawn;
50+
4651
/* Reexported modules */
4752

4853
pub use at_vec;

‎branches/try2/src/libcore/vec.rs

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ pub pure fn each<T>(v: &r/[T], f: &fn(&r/T) -> bool) {
13571357
/// a vector with mutable contents and you would like
13581358
/// to mutate the contents as you iterate.
13591359
#[inline(always)]
1360-
pub fn each_mut<T>(v: &mut [T], f: &fn(elem: &mut T) -> bool) {
1360+
pub fn each_mut<T>(v: &'r mut [T], f: &fn(elem: &'r mut T) -> bool) {
13611361
let mut i = 0;
13621362
let n = v.len();
13631363
while i < n {
@@ -2280,11 +2280,9 @@ pub mod bytes {
22802280
// ___________________________________________________________________________
22812281
// ITERATION TRAIT METHODS
22822282

2283-
impl<A> iter::BaseIter<A> for &self/[A] {
2283+
impl<A> iter::BaseIter<A> for &'self [A] {
22842284
#[inline(always)]
2285-
pub pure fn each(&self, blk: &fn(v: &'self A) -> bool) {
2286-
each(*self, blk)
2287-
}
2285+
pure fn each(&self, blk: &fn(v: &'self A) -> bool) { each(*self, blk) }
22882286
#[inline(always)]
22892287
pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
22902288
}
@@ -2305,6 +2303,29 @@ impl<A> iter::BaseIter<A> for @[A] {
23052303
pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
23062304
}
23072305

2306+
impl<A> iter::MutableIter<A> for &'self mut [A] {
2307+
#[inline(always)]
2308+
fn each_mut(&mut self, blk: &fn(v: &'self mut A) -> bool) {
2309+
each_mut(*self, blk)
2310+
}
2311+
}
2312+
2313+
// FIXME(#4148): This should be redundant
2314+
impl<A> iter::MutableIter<A> for ~[A] {
2315+
#[inline(always)]
2316+
fn each_mut(&mut self, blk: &fn(v: &'self mut A) -> bool) {
2317+
each_mut(*self, blk)
2318+
}
2319+
}
2320+
2321+
// FIXME(#4148): This should be redundant
2322+
impl<A> iter::MutableIter<A> for @mut [A] {
2323+
#[inline(always)]
2324+
fn each_mut(&mut self, blk: &fn(v: &mut A) -> bool) {
2325+
each_mut(*self, blk)
2326+
}
2327+
}
2328+
23082329
impl<A> iter::ExtendedIter<A> for &self/[A] {
23092330
pub pure fn eachi(&self, blk: &fn(uint, v: &A) -> bool) {
23102331
iter::eachi(self, blk)

‎branches/try2/src/librustdoc/rustdoc.rc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ fn run(config: Config) {
116116
// Remove things marked doc(hidden)
117117
prune_hidden_pass::mk_pass(),
118118
// Remove things that are private
119-
// XXX enable this after 'export' is removed in favor of 'pub'
120-
// prune_private_pass::mk_pass(),
119+
prune_private_pass::mk_pass(),
121120
// Extract brief documentation from the full descriptions
122121
desc_to_brief_pass::mk_pass(),
123122
// Massage the text to remove extra indentation

‎branches/try2/src/libstd/treemap.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pure fn lt<K: Ord + TotalOrd, V>(a: &TreeMap<K, V>,
7272
}
7373
};
7474

75-
return a_len < b_len;
75+
a_len < b_len
7676
}
7777

7878
impl<K: Ord + TotalOrd, V> Ord for TreeMap<K, V> {
@@ -694,22 +694,13 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
694694

695695
skew(save);
696696

697-
match save.right {
698-
Some(ref mut right) => {
697+
for save.right.each_mut |right| {
699698
skew(right);
700-
match right.right {
701-
Some(ref mut x) => { skew(x) },
702-
None => ()
703-
}
704-
}
705-
None => ()
699+
for right.right.each_mut |x| { skew(x) }
706700
}
707701

708702
split(save);
709-
match save.right {
710-
Some(ref mut x) => { split(x) },
711-
None => ()
712-
}
703+
for save.right.each_mut |x| { split(x) }
713704
}
714705

715706
return removed;
@@ -718,7 +709,7 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
718709
}
719710

720711
*node = None;
721-
return true;
712+
true
722713
}
723714

724715
#[cfg(test)]

‎branches/try2/src/libsyntax/codemap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl cmp::Eq for span {
140140

141141
impl<S:Encoder> Encodable<S> for span {
142142
/* Note #1972 -- spans are encoded but not decoded */
143-
fn encode(&self, _s: &S) { }
143+
fn encode(&self, _s: &S) { _s.emit_nil() }
144144
}
145145

146146
impl<D:Decoder> Decodable<D> for span {

‎branches/try2/src/libsyntax/parse/mod.rs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,9 @@ mod test {
297297
use std;
298298
use core::io;
299299
use core::option::None;
300-
use core::str;
301300
use util::testing::*;
302301

303-
#[test] fn to_json_str (val: @Encodable<std::json::Encoder>) -> ~str {
302+
#[test] fn to_json_str<E : Encodable<std::json::Encoder>>(val: @E) -> ~str {
304303
do io::with_str_writer |writer| {
305304
val.encode(~std::json::Encoder(writer));
306305
}
@@ -312,18 +311,18 @@ mod test {
312311
@~"fn foo (x : int) { x; }",
313312
~[],
314313
new_parse_sess(None));
315-
check_equal(to_json_str(@tts as @Encodable<std::json::Encoder>),
316-
~"[[\"tt_tok\",[,[\"IDENT\",[\"fn\",false]]]],\
317-
[\"tt_tok\",[,[\"IDENT\",[\"foo\",false]]]],\
318-
[\"tt_delim\",[[[\"tt_tok\",[,[\"LPAREN\",[]]]],\
319-
[\"tt_tok\",[,[\"IDENT\",[\"x\",false]]]],\
320-
[\"tt_tok\",[,[\"COLON\",[]]]],\
321-
[\"tt_tok\",[,[\"IDENT\",[\"int\",false]]]],\
322-
[\"tt_tok\",[,[\"RPAREN\",[]]]]]]],\
323-
[\"tt_delim\",[[[\"tt_tok\",[,[\"LBRACE\",[]]]],\
324-
[\"tt_tok\",[,[\"IDENT\",[\"x\",false]]]],\
325-
[\"tt_tok\",[,[\"SEMI\",[]]]],\
326-
[\"tt_tok\",[,[\"RBRACE\",[]]]]]]]]"
314+
check_equal(to_json_str(@tts),
315+
~"[[\"tt_tok\",[null,[\"IDENT\",[\"fn\",false]]]],\
316+
[\"tt_tok\",[null,[\"IDENT\",[\"foo\",false]]]],\
317+
[\"tt_delim\",[[[\"tt_tok\",[null,[\"LPAREN\",[]]]],\
318+
[\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\
319+
[\"tt_tok\",[null,[\"COLON\",[]]]],\
320+
[\"tt_tok\",[null,[\"IDENT\",[\"int\",false]]]],\
321+
[\"tt_tok\",[null,[\"RPAREN\",[]]]]]]],\
322+
[\"tt_delim\",[[[\"tt_tok\",[null,[\"LBRACE\",[]]]],\
323+
[\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\
324+
[\"tt_tok\",[null,[\"SEMI\",[]]]],\
325+
[\"tt_tok\",[null,[\"RBRACE\",[]]]]]]]]"
327326
);
328327
let ast1 = new_parser_from_tts(new_parse_sess(None),~[],tts)
329328
.parse_item(~[]);

‎branches/try2/src/rustllvm/RustWrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,10 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
433433
Options.EnableSegmentedStacks = EnableSegmentedStacks;
434434

435435
std::string Err;
436-
const Target *TheTarget = TargetRegistry::lookupTarget(triple, Err);
436+
std::string Trip(Triple::normalize(triple));
437437
std::string FeaturesStr;
438-
std::string Trip(triple);
439438
std::string CPUStr("generic");
439+
const Target *TheTarget = TargetRegistry::lookupTarget(Trip, Err);
440440
TargetMachine *Target =
441441
TheTarget->createTargetMachine(Trip, CPUStr, FeaturesStr,
442442
Options, Reloc::PIC_,

0 commit comments

Comments
 (0)