Skip to content

Commit 9735925

Browse files
committed
---
yaml --- r: 139798 b: refs/heads/try2 c: 0ef3e1e h: refs/heads/master v: v3
1 parent ba904ad commit 9735925

File tree

300 files changed

+8379
-14679
lines changed

Some content is hidden

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

300 files changed

+8379
-14679
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: dd2c7f61a9baa9551f6af4e4a76019c0c0198889
8+
refs/heads/try2: 0ef3e1eb25858297581f639d7095730adb28648d
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
.valgrindrc
5050
lexer.ml
5151
TAGS
52-
TAGS.emacs
53-
TAGS.vim
5452
version.ml
5553
version.texi
5654
/Makefile
@@ -62,7 +60,6 @@ config.mk
6260
/inst/
6361
/mingw-build/
6462
src/.DS_Store
65-
/tmp/
6663
/stage0/
6764
/dl/
6865
/stage1/
@@ -78,8 +75,6 @@ version.md
7875
rust.tex
7976
keywords.md
8077
x86_64-apple-darwin/
81-
x86_64-unknown-linux-gnu/
82-
i686-unknown-linux-gnu/
8378
doc/core/
8479
tmp.*.rs
8580
config.stamp

branches/try2/.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "src/llvm"]
22
path = src/llvm
3-
url = https://github.com/brson/llvm.git
3+
url = git://github.com/brson/llvm.git
44
[submodule "src/libuv"]
55
path = src/libuv
6-
url = https://github.com/brson/libuv.git
6+
url = git://github.com/brson/libuv.git

branches/try2/AUTHORS.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Bilal Husain <[email protected]>
3131
Bill Fallon <[email protected]>
3232
Brendan Eich <[email protected]>
3333
Brendan Zabarauskas <[email protected]>
34+
Brett Cannon <[email protected]>
3435
Brian Anderson <[email protected]>
3536
Brian J. Burg <[email protected]>
3637
Brian Leibig <[email protected]>
@@ -50,6 +51,7 @@ Dave Herman <[email protected]>
5051
David Forsythe <[email protected]>
5152
David Klein <[email protected]>
5253
David Rajchenbach-Teller <[email protected]>
54+
Diggory Hardy <[email protected]>
5355
Dimitri Krassovski <[email protected]>
5456
Donovan Preston <[email protected]>
5557
Drew Willcoxon <[email protected]>
@@ -76,9 +78,11 @@ Ian D. Bollinger <[email protected]>
7678
Ilyong Cho <[email protected]>
7779
Isaac Aggrey <[email protected]>
7880
Ivano Coppola <[email protected]>
81+
Jack Moffitt <[email protected]>
7982
Jacob Harris Cryer Kragh <[email protected]>
8083
Jacob Parker <[email protected]>
8184
Jakub Wieczorek <[email protected]>
85+
James Miller <[email protected]>
8286
Jason Orendorff <[email protected]>
8387
Jed Davis <[email protected]>
8488
Jeff Balogh <[email protected]>

branches/try2/configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ need_cmd uname
237237
need_cmd date
238238
need_cmd tr
239239
need_cmd sed
240-
need_cmd file
240+
241241

242242
msg "inspecting environment"
243243

@@ -533,7 +533,7 @@ then
533533
LLVM_VERSION=$($LLVM_CONFIG --version)
534534

535535
case $LLVM_VERSION in
536-
(3.3|3.3svn|3.2|3.2svn)
536+
(3.2svn|3.2|3.1svn|3.1|3.0svn|3.0)
537537
msg "found ok version of LLVM: $LLVM_VERSION"
538538
;;
539539
(*)
@@ -859,7 +859,7 @@ do
859859
LDFLAGS=$LLVM_LDFLAGS
860860

861861
LLVM_FLAGS="$LLVM_TARGETS $LLVM_OPTS $LLVM_BUILD \
862-
$LLVM_HOST $LLVM_TARGET --with-python=$CFG_PYTHON"
862+
$LLVM_HOST $LLVM_TARGET"
863863

864864
msg "configuring LLVM with:"
865865
msg "$LLVM_FLAGS"

branches/try2/doc/rust.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,12 +1653,11 @@ Path expressions are [lvalues](#lvalues-rvalues-and-temporaries).
16531653

16541654
### Tuple expressions
16551655

1656-
Tuples are written by enclosing one or more comma-separated
1656+
Tuples are written by enclosing two or more comma-separated
16571657
expressions in parentheses. They are used to create [tuple-typed](#tuple-types)
16581658
values.
16591659

16601660
~~~~~~~~ {.tuple}
1661-
(0,);
16621661
(0f, 4.5f);
16631662
("a", 4u, true);
16641663
~~~~~~~~
@@ -2579,7 +2578,7 @@ to the record type-constructor. The differences are as follows:
25792578

25802579
Tuple types and values are denoted by listing the types or values of their
25812580
elements, respectively, in a parenthesized, comma-separated
2582-
list.
2581+
list. Single-element tuples are not legal; all tuples have two or more values.
25832582

25842583
The members of a tuple are laid out in memory contiguously, like a record, in
25852584
order specified by the tuple type.

0 commit comments

Comments
 (0)