Skip to content

Commit ab5997d

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 174761 b: refs/heads/snap-stage3 c: ed56c15 h: refs/heads/master i: 174759: 9d5ee6c v: v3
1 parent d9d637d commit ab5997d

File tree

130 files changed

+1934
-1588
lines changed

Some content is hidden

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

130 files changed

+1934
-1588
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e4434f97afec86b6021c73be734c637815436279
4+
refs/heads/snap-stage3: ed56c15ceb3e8a6a30c46a4b7a1124d2086b5874
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ documentation.
2121
1. Make sure you have installed the dependencies:
2222
* `g++` 4.7 or `clang++` 3.x
2323
* `python` 2.6 or later (but not 3.x)
24+
* `perl` 5.0 or later
2425
* GNU `make` 3.81 or later
2526
* `curl`
2627
* `git`

‎branches/snap-stage3/configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,7 @@ putvar CFG_BOOTSTRAP_KEY
617617

618618
step_msg "looking for build programs"
619619

620+
probe_need CFG_PERL perl
620621
probe_need CFG_CURLORWGET curl wget
621622
probe_need CFG_PYTHON python2.7 python2.6 python2 python
622623

@@ -1374,7 +1375,7 @@ do
13741375
done
13751376

13761377
# Munge any paths that appear in config.mk back to posix-y
1377-
sed -i.bak -e 's@ \([a-zA-Z]\):[/\\]@ /\1/@g;' config.tmp
1378+
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' config.tmp
13781379
rm -f config.tmp.bak
13791380

13801381
msg

‎branches/snap-stage3/mk/cfg/i686-pc-windows-gnu.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_i686-pc-windows-gnu=$(1).dll
88
CFG_STATIC_LIB_NAME_i686-pc-windows-gnu=$(1).lib
99
CFG_LIB_GLOB_i686-pc-windows-gnu=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_i686-pc-windows-gnu=$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
12-
CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_i686-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-gnu := -shared -g -m32
1515
CFG_GCCISH_DEF_FLAG_i686-pc-windows-gnu :=
@@ -22,7 +22,7 @@ CFG_EXE_SUFFIX_i686-pc-windows-gnu := .exe
2222
CFG_WINDOWSY_i686-pc-windows-gnu := 1
2323
CFG_UNIXY_i686-pc-windows-gnu :=
2424
CFG_PATH_MUNGE_i686-pc-windows-gnu :=
25-
CFG_LDPATH_i686-pc-windows-gnu :=
26-
CFG_RUN_i686-pc-windows-gnu=$(2)
27-
CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,,$(2))
25+
CFG_LDPATH_i686-pc-windows-gnu :=$(CFG_LDPATH_i686-pc-windows-gnu):$(PATH)
26+
CFG_RUN_i686-pc-windows-gnu=PATH="$(CFG_LDPATH_i686-pc-windows-gnu):$(1)" $(2)
27+
CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
2828
CFG_GNU_TRIPLE_i686-pc-windows-gnu := i686-w64-mingw32

‎branches/snap-stage3/mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_x86_64-pc-windows-gnu=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-gnu=$(1).lib
99
CFG_LIB_GLOB_x86_64-pc-windows-gnu=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-gnu=$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
12-
CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-gnu := -shared -g -m64
1515
CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-gnu :=
@@ -22,7 +22,7 @@ CFG_EXE_SUFFIX_x86_64-pc-windows-gnu := .exe
2222
CFG_WINDOWSY_x86_64-pc-windows-gnu := 1
2323
CFG_UNIXY_x86_64-pc-windows-gnu :=
2424
CFG_PATH_MUNGE_x86_64-pc-windows-gnu :=
25-
CFG_LDPATH_x86_64-pc-windows-gnu :=
26-
CFG_RUN_x86_64-pc-windows-gnu=$(2)
27-
CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,,$(2))
25+
CFG_LDPATH_x86_64-pc-windows-gnu :=$(CFG_LDPATH_x86_64-pc-windows-gnu):$(PATH)
26+
CFG_RUN_x86_64-pc-windows-gnu=PATH="$(CFG_LDPATH_x86_64-pc-windows-gnu):$(1)" $(2)
27+
CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
2828
CFG_GNU_TRIPLE_x86_64-pc-windows-gnu := x86_64-w64-mingw32

‎branches/snap-stage3/mk/tests.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ tidy:
300300
| grep '^$(S)src/libbacktrace' -v \
301301
| grep '^$(S)src/rust-installer' -v \
302302
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
303-
$(Q) $(CFG_PYTHON) $(S)src/etc/errorck.py $(S)src/
304303

305304

306305
endif

‎branches/snap-stage3/src/doc/reference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,10 +2377,6 @@ These types help drive the compiler's analysis
23772377
: ___Needs filling in___
23782378
* `no_copy_bound`
23792379
: This type does not implement "copy", even if eligible.
2380-
* `no_send_bound`
2381-
: This type does not implement "send", even if eligible.
2382-
* `no_sync_bound`
2383-
: This type does not implement "sync", even if eligible.
23842380
* `eh_personality`
23852381
: ___Needs filling in___
23862382
* `exchange_free`

‎branches/snap-stage3/src/doc/trpl/if.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% If
1+
% `if`
22

33
Rust's take on `if` is not particularly complex, but it's much more like the
44
`if` you'll find in a dynamically typed language than in a more traditional

‎branches/snap-stage3/src/doc/trpl/unsafe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ Other features provided by lang items include:
707707
various kinds; lang items `send`, `sync` and `copy`.
708708
- the marker types and variance indicators found in
709709
`std::marker`; lang items `covariant_type`,
710-
`contravariant_lifetime`, `no_sync_bound`, etc.
710+
`contravariant_lifetime`, etc.
711711

712712
Lang items are loaded lazily by the compiler; e.g. if one never uses
713713
`Box` then there is no need to define functions for `exchange_malloc`

‎branches/snap-stage3/src/etc/check-links.pl

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/perl -w
2+
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
3+
# file at the top-level directory of this distribution and at
4+
# http://rust-lang.org/COPYRIGHT.
5+
#
6+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9+
# option. This file may not be copied, modified, or distributed
10+
# except according to those terms.
11+
12+
my $file = $ARGV[0];
13+
14+
my @lines = <>;
15+
16+
my $anchors = {};
17+
18+
my $i = 0;
19+
for $line (@lines) {
20+
$i++;
21+
if ($line =~ m/id="([^"]+)"/) {
22+
$anchors->{$1} = $i;
23+
}
24+
}
25+
26+
$i = 0;
27+
for $line (@lines) {
28+
$i++;
29+
while ($line =~ m/href="#([^"]+)"/g) {
30+
if (! exists($anchors->{$1})) {
31+
print "$file:$i: $1 referenced\n";
32+
}
33+
}
34+
}

‎branches/snap-stage3/src/etc/emacs/rust-mode.el

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454
:type 'integer
5555
:group 'rust-mode)
5656

57-
(defcustom rust-indent-method-chain nil
58-
"Indent Rust method chains, aligned by the '.' operators"
59-
:type 'boolean
60-
:group 'rust-mode)
61-
6257
(defun rust-paren-level () (nth 0 (syntax-ppss)))
6358
(defun rust-in-str-or-cmnt () (nth 8 (syntax-ppss)))
6459
(defun rust-rewind-past-str-cmnt () (goto-char (nth 8 (syntax-ppss))))
@@ -78,19 +73,10 @@
7873
;; open bracket ends the line
7974
(when (not (looking-at "[[:blank:]]*\\(?://.*\\)?$"))
8075
(when (looking-at "[[:space:]]")
81-
(forward-word 1)
82-
(backward-word 1))
76+
(forward-word 1)
77+
(backward-word 1))
8378
(current-column))))
8479

85-
(defun rust-align-to-method-chain ()
86-
(save-excursion
87-
(previous-line)
88-
(end-of-line)
89-
(backward-word 1)
90-
(backward-char)
91-
(when (looking-at "\\..+\(.*\)\n")
92-
(- (current-column) rust-indent-offset))))
93-
9480
(defun rust-rewind-to-beginning-of-current-level-expr ()
9581
(let ((current-level (rust-paren-level)))
9682
(back-to-indentation)
@@ -113,13 +99,10 @@
11399
;; the inside of it correctly relative to the outside.
114100
(if (= 0 level)
115101
0
116-
(or
117-
(when rust-indent-method-chain
118-
(rust-align-to-method-chain))
119102
(save-excursion
120103
(backward-up-list)
121104
(rust-rewind-to-beginning-of-current-level-expr)
122-
(+ (current-column) rust-indent-offset))))))
105+
(+ (current-column) rust-indent-offset)))))
123106
(cond
124107
;; A function return type is indented to the corresponding function arguments
125108
((looking-at "->")
@@ -131,16 +114,6 @@
131114
;; A closing brace is 1 level unindended
132115
((looking-at "}") (- baseline rust-indent-offset))
133116

134-
;;Line up method chains by their .'s
135-
((when (and rust-indent-method-chain
136-
(looking-at "\..+\(.*\);?\n"))
137-
(or
138-
(let ((method-indent (rust-align-to-method-chain)))
139-
(when method-indent
140-
(+ method-indent rust-indent-offset)))
141-
(+ baseline rust-indent-offset))))
142-
143-
144117
;; Doc comments in /** style with leading * indent to line up the *s
145118
((and (nth 4 (syntax-ppss)) (looking-at "*"))
146119
(+ 1 baseline))

‎branches/snap-stage3/src/etc/errorck.py

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

‎branches/snap-stage3/src/etc/indenter

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
#!/usr/bin/env python
2-
import re
3-
import sys
1+
#!/usr/bin/perl
2+
use strict;
3+
use warnings;
44

5-
indent = 0
6-
more_re = re.compile(r"^rust: ~\">>")
7-
less_re = re.compile(r"^rust: ~\"<<")
8-
while True:
9-
line = sys.stdin.readline()
10-
if not line:
11-
break
5+
my $indent = 0;
6+
while (<>) {
7+
if (/^rust: ~">>/) {
8+
$indent += 1;
9+
}
1210

13-
if more_re.match(line):
14-
indent += 1
11+
printf "%03d %s%s", $indent, (" " x $indent), $_;
1512

16-
print "%03d %s%s" % (indent, " " * indent, line.strip())
17-
18-
if less_re.match(line):
19-
indent -= 1
13+
if (/^rust: ~"<</) {
14+
$indent -= 1;
15+
}
16+
}

‎branches/snap-stage3/src/etc/rustup.sh

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -433,16 +433,11 @@ CFG_TMP_DIR=$(mktemp -d 2>/dev/null \
433433
|| mktemp -d -t 'rustup-tmp-install' 2>/dev/null \
434434
|| create_tmp_dir)
435435

436-
# If we're saving nightlies and we didn't specify which one, grab the latest
437-
# verison from the perspective of the server. Buildbot has typically finished
438-
# building and uploading by ~8UTC, but we want to include a little buffer.
439-
#
440-
# FIXME It would be better to use the known most recent nightly that has been
441-
# built. This is waiting on a change to have buildbot publish metadata that
442-
# can be queried.
436+
# If we're saving nightlies and we didn't specify which one, grab todays.
437+
# Otherwise we'll use the latest version.
443438
if [ -n "${CFG_SAVE}" -a -z "${CFG_DATE}" ];
444439
then
445-
CFG_DATE=`TZ=Etc/UTC+9 date "+%Y-%m-%d"`
440+
CFG_DATE=`date "+%Y-%m-%d"`
446441
fi
447442

448443
RUST_URL="https://static.rust-lang.org/dist"
@@ -458,33 +453,16 @@ then
458453
RUST_URL="${RUST_URL}/${CFG_DATE}"
459454
fi
460455

461-
download_hash() {
456+
verify_hash() {
457+
remote_sha256="$1"
458+
local_file="$2"
459+
462460
msg "Downloading ${remote_sha256}"
463461
remote_sha256=`"${CFG_CURL}" -f "${remote_sha256}"`
464-
if [ -n "${CFG_SAVE}" ]; then
465-
echo "${remote_sha256}" > "${local_sha_file}"
466-
fi
467462
if [ "$?" -ne 0 ]; then
468463
rm -Rf "${CFG_TMP_DIR}"
469464
err "Failed to download ${remote_url}"
470465
fi
471-
}
472-
473-
verify_hash() {
474-
remote_sha256="$1"
475-
local_file="$2"
476-
local_sha_file="${local_file}.sha256"
477-
478-
if [ -n "${CFG_SAVE}" ]; then
479-
if [ -f "${local_sha_file}" ]; then
480-
msg "Local ${local_sha_file} exists, treating as remote hash"
481-
remote_sha256=`cat "${local_sha_file}"`
482-
else
483-
download_hash
484-
fi
485-
else
486-
download_hash
487-
fi
488466

489467
msg "Verifying hash"
490468
local_sha256=$(calculate_hash "${local_file}")

0 commit comments

Comments
 (0)