Skip to content

Commit 1eb4008

Browse files
estsauverestsauver
committed
---
yaml --- r: 174626 b: refs/heads/snap-stage3 c: 6ab95bd h: refs/heads/master v: v3
1 parent aff79ee commit 1eb4008

File tree

254 files changed

+2027
-3789
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

+2027
-3789
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: 583c5c589ed02e5b6b14a576e35e0ce68988d949
4+
refs/heads/snap-stage3: 6ab95bdd62095429139f1b24717cbf0e5aa4a235
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ terms.
66

77
Longer version:
88

9-
The Rust Project is copyright 2015, The Rust Project
9+
The Rust Project is copyright 2014, The Rust Project
1010
Developers (given in the file AUTHORS.txt).
1111

1212
Licensed under the Apache License, Version 2.0

‎branches/snap-stage3/LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015 The Rust Project Developers
1+
Copyright (c) 2014 The Rust Project Developers
22

33
Permission is hereby granted, free of charge, to any
44
person obtaining a copy of this software and associated

‎branches/snap-stage3/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ putvar CFG_RELEASE_CHANNEL
612612
# channel.
613613
# Basing CFG_BOOTSTRAP_KEY on CFG_BOOTSTRAP_KEY lets it get picked up
614614
# during a Makefile reconfig.
615-
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
615+
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%N`}"
616616
putvar CFG_BOOTSTRAP_KEY
617617

618618
step_msg "looking for build programs"

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
5454
log regex graphviz core rbml alloc \
55-
unicode rustc_bitflags
55+
unicode
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5757
rustc_trans rustc_back rustc_llvm rustc_privacy
5858
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
@@ -64,8 +64,7 @@ DEPS_libc := core
6464
DEPS_unicode := core
6565
DEPS_alloc := core libc native:jemalloc
6666
DEPS_std := core libc rand alloc collections unicode \
67-
native:rust_builtin native:backtrace native:rustrt_native \
68-
rustc_bitflags
67+
native:rust_builtin native:backtrace native:rustrt_native
6968
DEPS_graphviz := std
7069
DEPS_syntax := std term serialize log fmt_macros arena libc
7170
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
@@ -84,7 +83,6 @@ DEPS_rustc_llvm := native:rustllvm libc std
8483
DEPS_rustc_back := std syntax rustc_llvm flate log libc
8584
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
8685
test
87-
DEPS_rustc_bitflags := core
8886
DEPS_flate := std native:miniz
8987
DEPS_arena := std
9088
DEPS_graphviz := std
@@ -116,7 +114,6 @@ ONLY_RLIB_alloc := 1
116114
ONLY_RLIB_rand := 1
117115
ONLY_RLIB_collections := 1
118116
ONLY_RLIB_unicode := 1
119-
ONLY_RLIB_rustc_bitflags := 1
120117

121118
################################################################################
122119
# You should not need to edit below this line

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ ifdef CFG_DISABLE_UNSTABLE_FEATURES
330330
CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
331331
# Turn on feature-staging
332332
export CFG_DISABLE_UNSTABLE_FEATURES
333-
# Subvert unstable feature lints to do the self-build
334-
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
335333
endif
334+
# Subvert unstable feature lints to do the self-build
336335
export CFG_BOOTSTRAP_KEY
336+
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
337337

338338
######################################################################
339339
# Per-stage targets and runner

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,8 +1011,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10111011
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10121012
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10131013
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1014-
$(1) \
1015-
$$(S)
1014+
$(1)
10161015
@touch $$@
10171016
else
10181017
# FIXME #11094 - The above rule doesn't work right for multiple targets

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#![feature(slicing_syntax, unboxed_closures)]
1414
#![feature(box_syntax)]
1515
#![feature(int_uint)]
16-
#![allow(unstable)]
1716

1817
#![deny(warnings)]
1918

0 commit comments

Comments
 (0)