Skip to content

Commit a11e1e5

Browse files
committed
---
yaml --- r: 72679 b: refs/heads/dist-snap c: 987ad9c h: refs/heads/master i: 72677: eaa593f 72675: 9c7651f 72671: 35b4603 v: v3
1 parent 0fff271 commit a11e1e5

File tree

488 files changed

+6495
-358
lines changed

Some content is hidden

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

488 files changed

+6495
-358
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10-
refs/heads/dist-snap: cb918e1a831782d6072a0b93dd57614cb9c2d961
10+
refs/heads/dist-snap: 987ad9c8782ba254c8326c9caac9796bcce9beb9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitattributes

Lines changed: 0 additions & 9 deletions
This file was deleted.

branches/dist-snap/COPYRIGHT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,3 +367,4 @@ their own copyright notices and license terms:
367367
has chosen for the collective work, enumerated at the top
368368
of this file. The only difference is the retention of
369369
copyright itself, held by the contributor.
370+

branches/dist-snap/RELEASES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Version 0.3 (July 2012)
250250
* Slices and fixed-size, interior-allocated vectors
251251
* #!-comments for lang versioning, shell execution
252252
* Destructors and iface implementation for classes;
253-
type-parameterized classes and class methods
253+
type-parameterized classes and class methods
254254
* 'const' type kind for types that can be used to implement
255255
shared-memory concurrency patterns
256256

@@ -261,7 +261,7 @@ Version 0.3 (July 2012)
261261
'crust', 'native' (now 'extern'), 'cont' (now 'again')
262262

263263
* Constructs: do-while loops ('do' repurposed), fn binding,
264-
resources (replaced by destructors)
264+
resources (replaced by destructors)
265265

266266
* Compiler reorganization
267267
* Syntax-layer of compiler split into separate crate
@@ -276,7 +276,7 @@ Version 0.3 (July 2012)
276276
* Extensive work on libuv interface
277277
* Much vector code moved to libraries
278278
* Syntax extensions: #line, #col, #file, #mod, #stringify,
279-
#include, #include_str, #include_bin
279+
#include, #include_str, #include_bin
280280

281281
* Tool improvements
282282
* Cargo automatically resolves dependencies

branches/dist-snap/doc/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The markdown docs are only generated by make when node is installed (use
2-
`make doc`). If you don't have node installed you can generate them yourself.
3-
Unfortunately there's no real standard for markdown and all the tools work
2+
`make doc`). If you don't have node installed you can generate them yourself.
3+
Unfortunately there's no real standard for markdown and all the tools work
44
differently. pandoc is one that seems to work well.
55

66
To generate an html version of a doc do something like:
@@ -10,4 +10,4 @@ The syntax for pandoc flavored markdown can be found at:
1010
http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
1111

1212
A nice quick reference (for non-pandoc markdown) is at:
13-
http://kramdown.rubyforge.org/quickref.html
13+
http://kramdown.rubyforge.org/quickref.html

branches/dist-snap/doc/rust.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3351,3 +3351,4 @@ Additional specific influences can be seen from the following languages:
33513351
* The typeclass system of Haskell.
33523352
* The lexical identifier rule of Python.
33533353
* The block syntax of Ruby.
3354+

branches/dist-snap/doc/tutorial-macros.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,3 +402,4 @@ tricky. Invoking the `log_syntax!` macro can help elucidate intermediate
402402
states, invoking `trace_macros!(true)` will automatically print those
403403
intermediate states out, and passing the flag `--pretty expanded` as a
404404
command-line argument to the compiler will show the result of expansion.
405+

branches/dist-snap/doc/tutorial-tasks.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,3 +511,4 @@ The parent task first calls `DuplexStream` to create a pair of bidirectional
511511
endpoints. It then uses `task::spawn` to create the child task, which captures
512512
one end of the communication channel. As a result, both parent and child can
513513
send and receive data to and from the other.
514+

branches/dist-snap/doc/tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,9 @@ let mut d = @mut 5; // mutable variable, mutable box
10061006
d = @mut 15;
10071007
~~~~
10081008

1009-
A mutable variable and an immutable variable can refer to the same box, given
1010-
that their types are compatible. Mutability of a box is a property of its type,
1011-
however, so for example a mutable handle to an immutable box cannot be
1009+
A mutable variable and an immutable variable can refer to the same box, given
1010+
that their types are compatible. Mutability of a box is a property of its type,
1011+
however, so for example a mutable handle to an immutable box cannot be
10121012
assigned a reference to a mutable box.
10131013

10141014
~~~~
@@ -1041,7 +1041,7 @@ let y = x.clone(); // y is a newly allocated box
10411041
let z = x; // no new memory allocated, x can no longer be used
10421042
~~~~
10431043

1044-
Since in owned boxes mutability is a property of the owner, not the
1044+
Since in owned boxes mutability is a property of the owner, not the
10451045
box, mutable boxes may become immutable when they are moved, and vice-versa.
10461046

10471047
~~~~

branches/dist-snap/doc/version_info.html.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
</center>
88

99
</div>
10+

branches/dist-snap/mk/platform.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Create variables HOST_<triple> containing the host part
1313
# of each target triple. For example, the triple i686-darwin-macos
14-
# would create a variable HOST_i686-darwin-macos with the value
14+
# would create a variable HOST_i686-darwin-macos with the value
1515
# i386.
1616
define DEF_HOST_VAR
1717
HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1))))
@@ -276,8 +276,8 @@ CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -march=i686
276276
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
277277
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g
278278
CFG_GCCISH_DEF_FLAG_i686-pc-mingw32 :=
279-
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
280-
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
279+
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
280+
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
281281
CFG_DEF_SUFFIX_i686-pc-mingw32 := .mingw32.def
282282
CFG_INSTALL_NAME_i686-pc-mingw32 =
283283
CFG_LIBUV_LINK_FLAGS_i686-pc-mingw32 := -lWs2_32 -lpsapi -liphlpapi

branches/dist-snap/mk/rt.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
# This is a procedure to define the targets for building
2-
# the runtime.
2+
# the runtime.
33
#
44
# Argument 1 is the target triple.
55
#
66
# This is not really the right place to explain this, but
77
# for those of you who are not Makefile gurus, let me briefly
8-
# cover the $ expansion system in use here, because it
8+
# cover the $ expansion system in use here, because it
99
# confused me for a while! The variable DEF_RUNTIME_TARGETS
1010
# will be defined once and then expanded with different
1111
# values substituted for $(1) each time it is called.
12-
# That resulting text is then eval'd.
12+
# That resulting text is then eval'd.
1313
#
1414
# For most variables, you could use a single $ sign. The result
1515
# is that the substitution would occur when the CALL occurs,
1616
# I believe. The problem is that the automatic variables $< and $@
1717
# need to be expanded-per-rule. Therefore, for those variables at
18-
# least, you need $$< and $$@ in the variable text. This way, after
18+
# least, you need $$< and $$@ in the variable text. This way, after
1919
# the CALL substitution occurs, you will have $< and $@. This text
2020
# will then be evaluated, and all will work as you like.
2121
#
2222
# Reader beware, this explanantion could be wrong, but it seems to
23-
# fit the experimental data (i.e., I was able to get the system
24-
# working under these assumptions).
23+
# fit the experimental data (i.e., I was able to get the system
24+
# working under these assumptions).
2525

2626
# Hack for passing flags into LIBUV, see below.
2727
LIBUV_FLAGS_i386 = -m32 -fPIC

branches/dist-snap/mk/stage0.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ $(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)): \
77
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS)
88
@$(call E, fetch: $@)
99
# Note: the variable "SNAPSHOT_FILE" is generally not set, and so
10-
# we generally only pass one argument to this script.
10+
# we generally only pass one argument to this script.
1111
ifdef CFG_ENABLE_LOCAL_RUST
1212
$(Q)$(S)src/etc/local_stage0.sh $(CFG_BUILD_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
13-
else
13+
else
1414
$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD_TRIPLE) $(SNAPSHOT_FILE)
1515
ifdef CFG_ENABLE_PAX_FLAGS
1616
@$(call E, apply PaX flags: $@)
1717
@"$(CFG_PAXCTL)" -cm "$@"
1818
endif
19-
endif
19+
endif
2020
$(Q)touch $@
2121

2222
# Host libs will be extracted by the above rule

branches/dist-snap/mk/tests.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ tidy:
179179
$(Q)find $(S)src/etc -name '*.py' \
180180
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
181181
$(Q)echo $(ALL_CS) \
182-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
182+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
183183
$(Q)echo $(ALL_HS) \
184-
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
184+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
185185

186186
endif
187187

@@ -709,3 +709,4 @@ endef
709709

710710
$(foreach host,$(CFG_HOST_TRIPLES), \
711711
$(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))
712+

branches/dist-snap/src/etc/check-links.pl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
my $i = 0;
1010
foreach $line (@lines) {
1111
$i++;
12-
if ($line =~ m/id="([^"]+)"/) {
12+
if ($line =~ m/id="([^"]+)"/) {
1313
$anchors->{$1} = $i;
1414
}
1515
}
1616

1717
$i = 0;
1818
foreach $line (@lines) {
1919
$i++;
20-
while ($line =~ m/href="#([^"]+)"/g) {
20+
while ($line =~ m/href="#([^"]+)"/g) {
2121
if (! exists($anchors->{$1})) {
2222
print "$file:$i: $1 referenced\n";
2323
}
2424
}
2525
}
26+

branches/dist-snap/src/etc/gedit/readme.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ Instructions for Ubuntu Linux 12.04+
88
2) Copy the included "share" folder into "~/.local/"
99

1010
3) Open a shell in "~/.local/share/" and run "update-mime-database mime"
11+

branches/dist-snap/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@
123123
<keyword>mode_t</keyword>
124124
<keyword>ssize_t</keyword>
125125
</context>
126-
126+
127127
<context id="self" style-ref="identifier">
128128
<keyword>self</keyword>
129129
</context>
130-
130+
131131
<context id="constants" style-ref="constant">
132132
<keyword>true</keyword>
133133
<keyword>false</keyword>
@@ -261,3 +261,4 @@
261261
</definitions>
262262

263263
</language>
264+

branches/dist-snap/src/etc/gedit/share/mime/packages/rust.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<mime-type type="text/x-rust">
33
<comment>Rust Source</comment>
44
<glob pattern="*.rs"/>
5-
<glob pattern="*.rc"/>
5+
<glob pattern="*.rc"/>
66
</mime-type>
77
</mime-info>

branches/dist-snap/src/etc/indenter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ while (<>) {
1414
$indent -= 1;
1515
}
1616
}
17+

branches/dist-snap/src/etc/latest-unix-snaps.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,5 @@ def download_new_file (date, rev, platform, hsh):
5252
for ff in newestSet["files"]:
5353
download_new_file (newestSet["date"], newestSet["rev"],
5454
ff["platform"], ff["hash"])
55+
56+

branches/dist-snap/src/etc/libc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,4 @@ int main() {
243243
extra_consts();
244244
printf("}\n");
245245
}
246+

branches/dist-snap/src/etc/licenseck.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ def check_license(name, contents):
9696
return True
9797

9898
return False
99+

branches/dist-snap/src/etc/local_stage0.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/sh
22

3-
TARG_DIR=$1
3+
TARG_DIR=$1
44
PREFIX=$2
55

66
BINDIR=bin
77
LIBDIR=lib
88

99
OS=`uname -s`
10-
case $OS in
10+
case $OS in
1111
("Linux"|"FreeBSD")
1212
BIN_SUF=
1313
LIB_SUF=.so

branches/dist-snap/src/etc/mirror-all-snapshots.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@
3333
print("got download with ok hash")
3434
else:
3535
raise Exception("bad hash on download")
36+
37+
38+

branches/dist-snap/src/etc/monodebug.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,4 @@
7777
}
7878
print "\n";
7979
}
80+

branches/dist-snap/src/etc/sugarise-doc-comments.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ def sugarise_file(path):
8080
for (dirpath, dirnames, filenames) in os.walk('.'):
8181
for name in fnmatch.filter(filenames, '*.r[sc]'):
8282
sugarise_file(os.path.join(dirpath, name))
83+

branches/dist-snap/src/etc/tidy.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ def do_license_check(name, contents):
8181

8282

8383
sys.exit(err)
84+

branches/dist-snap/src/etc/x86.supp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
...
367367
}
368368

369-
{
369+
{
370370
llvm-user-new-leak
371371
Memcheck:Leak
372372
fun:_Znwj
@@ -401,7 +401,7 @@
401401
Helgrind:Race
402402
fun:_ZN15lock_and_signal27lock_held_by_current_threadEv
403403
...
404-
}
404+
}
405405

406406
{
407407
lock_and_signal-probably-threadsafe-access-outside-of-lock2

0 commit comments

Comments
 (0)