Skip to content

Commit 212f54c

Browse files
brsonbrson
committed
---
yaml --- r: 109529 b: refs/heads/snap-stage3 c: 01d823b h: refs/heads/master i: 109527: 679f95e v: v3
1 parent d537525 commit 212f54c

File tree

350 files changed

+1210
-1307
lines changed

Some content is hidden

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

350 files changed

+1210
-1307
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: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 6584f3746e552a626003f564e2f83262d93cbd57
4+
refs/heads/snap-stage3: 01d823b4de9ecf7bf37e0e6433615592ac9b5565
55
refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-
384384
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
385385
opt rpath 1 "build rpaths into rustc itself"
386386
opt nightly 0 "build nightly packages"
387+
opt verify-install 1 "verify installed binaries work"
387388
valopt prefix "/usr/local" "set installation prefix"
388389
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
389390
valopt llvm-root "" "set LLVM root"

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,21 @@
88
# option. This file may not be copied, modified, or distributed
99
# except according to those terms.
1010

11+
ifdef CFG_DISABLE_VERIFY_INSTALL
12+
MAYBE_DISABLE_VERIFY=--disable-verify
13+
else
14+
MAYBE_DISABLE_VERIFY=
15+
endif
1116

1217
install: dist-install-dir-$(CFG_BUILD)
13-
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"
18+
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
1419
# Remove tmp files while we can because they may have been created under sudo
1520
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
1621

1722
uninstall: dist-install-dir-$(CFG_BUILD)
1823
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"
24+
# Remove tmp files while we can because they may have been created under sudo
25+
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
1926

2027

2128
######################################################################

‎branches/snap-stage3/src/compiletest/compiletest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![crate_type = "bin"]
12-
#![feature(phase)]
11+
#[crate_type = "bin"];
12+
#[feature(phase)];
1313

14-
#![allow(non_camel_case_types)]
15-
#![deny(warnings)]
14+
#[allow(non_camel_case_types)];
15+
#[deny(warnings)];
1616

1717
extern crate test;
1818
extern crate getopts;

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

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ BOOL_OPTIONS=""
212212
VAL_OPTIONS=""
213213

214214
flag uninstall "only uninstall from the installation prefix"
215+
opt verify 1 "verify that the installed binaries run correctly"
215216
valopt prefix "/usr/local" "set installation prefix"
216217
# NB This isn't quite the same definition as in `configure`.
217218
# just using 'lib' instead of CFG_LIBDIR_RELATIVE
@@ -230,19 +231,36 @@ validate_opt
230231

231232
# OK, let's get installing ...
232233

234+
# Sanity check: can we run the binaries?
235+
if [ -z "${CFG_DISABLE_VERIFY}" ]
236+
then
237+
# Don't do this if uninstalling. Failure here won't help in any way.
238+
if [ -z "${CFG_UNINSTALL}" ]
239+
then
240+
msg "verifying platform can run binaries"
241+
"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
242+
if [ $? -ne 0 ]
243+
then
244+
err "can't execute rustc binary on this platform"
245+
fi
246+
fi
247+
fi
248+
233249
# Sanity check: can we can write to the destination?
250+
msg "verifying destination is writable"
234251
umask 022 && mkdir -p "${CFG_LIBDIR}"
235-
need_ok "can't write to destination. consider 'sudo'."
236-
touch "${CFG_LIBDIR}/rust-install-probe" 2> /dev/null
252+
need_ok "can't write to destination. consider \`sudo\`."
253+
touch "${CFG_LIBDIR}/rust-install-probe" > /dev/null
237254
if [ $? -ne 0 ]
238255
then
239-
err "can't write to destination. consider 'sudo'."
256+
err "can't write to destination. consider \`sudo\`."
240257
fi
241258
rm "${CFG_LIBDIR}/rust-install-probe"
242259
need_ok "failed to remove install probe"
243260

244261
# Sanity check: don't install to the directory containing the installer.
245262
# That would surely cause chaos.
263+
msg "verifying destination is not the same as source"
246264
INSTALLER_DIR="$(cd $(dirname $0) && pwd)"
247265
PREFIX_DIR="$(cd ${CFG_PREFIX} && pwd)"
248266
if [ "${INSTALLER_DIR}" = "${PREFIX_DIR}" ]
@@ -273,6 +291,10 @@ then
273291
fi
274292
done < "${INSTALLED_MANIFEST}"
275293

294+
# TODO: Remove the manifest.
295+
# If we fail to remove rustlib below, then the installed manifest will
296+
# still be full; the installed manifest needs to be empty before install.
297+
276298
# Remove 'rustlib' directory
277299
rm -r "${CFG_LIBDIR}/rustlib"
278300
if [ $? -ne 0 ]
@@ -346,6 +368,20 @@ while read p; do
346368
# The manifest lists all files to install
347369
done < "${CFG_SRC_DIR}/lib/rustlib/manifest.in"
348370

371+
# Sanity check: can we run the installed binaries?
372+
if [ -z "${CFG_DISABLE_VERIFY}" ]
373+
then
374+
msg "verifying installed binaries are executable"
375+
"${CFG_PREFIX}/bin/rustc" --version > /dev/null
376+
if [ $? -ne 0 ]
377+
then
378+
err "can't execute installed rustc binary. installation may be broken. " \
379+
"if this is expected then rerun install.sh with \`--disable-verify\` " \
380+
"or \`make install\` with \`--disable-verify-install\`"
381+
fi
382+
fi
383+
384+
349385
echo
350386
echo " Rust is ready to roll."
351387
echo

‎branches/snap-stage3/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self
5252
" to make it easy to update.
5353

5454
" Core operators {{{3
55-
syn keyword rustTrait Share Copy Send Sized
55+
syn keyword rustTrait Freeze Copy Send Sized
5656
syn keyword rustTrait Add Sub Mul Div Rem Neg Not
5757
syn keyword rustTrait BitAnd BitOr BitXor
5858
syn keyword rustTrait Drop

‎branches/snap-stage3/src/libarena/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
//! of individual objects while the arena itself is still alive. The benefit
1616
//! of an arena is very fast allocation; just a pointer bump.
1717
18-
#![crate_id = "arena#0.10-pre"]
19-
#![crate_type = "rlib"]
20-
#![crate_type = "dylib"]
21-
#![license = "MIT/ASL2"]
22-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
23-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
24-
html_root_url = "http://static.rust-lang.org/doc/master")]
25-
#![allow(missing_doc)]
26-
#![feature(managed_boxes)]
18+
#[crate_id = "arena#0.10-pre"];
19+
#[crate_type = "rlib"];
20+
#[crate_type = "dylib"];
21+
#[license = "MIT/ASL2"];
22+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
23+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
24+
html_root_url = "http://static.rust-lang.org/doc/master")];
25+
#[allow(missing_doc)];
26+
#[feature(managed_boxes)];
2727

2828
extern crate collections;
2929

‎branches/snap-stage3/src/libcollections/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![allow(missing_doc)]
11+
#[allow(missing_doc)];
1212

1313

1414
use std::cmp;

‎branches/snap-stage3/src/libcollections/lib.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
* Collection types.
1313
*/
1414

15-
#![crate_id = "collections#0.10-pre"]
16-
#![crate_type = "rlib"]
17-
#![crate_type = "dylib"]
18-
#![license = "MIT/ASL2"]
19-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
20-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
21-
html_root_url = "http://static.rust-lang.org/doc/master")]
15+
#[crate_id = "collections#0.10-pre"];
16+
#[crate_type = "rlib"];
17+
#[crate_type = "dylib"];
18+
#[license = "MIT/ASL2"];
19+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
20+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
21+
html_root_url = "http://static.rust-lang.org/doc/master")];
2222

23-
#![feature(macro_rules, managed_boxes, default_type_params, phase)]
23+
#[feature(macro_rules, managed_boxes, default_type_params, phase)];
2424

2525
extern crate rand;
2626

‎branches/snap-stage3/src/libcollections/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! A priority queue implemented with a binary heap
1212
13-
#![allow(missing_doc)]
13+
#[allow(missing_doc)];
1414

1515
use std::clone::Clone;
1616
use std::mem::{move_val_init, init, replace, swap};

‎branches/snap-stage3/src/libcollections/smallintmap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* are O(highest integer key).
1414
*/
1515

16-
#![allow(missing_doc)]
16+
#[allow(missing_doc)];
1717

1818
use std::iter::{Enumerate, FilterMap, Rev};
1919
use std::mem::replace;

‎branches/snap-stage3/src/libflate/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ Simple compression
1414
1515
*/
1616

17-
#![crate_id = "flate#0.10-pre"]
18-
#![crate_type = "rlib"]
19-
#![crate_type = "dylib"]
20-
#![license = "MIT/ASL2"]
21-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
22-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
23-
html_root_url = "http://static.rust-lang.org/doc/master")]
24-
#![feature(phase)]
25-
#![deny(deprecated_owned_vector)]
17+
#[crate_id = "flate#0.10-pre"];
18+
#[crate_type = "rlib"];
19+
#[crate_type = "dylib"];
20+
#[license = "MIT/ASL2"];
21+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
22+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
23+
html_root_url = "http://static.rust-lang.org/doc/master")];
24+
#[feature(phase)];
25+
#[deny(deprecated_owned_vector)];
2626

2727
#[cfg(test)] #[phase(syntax, link)] extern crate log;
2828

‎branches/snap-stage3/src/libfourcc/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ fn main() {
3939
4040
*/
4141

42-
#![crate_id = "fourcc#0.10-pre"]
43-
#![crate_type = "rlib"]
44-
#![crate_type = "dylib"]
45-
#![license = "MIT/ASL2"]
46-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
47-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
48-
html_root_url = "http://static.rust-lang.org/doc/master")]
49-
50-
#![deny(deprecated_owned_vector)]
51-
#![feature(macro_registrar, managed_boxes)]
42+
#[crate_id = "fourcc#0.10-pre"];
43+
#[crate_type = "rlib"];
44+
#[crate_type = "dylib"];
45+
#[license = "MIT/ASL2"];
46+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
47+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
48+
html_root_url = "http://static.rust-lang.org/doc/master")];
49+
50+
#[deny(deprecated_owned_vector)];
51+
#[feature(macro_registrar, managed_boxes)];
5252

5353
extern crate syntax;
5454

‎branches/snap-stage3/src/libgetopts/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@
7676
//! }
7777
//! ~~~
7878
79-
#![crate_id = "getopts#0.10-pre"]
80-
#![crate_type = "rlib"]
81-
#![crate_type = "dylib"]
82-
#![license = "MIT/ASL2"]
83-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
84-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
85-
html_root_url = "http://static.rust-lang.org/doc/master")]
86-
#![feature(globs, phase)]
87-
#![deny(missing_doc)]
88-
#![deny(deprecated_owned_vector)]
79+
#[crate_id = "getopts#0.10-pre"];
80+
#[crate_type = "rlib"];
81+
#[crate_type = "dylib"];
82+
#[license = "MIT/ASL2"];
83+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
84+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
85+
html_root_url = "http://static.rust-lang.org/doc/master")];
86+
#[feature(globs, phase)];
87+
#[deny(missing_doc)];
88+
#[deny(deprecated_owned_vector)];
8989

9090
#[cfg(test)] #[phase(syntax, link)] extern crate log;
9191

‎branches/snap-stage3/src/libglob/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
* `glob`/`fnmatch` functions.
2424
*/
2525

26-
#![crate_id = "glob#0.10-pre"]
27-
#![crate_type = "rlib"]
28-
#![crate_type = "dylib"]
29-
#![license = "MIT/ASL2"]
30-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
31-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
32-
html_root_url = "http://static.rust-lang.org/doc/master")]
26+
#[crate_id = "glob#0.10-pre"];
27+
#[crate_type = "rlib"];
28+
#[crate_type = "dylib"];
29+
#[license = "MIT/ASL2"];
30+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
31+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
32+
html_root_url = "http://static.rust-lang.org/doc/master")];
3333

3434
use std::cell::Cell;
3535
use std::{cmp, os, path};

‎branches/snap-stage3/src/libgreen/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,17 @@
184184
//! pool.shutdown();
185185
//! ```
186186
187-
#![crate_id = "green#0.10-pre"]
188-
#![license = "MIT/ASL2"]
189-
#![crate_type = "rlib"]
190-
#![crate_type = "dylib"]
191-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
192-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
193-
html_root_url = "http://static.rust-lang.org/doc/master")]
187+
#[crate_id = "green#0.10-pre"];
188+
#[license = "MIT/ASL2"];
189+
#[crate_type = "rlib"];
190+
#[crate_type = "dylib"];
191+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
192+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
193+
html_root_url = "http://static.rust-lang.org/doc/master")];
194194

195195
// NB this does *not* include globs, please keep it that way.
196-
#![feature(macro_rules, phase)]
197-
#![allow(visible_private_types)]
196+
#[feature(macro_rules, phase)];
197+
#[allow(visible_private_types)];
198198

199199
#[cfg(test)] #[phase(syntax, link)] extern crate log;
200200
#[cfg(test)] extern crate rustuv;

‎branches/snap-stage3/src/libgreen/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// FIXME: this file probably shouldn't exist
1212

13-
#![macro_escape]
13+
#[macro_escape];
1414

1515
use std::fmt;
1616

‎branches/snap-stage3/src/libhexfloat/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ fn main() {
3636
3737
*/
3838

39-
#![crate_id = "hexfloat#0.10-pre"]
40-
#![crate_type = "rlib"]
41-
#![crate_type = "dylib"]
42-
#![license = "MIT/ASL2"]
43-
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
44-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
45-
html_root_url = "http://static.rust-lang.org/doc/master")]
46-
47-
#![deny(deprecated_owned_vector)]
48-
#![feature(macro_registrar, managed_boxes)]
39+
#[crate_id = "hexfloat#0.10-pre"];
40+
#[crate_type = "rlib"];
41+
#[crate_type = "dylib"];
42+
#[license = "MIT/ASL2"];
43+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
44+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
45+
html_root_url = "http://static.rust-lang.org/doc/master")];
46+
47+
#[deny(deprecated_owned_vector)];
48+
#[feature(macro_registrar, managed_boxes)];
4949

5050
extern crate syntax;
5151

0 commit comments

Comments
 (0)