Skip to content

Commit 3b7c593

Browse files
committed
---
yaml --- r: 138706 b: refs/heads/try2 c: eddefbc h: refs/heads/master v: v3
1 parent 18369cb commit 3b7c593

File tree

254 files changed

+2030
-1075
lines changed

Some content is hidden

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

254 files changed

+2030
-1075
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: af645e848713536ac3c0a0c52de7b4d96f96fbc6
8+
refs/heads/try2: eddefbc893f16ddec44dbb6b5be6adf7d84c2b53
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 ipo bitreader bitwriter linker asmparser jit mcjit \
247+
LLVM_COMPONENTS=x86 arm mips 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 arch/i386 arch/x86_64 \
582-
libuv
580+
for i in \
581+
isaac linenoise sync test libuv libuv/src \
582+
arch/i386 arch/x86_64 arch/arm arch/mips
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"
721+
LLVM_TARGETS="--enable-targets=x86,x86_64,arm,mips"
722722
LLVM_BUILD="--build=$t"
723723
LLVM_HOST="--host=$t"
724724
LLVM_TARGET="--target=$t"

branches/try2/mk/rt.mk

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

8484
ifeq ($$(HOST_$(1)), i386)
8585
LIBUV_ARCH_$(1) := ia32
86-
else
86+
else ifeq ($$(HOST_$(1)), x86_64)
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
8892
endif
8993

9094
ifeq ($$(CFG_WINDOWSY), 1)

branches/try2/src/compiletest/common.rs

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

1111
use core::prelude::*;
1212

13-
use cmp;
14-
1513
#[deriving_eq]
1614
pub enum mode {
1715
mode_compile_fail,

branches/try2/src/compiletest/compiletest.rc

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

35-
use core::{result, either};
3635
use core::result::{Ok, Err};
3736

3837
use common::config;

branches/try2/src/compiletest/errors.rs

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

1111
use core::prelude::*;
1212

13-
use common::config;
14-
1513
use core::io;
1614
use core::io::ReaderUtil;
1715
use core::str;

branches/try2/src/compiletest/procsrv.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ 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;
1716
use core::os;
18-
use core::pipes;
1917
use core::run::spawn_process;
2018
use core::run;
2119
use core::str;
2220
use core::task;
23-
use core::vec;
2421

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

branches/try2/src/compiletest/runtest.rs

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

1111
use core::prelude::*;
1212

13-
use common;
1413
use common::mode_run_pass;
1514
use common::mode_run_fail;
1615
use common::mode_compile_fail;
1716
use common::mode_pretty;
1817
use common::config;
1918
use errors;
20-
use header;
2119
use header::load_props;
2220
use header::TestProps;
2321
use procsrv;

branches/try2/src/compiletest/util.rs

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

1111
use core::prelude::*;
1212

13-
use common;
1413
use common::config;
1514

1615
use core::io;
1716
use core::os::getenv;
18-
use core::os;
1917

2018
pub fn make_new_path(path: ~str) -> ~str {
2119

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

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
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">
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">
411
<highlighting>
512
<list name="fn">
613
<item> fn </item>
@@ -18,9 +25,7 @@
1825
<item> drop </item>
1926
<item> else </item>
2027
<item> enum </item>
21-
<item> export </item>
2228
<item> extern </item>
23-
<item> fail </item>
2429
<item> for </item>
2530
<item> if </item>
2631
<item> impl </item>
@@ -29,7 +34,6 @@
2934
<item> loop </item>
3035
<item> match </item>
3136
<item> mod </item>
32-
<item> move </item>
3337
<item> mut </item>
3438
<item> priv </item>
3539
<item> pub </item>
@@ -43,6 +47,29 @@
4347
<item> use </item>
4448
<item> while </item>
4549
</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>
4673
<list name="types">
4774
<item> bool </item>
4875
<item> int </item>
@@ -63,6 +90,7 @@
6390
<item> Either </item>
6491
<item> Option </item>
6592
<item> Result </item>
93+
<item> Self </item>
6694
</list>
6795
<list name="ctypes">
6896
<item> c_float </item>
@@ -164,23 +192,33 @@
164192
<keyword String="type" attribute="Keyword" context="Type"/>
165193
<keyword String="keywords" attribute="Keyword" context="#stay"/>
166194
<keyword String="types" attribute="Type" context="#stay"/>
195+
<keyword String="traits" attribute="Trait" context="#stay"/>
167196
<keyword String="ctypes" attribute="CType" context="#stay"/>
168197
<keyword String="self" attribute="Self" context="#stay"/>
169198
<keyword String="constants" attribute="Constant" context="#stay"/>
170199
<keyword String="cconstants" attribute="CConstant" context="#stay"/>
171200
<Detect2Chars char="/" char1="/" attribute="Comment" context="Commentar 1"/>
172201
<Detect2Chars char="/" char1="*" attribute="Comment" context="Commentar 2" beginRegion="Comment"/>
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"/>
202+
<RegExpr String="0x[0-9a-fA-F_]+&rustIntSuf;" attribute="Number" context="#stay"/>
203+
<RegExpr String="0b[0-1_]+&rustIntSuf;" attribute="Number" context="#stay"/>
175204
<RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/>
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"/>
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"/>
178210
<DetectChar char="{" attribute="Symbol" context="#stay" beginRegion="Brace" />
179211
<DetectChar char="}" attribute="Symbol" context="#stay" endRegion="Brace" />
180212
<DetectChar char="&quot;" attribute="String" context="String"/>
181213
<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" />
182216
<DetectIdentifier/>
183217
</context>
218+
<context attribute="Attribute" lineEndContext="#stay" name="Attribute">
219+
<DetectChar char="]" attribute="Attribute" context="#pop" endRegion="Attribute"/>
220+
<IncludeRules context="Normal"/>
221+
</context>
184222
<context attribute="Definition" lineEndContext="#stay" name="Function">
185223
<DetectSpaces/>
186224
<DetectChar char="(" attribute="Normal Text" context="#pop"/>
@@ -193,13 +231,20 @@
193231
</context>
194232
<context attribute="String" lineEndContext="#stay" name="String">
195233
<LineContinue attribute="String" context="#stay"/>
196-
<HlCStringChar attribute="String Char" context="#stay"/>
234+
<DetectChar char="\" attribute="CharEscape" context="CharEscape"/>
197235
<DetectChar attribute="String" context="#pop" char="&quot;"/>
198236
</context>
199237
<context attribute="Character" lineEndContext="#pop" name="Character">
200-
<HlCStringChar attribute="Character" context="#stay"/>
238+
<DetectChar char="\" attribute="CharEscape" context="CharEscape"/>
201239
<DetectChar attribute="Character" context="#pop" char="&apos;"/>
202240
</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>
203248
<context attribute="Comment" lineEndContext="#pop" name="Commentar 1"/>
204249
<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
205250
<DetectSpaces/>
@@ -211,6 +256,7 @@
211256
<itemData name="Keyword" defStyleNum="dsKeyword" color="#770088" bold="1"/>
212257
<itemData name="Self" defStyleNum="dsKeyword" color="#FF0000" bold="1"/>
213258
<itemData name="Type" defStyleNum="dsKeyword" color="#4e9a06" bold="1"/>
259+
<itemData name="Trait" defStyleNum="dsKeyword" color="#4e9a06" bold="1"/>
214260
<itemData name="CType" defStyleNum="dsNormal" color="#4e9a06"/>
215261
<itemData name="Constant" defStyleNum="dsKeyword" color="#116644"/>
216262
<itemData name="CConstant" defStyleNum="dsNormal" color="#116644"/>
@@ -219,8 +265,12 @@
219265
<itemData name="Scope" defStyleNum="dsNormal" color="#0055AA"/>
220266
<itemData name="Number" defStyleNum="dsDecVal" color="#116644"/>
221267
<itemData name="String" defStyleNum="dsString" color="#FF0000"/>
222-
<itemData name="String Char" defStyleNum="dsChar" color="#FF0000"/>
268+
<itemData name="CharEscape" defStyleNum="dsChar" color="#FF0000" bold="1"/>
223269
<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"/>
224274
</itemDatas>
225275
</highlighting>
226276
<general>

branches/try2/src/etc/x86.supp

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

432+
{
433+
enum-instruction-scheduling-10
434+
Memcheck:Cond
435+
fun:*config_from_opts*
436+
...
437+
}
438+
432439
{
433440
llvm-user-new-leak
434441
Memcheck:Leak

branches/try2/src/libcore/bool.rs

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

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

1917
/// Negation / inverse
2018
pub pure fn not(v: bool) -> bool { !v }
@@ -82,7 +80,7 @@ impl cmp::Eq for bool {
8280
#[test]
8381
pub fn test_bool_from_str() {
8482
do all_values |v| {
85-
assert Some(v) == from_str(bool::to_str(v))
83+
assert Some(v) == from_str(to_str(v))
8684
}
8785
}
8886

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;
1513
use option::{None, Option, Some};
1614
use str;
1715
use u32;
1816
use uint;
1917
use unicode;
2018

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", char::is_ascii);
309-
assert ! str::all(~"ประเทศไทย中华Việt Nam", char::is_ascii);
308+
assert str::all(~"banana", is_ascii);
309+
assert ! str::all(~"ประเทศไทย中华Việt Nam", is_ascii);
310310
}
311311

312312
#[test]

branches/try2/src/libcore/cleanup.rs

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

44+
#[cfg(target_arch="mips")]
45+
struct Registers {
46+
data: [u32 * 32]
47+
}
48+
4449
#[cfg(target_arch="x86")]
4550
#[cfg(target_arch="arm")]
51+
#[cfg(target_arch="mips")]
4652
struct Context {
4753
regs: Registers,
4854
next: *Context,
@@ -69,6 +75,7 @@ struct BoxedRegion {
6975

7076
#[cfg(target_arch="x86")]
7177
#[cfg(target_arch="arm")]
78+
#[cfg(target_arch="mips")]
7279
struct Task {
7380
// Public fields
7481
refcount: intptr_t, // 0

branches/try2/src/libcore/core.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ pub mod dlist;
142142
pub mod dlist_iter;
143143
pub mod hashmap;
144144
pub mod cell;
145+
pub mod trie;
145146

146147

147148
/* Tasks and communication */

branches/try2/src/libcore/dvec.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Note that recursive use is not permitted.
2020
*/
2121

2222
use cast;
23-
use cast::reinterpret_cast;
2423
use prelude::*;
2524
use ptr::null;
2625
use vec;

branches/try2/src/libcore/either.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//! A type that represents one of two alternatives
1212
1313
use cmp::Eq;
14-
use cmp;
1514
use kinds::Copy;
1615
use result::Result;
1716
use result;

branches/try2/src/libcore/flate.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ Simple compression
1717
use libc;
1818
use libc::{c_void, size_t, c_int};
1919
use ptr;
20-
use rand;
2120
use vec;
2221

22+
#[cfg(test)] use rand;
23+
2324
extern mod rustrt {
2425
unsafe fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void,
2526
src_buf_len: size_t,

0 commit comments

Comments
 (0)