Skip to content

Commit c9a159e

Browse files
jldjld
committed
---
yaml --- r: 138707 b: refs/heads/try2 c: 5f0a123 h: refs/heads/master i: 138705: 18369cb 138703: a9e1a6e v: v3
1 parent 3b7c593 commit c9a159e

File tree

269 files changed

+1207
-2155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+1207
-2155
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: eddefbc893f16ddec44dbb6b5be6adf7d84c2b53
8+
refs/heads/try2: 5f0a123f0d1c8718b015c973b3780bc9353e9159
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
244244
######################################################################
245245

246246
# FIXME: x86-ism
247-
LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
247+
LLVM_COMPONENTS=x86 arm ipo bitreader bitwriter linker asmparser jit mcjit \
248248
interpreter
249249

250250
define DEF_LLVM_VARS

‎branches/try2/configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,9 @@ make_dir rt
577577
for t in $CFG_TARGET_TRIPLES
578578
do
579579
make_dir rt/$t
580-
for i in \
581-
isaac linenoise sync test libuv libuv/src \
582-
arch/i386 arch/x86_64 arch/arm arch/mips
580+
for i in \
581+
isaac linenoise sync test arch/i386 arch/x86_64 \
582+
libuv
583583
do
584584
make_dir rt/$t/$i
585585
done
@@ -718,7 +718,7 @@ do
718718
then
719719
msg "configuring LLVM for $t"
720720

721-
LLVM_TARGETS="--enable-targets=x86,x86_64,arm,mips"
721+
LLVM_TARGETS="--enable-targets=x86,x86_64,arm"
722722
LLVM_BUILD="--build=$t"
723723
LLVM_HOST="--host=$t"
724724
LLVM_TARGET="--target=$t"

‎branches/try2/mk/rt.mk

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,8 @@ RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
8383

8484
ifeq ($$(HOST_$(1)), i386)
8585
LIBUV_ARCH_$(1) := ia32
86-
else ifeq ($$(HOST_$(1)), x86_64)
86+
else
8787
LIBUV_ARCH_$(1) := x86_64
88-
else ifeq ($$(HOST_$(1)), arm)
89-
LIBUV_ARCH_$(1) := arm
90-
else ifeq ($$(HOST_$(1)), mips)
91-
LIBUV_ARCH_$(1) := mips
9288
endif
9389

9490
ifeq ($$(CFG_WINDOWSY), 1)

‎branches/try2/src/compiletest/common.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
use core::prelude::*;
1212

13+
use cmp;
14+
1315
#[deriving_eq]
1416
pub enum mode {
1517
mode_compile_fail,

‎branches/try2/src/compiletest/compiletest.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pub mod errors;
3232
use std::getopts;
3333
use std::test;
3434

35+
use core::{result, either};
3536
use core::result::{Ok, Err};
3637

3738
use common::config;

‎branches/try2/src/compiletest/errors.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
use core::prelude::*;
1212

13+
use common::config;
14+
1315
use core::io;
1416
use core::io::ReaderUtil;
1517
use core::str;

‎branches/try2/src/compiletest/header.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ pub fn load_props(testfile: &Path) -> TestProps {
5959
pp_exact = parse_pp_exact(ln, testfile);
6060
}
6161

62-
for parse_aux_build(ln).each |ab| {
62+
do parse_aux_build(ln).iter |ab| {
6363
aux_builds.push(*ab);
6464
}
6565

66-
for parse_exec_env(ln).each |ee| {
66+
do parse_exec_env(ln).iter |ee| {
6767
exec_env.push(*ee);
6868
}
6969

‎branches/try2/src/compiletest/procsrv.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ use core::prelude::*;
1313
use core::io::{ReaderUtil, WriterUtil};
1414
use core::io;
1515
use core::libc::{c_int, pid_t};
16+
use core::libc;
1617
use core::os;
18+
use core::pipes;
1719
use core::run::spawn_process;
1820
use core::run;
1921
use core::str;
2022
use core::task;
23+
use core::vec;
2124

2225
#[cfg(target_os = "win32")]
2326
fn target_env(lib_path: ~str, prog: ~str) -> ~[(~str,~str)] {

‎branches/try2/src/compiletest/runtest.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010

1111
use core::prelude::*;
1212

13+
use common;
1314
use common::mode_run_pass;
1415
use common::mode_run_fail;
1516
use common::mode_compile_fail;
1617
use common::mode_pretty;
1718
use common::config;
1819
use errors;
20+
use header;
1921
use header::load_props;
2022
use header::TestProps;
2123
use procsrv;

‎branches/try2/src/compiletest/util.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010

1111
use core::prelude::*;
1212

13+
use common;
1314
use common::config;
1415

1516
use core::io;
1617
use core::os::getenv;
18+
use core::os;
1719

1820
pub fn make_new_path(path: ~str) -> ~str {
1921

‎branches/try2/src/etc/kate/rust.xml

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE language SYSTEM "language.dtd"
3-
[
4-
<!-- TODO: Kate's regex engine has very limited support for
5-
predefined char classes, so making rustIdent consistent with actual
6-
Rust identifiers will be a bit difficult -->
7-
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
8-
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
9-
]>
10-
<language name="Rust" version="0.6" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
2+
<!DOCTYPE language SYSTEM "language.dtd">
3+
<language name="Rust" version="0.4.0" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
114
<highlighting>
125
<list name="fn">
136
<item> fn </item>
@@ -25,7 +18,9 @@
2518
<item> drop </item>
2619
<item> else </item>
2720
<item> enum </item>
21+
<item> export </item>
2822
<item> extern </item>
23+
<item> fail </item>
2924
<item> for </item>
3025
<item> if </item>
3126
<item> impl </item>
@@ -34,6 +29,7 @@
3429
<item> loop </item>
3530
<item> match </item>
3631
<item> mod </item>
32+
<item> move </item>
3733
<item> mut </item>
3834
<item> priv </item>
3935
<item> pub </item>
@@ -47,29 +43,6 @@
4743
<item> use </item>
4844
<item> while </item>
4945
</list>
50-
<list name="traits">
51-
<item> Const </item>
52-
<item> Copy </item>
53-
<item> Send </item>
54-
<item> Owned </item>
55-
<item> Eq </item>
56-
<item> Ord </item>
57-
<item> Num </item>
58-
<item> Ptr </item>
59-
<item> Drop </item>
60-
<item> Add </item>
61-
<item> Sub </item>
62-
<item> Mul </item>
63-
<item> Div </item>
64-
<item> Modulo </item>
65-
<item> Neg </item>
66-
<item> BitAnd </item>
67-
<item> BitOr </item>
68-
<item> BitXor </item>
69-
<item> Shl </item>
70-
<item> Shr </item>
71-
<item> Index </item>
72-
</list>
7346
<list name="types">
7447
<item> bool </item>
7548
<item> int </item>
@@ -90,7 +63,6 @@
9063
<item> Either </item>
9164
<item> Option </item>
9265
<item> Result </item>
93-
<item> Self </item>
9466
</list>
9567
<list name="ctypes">
9668
<item> c_float </item>
@@ -192,33 +164,23 @@
192164
<keyword String="type" attribute="Keyword" context="Type"/>
193165
<keyword String="keywords" attribute="Keyword" context="#stay"/>
194166
<keyword String="types" attribute="Type" context="#stay"/>
195-
<keyword String="traits" attribute="Trait" context="#stay"/>
196167
<keyword String="ctypes" attribute="CType" context="#stay"/>
197168
<keyword String="self" attribute="Self" context="#stay"/>
198169
<keyword String="constants" attribute="Constant" context="#stay"/>
199170
<keyword String="cconstants" attribute="CConstant" context="#stay"/>
200171
<Detect2Chars char="/" char1="/" attribute="Comment" context="Commentar 1"/>
201172
<Detect2Chars char="/" char1="*" attribute="Comment" context="Commentar 2" beginRegion="Comment"/>
202-
<RegExpr String="0x[0-9a-fA-F_]+&rustIntSuf;" attribute="Number" context="#stay"/>
203-
<RegExpr String="0b[0-1_]+&rustIntSuf;" attribute="Number" context="#stay"/>
173+
<RegExpr String="0x[0-9a-fA-F_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?" attribute="Number" context="#stay"/>
174+
<RegExpr String="0b[0-1_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?" attribute="Number" context="#stay"/>
204175
<RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/>
205-
<RegExpr String="[0-9][0-9_]*&rustIntSuf;" attribute="Number" context="#stay"/>
206-
<Detect2Chars char="#" char1="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
207-
<RegExpr String="&rustIdent;::" attribute="Scope"/>
208-
<RegExpr String="&rustIdent;!" attribute="Macro"/>
209-
<RegExpr String="&apos;&rustIdent;(?!&apos;)" attribute="Lifetime"/>
176+
<RegExpr String="[0-9][0-9_]*(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?" attribute="Number" context="#stay"/>
177+
<RegExpr String="[a-zA-Z_][a-zA-Z0-9_]*::" attribute="Scope"/>
210178
<DetectChar char="{" attribute="Symbol" context="#stay" beginRegion="Brace" />
211179
<DetectChar char="}" attribute="Symbol" context="#stay" endRegion="Brace" />
212180
<DetectChar char="&quot;" attribute="String" context="String"/>
213181
<DetectChar char="&apos;" attribute="Character" context="Character"/>
214-
<DetectChar char="[" attribute="Symbol" context="#stay" beginRegion="Bracket" />
215-
<DetectChar char="]" attribute="Symbol" context="#stay" endRegion="Bracket" />
216182
<DetectIdentifier/>
217183
</context>
218-
<context attribute="Attribute" lineEndContext="#stay" name="Attribute">
219-
<DetectChar char="]" attribute="Attribute" context="#pop" endRegion="Attribute"/>
220-
<IncludeRules context="Normal"/>
221-
</context>
222184
<context attribute="Definition" lineEndContext="#stay" name="Function">
223185
<DetectSpaces/>
224186
<DetectChar char="(" attribute="Normal Text" context="#pop"/>
@@ -231,20 +193,13 @@
231193
</context>
232194
<context attribute="String" lineEndContext="#stay" name="String">
233195
<LineContinue attribute="String" context="#stay"/>
234-
<DetectChar char="\" attribute="CharEscape" context="CharEscape"/>
196+
<HlCStringChar attribute="String Char" context="#stay"/>
235197
<DetectChar attribute="String" context="#pop" char="&quot;"/>
236198
</context>
237199
<context attribute="Character" lineEndContext="#pop" name="Character">
238-
<DetectChar char="\" attribute="CharEscape" context="CharEscape"/>
200+
<HlCStringChar attribute="Character" context="#stay"/>
239201
<DetectChar attribute="Character" context="#pop" char="&apos;"/>
240202
</context>
241-
<context attribute="CharEscape" lineEndContext="#pop" name="CharEscape">
242-
<AnyChar String="nrt\&apos;&quot;" attribute="CharEscape" context="#pop"/>
243-
<RegExpr String="x[0-9a-fA-F]{2}" attribute="CharEscape" context="#pop"/>
244-
<RegExpr String="u[0-9a-fA-F]{4}" attribute="CharEscape" context="#pop"/>
245-
<RegExpr String="U[0-9a-fA-F]{8}" attribute="CharEscape" context="#pop"/>
246-
<RegExpr String="." attribute="Error" context="#pop"/>
247-
</context>
248203
<context attribute="Comment" lineEndContext="#pop" name="Commentar 1"/>
249204
<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
250205
<DetectSpaces/>
@@ -256,7 +211,6 @@
256211
<itemData name="Keyword" defStyleNum="dsKeyword" color="#770088" bold="1"/>
257212
<itemData name="Self" defStyleNum="dsKeyword" color="#FF0000" bold="1"/>
258213
<itemData name="Type" defStyleNum="dsKeyword" color="#4e9a06" bold="1"/>
259-
<itemData name="Trait" defStyleNum="dsKeyword" color="#4e9a06" bold="1"/>
260214
<itemData name="CType" defStyleNum="dsNormal" color="#4e9a06"/>
261215
<itemData name="Constant" defStyleNum="dsKeyword" color="#116644"/>
262216
<itemData name="CConstant" defStyleNum="dsNormal" color="#116644"/>
@@ -265,12 +219,8 @@
265219
<itemData name="Scope" defStyleNum="dsNormal" color="#0055AA"/>
266220
<itemData name="Number" defStyleNum="dsDecVal" color="#116644"/>
267221
<itemData name="String" defStyleNum="dsString" color="#FF0000"/>
268-
<itemData name="CharEscape" defStyleNum="dsChar" color="#FF0000" bold="1"/>
222+
<itemData name="String Char" defStyleNum="dsChar" color="#FF0000"/>
269223
<itemData name="Character" defStyleNum="dsChar" color="#FF0000"/>
270-
<itemData name="Macro" defStyleNum="dsOthers"/>
271-
<itemData name="Attribute" defStyleNum="dsOthers"/>
272-
<itemData name="Lifetime" defStyleNum="dsOthers" bold="1"/>
273-
<itemData name="Error" defStyleNum="dsError"/>
274224
</itemDatas>
275225
</highlighting>
276226
<general>

‎branches/try2/src/etc/x86.supp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,6 @@
429429
...
430430
}
431431

432-
{
433-
enum-instruction-scheduling-10
434-
Memcheck:Cond
435-
fun:*config_from_opts*
436-
...
437-
}
438-
439432
{
440433
llvm-user-new-leak
441434
Memcheck:Leak

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111

1212
//! Boolean logic
1313
14+
use bool;
15+
use cmp;
16+
use cmp::Eq;
1417
use option::{None, Option, Some};
15-
#[cfg(notest)] use cmp;
1618

1719
/// Negation / inverse
1820
pub pure fn not(v: bool) -> bool { !v }
@@ -80,7 +82,7 @@ impl cmp::Eq for bool {
8082
#[test]
8183
pub fn test_bool_from_str() {
8284
do all_values |v| {
83-
assert Some(v) == from_str(to_str(v))
85+
assert Some(v) == from_str(bool::to_str(v))
8486
}
8587
}
8688

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
//! Utilities for manipulating the char type
1212
13+
use char;
14+
use cmp::Eq;
1315
use option::{None, Option, Some};
1416
use str;
1517
use u32;
1618
use uint;
1719
use unicode;
1820

19-
#[cfg(notest)] use cmp::Eq;
20-
2121
/*
2222
Lu Uppercase_Letter an uppercase letter
2323
Ll Lowercase_Letter a lowercase letter
@@ -305,8 +305,8 @@ fn test_to_digit() {
305305

306306
#[test]
307307
fn test_is_ascii() {
308-
assert str::all(~"banana", is_ascii);
309-
assert ! str::all(~"ประเทศไทย中华Việt Nam", is_ascii);
308+
assert str::all(~"banana", char::is_ascii);
309+
assert ! str::all(~"ประเทศไทย中华Việt Nam", char::is_ascii);
310310
}
311311

312312
#[test]

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,8 @@ struct Registers {
4141
data: [u32 * 16]
4242
}
4343

44-
#[cfg(target_arch="mips")]
45-
struct Registers {
46-
data: [u32 * 32]
47-
}
48-
4944
#[cfg(target_arch="x86")]
5045
#[cfg(target_arch="arm")]
51-
#[cfg(target_arch="mips")]
5246
struct Context {
5347
regs: Registers,
5448
next: *Context,
@@ -75,7 +69,6 @@ struct BoxedRegion {
7569

7670
#[cfg(target_arch="x86")]
7771
#[cfg(target_arch="arm")]
78-
#[cfg(target_arch="mips")]
7972
struct Task {
8073
// Public fields
8174
refcount: intptr_t, // 0

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ pub mod container;
132132
/* Common data structures */
133133

134134
pub mod option;
135+
#[path="iter-trait.rs"] #[merge = "iter-trait/option.rs"]
136+
pub mod option_iter;
135137
pub mod result;
136138
pub mod either;
137139
pub mod dvec;
@@ -142,7 +144,6 @@ pub mod dlist;
142144
pub mod dlist_iter;
143145
pub mod hashmap;
144146
pub mod cell;
145-
pub mod trie;
146147

147148

148149
/* Tasks and communication */

0 commit comments

Comments
 (0)