Skip to content

Commit 527eaa5

Browse files
achandaachanda
committed
---
yaml --- r: 273311 b: refs/heads/beta c: ee18d8e h: refs/heads/master i: 273309: 01d6778 273307: d843676 273303: 89d5a7c 273295: 8d3ac82 273279: 737377e
1 parent 565005e commit 527eaa5

File tree

815 files changed

+19922
-24070
lines changed

Some content is hidden

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

815 files changed

+19922
-24070
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 02954ae0a86c5c2f00e9e06b520999c1e67e9cd7
26+
refs/heads/beta: ee18d8e99b03a451f9dd549fd756ce006134bd73
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

‎branches/beta/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ build.
7777
7878
Download [MinGW from
7979
here](http://mingw-w64.org/doku.php/download/mingw-builds), and choose the
80-
`threads=win32,exceptions=dwarf/seh` flavor when installing. Also, make sure to install to a path without spaces in it. After installing,
80+
`threads=win32,exceptions=dwarf/seh` flavor when installing. After installing,
8181
add its `bin` directory to your `PATH`. This is due to [#28260](https://github.com/rust-lang/rust/issues/28260), in the future,
8282
installing from pacman should be just fine.
8383

‎branches/beta/configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,6 @@ opt dist-host-only 0 "only install bins for the host architecture"
607607
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
608608
opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
609609
opt rustbuild 0 "use the rust and cargo based build system"
610-
opt orbit 0 "get MIR where it belongs - everywhere; most importantly, in orbit"
611610

612611
# Optimization and debugging options. These may be overridden by the release channel, etc.
613612
opt_nosave optimize 1 "build optimized rust code"
@@ -714,8 +713,6 @@ if [ -n "$CFG_ENABLE_DEBUG_ASSERTIONS" ]; then putvar CFG_ENABLE_DEBUG_ASSERTION
714713
if [ -n "$CFG_ENABLE_DEBUGINFO" ]; then putvar CFG_ENABLE_DEBUGINFO; fi
715714
if [ -n "$CFG_ENABLE_DEBUG_JEMALLOC" ]; then putvar CFG_ENABLE_DEBUG_JEMALLOC; fi
716715

717-
if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_ORBIT; fi
718-
719716
# A magic value that allows the compiler to use unstable features
720717
# during the bootstrap even when doing so would normally be an error
721718
# because of feature staging or because the build turns on

‎branches/beta/mk/cfg/i586-pc-windows-msvc.mk

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

‎branches/beta/mk/cfg/i686-pc-windows-gnu.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ CFG_GNU_TRIPLE_i686-pc-windows-gnu := i686-w64-mingw32
2525
CFG_THIRD_PARTY_OBJECTS_i686-pc-windows-gnu := crt2.o dllcrt2.o
2626
CFG_INSTALLED_OBJECTS_i686-pc-windows-gnu := crt2.o dllcrt2.o rsbegin.o rsend.o
2727
CFG_RUSTRT_HAS_STARTUP_OBJS_i686-pc-windows-gnu := 1
28+
# FIXME(#31030) - there's not a great reason to disable jemalloc here
29+
CFG_DISABLE_JEMALLOC_i686-pc-windows-gnu := 1

‎branches/beta/mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ CFG_GNU_TRIPLE_x86_64-pc-windows-gnu := x86_64-w64-mingw32
2525
CFG_THIRD_PARTY_OBJECTS_x86_64-pc-windows-gnu := crt2.o dllcrt2.o
2626
CFG_INSTALLED_OBJECTS_x86_64-pc-windows-gnu := crt2.o dllcrt2.o rsbegin.o rsend.o
2727
CFG_RUSTRT_HAS_STARTUP_OBJS_x86_64-pc-windows-gnu := 1
28+
# FIXME(#31030) - there's not a great reason to disable jemalloc here
29+
CFG_DISABLE_JEMALLOC_x86_64-pc-windows-gnu := 1

‎branches/beta/mk/crates.mk

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,16 @@
4949
# automatically generated for all stage/host/target combinations.
5050
################################################################################
5151

52-
TARGET_CRATES := libc std term \
53-
getopts collections test rand \
54-
core alloc \
52+
TARGET_CRATES := libc std flate arena term \
53+
serialize getopts collections test rand \
54+
log graphviz core rbml alloc \
5555
rustc_unicode rustc_bitflags \
56-
alloc_system alloc_jemalloc rustc_const_eval
56+
alloc_system alloc_jemalloc
5757
RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_driver \
5858
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
5959
rustc_data_structures rustc_front rustc_platform_intrinsics \
6060
rustc_plugin rustc_metadata rustc_passes
61-
HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros \
62-
flate arena graphviz rbml log serialize
61+
HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros
6362
TOOLS := compiletest rustdoc rustc rustbook error_index_generator
6463

6564
DEPS_core :=
@@ -85,17 +84,14 @@ DEPS_log := std
8584
DEPS_num := std
8685
DEPS_rbml := std log serialize
8786
DEPS_serialize := std log
88-
DEPS_term := std
89-
DEPS_test := std getopts term native:rust_test_helpers
87+
DEPS_term := std log
88+
DEPS_test := std getopts serialize rbml term native:rust_test_helpers
9089

91-
DEPS_syntax := std term serialize log arena libc rustc_bitflags rustc_unicode
90+
DEPS_syntax := std term serialize log arena libc rustc_bitflags
9291
DEPS_syntax_ext := syntax fmt_macros
9392

94-
DEPS_rustc_const_eval := std syntax
95-
9693
DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml rustc_front\
97-
log graphviz rustc_llvm rustc_back rustc_data_structures\
98-
rustc_const_eval
94+
log graphviz rustc_llvm rustc_back rustc_data_structures
9995
DEPS_rustc_back := std syntax rustc_llvm rustc_front flate log libc
10096
DEPS_rustc_borrowck := rustc rustc_front log graphviz syntax
10197
DEPS_rustc_data_structures := std log serialize
@@ -106,17 +102,16 @@ DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_bo
106102
DEPS_rustc_front := std syntax log serialize
107103
DEPS_rustc_lint := rustc log syntax
108104
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
109-
DEPS_rustc_metadata := rustc rustc_front syntax rbml rustc_const_eval
105+
DEPS_rustc_metadata := rustc rustc_front syntax rbml
110106
DEPS_rustc_passes := syntax rustc core rustc_front
111-
DEPS_rustc_mir := rustc rustc_front syntax rustc_const_eval
107+
DEPS_rustc_mir := rustc rustc_front syntax
112108
DEPS_rustc_resolve := arena rustc rustc_front log syntax
113109
DEPS_rustc_platform_intrinsics := rustc rustc_llvm
114110
DEPS_rustc_plugin := rustc rustc_metadata syntax rustc_mir
115111
DEPS_rustc_privacy := rustc rustc_front log syntax
116112
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir \
117-
log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics \
118-
rustc_const_eval
119-
DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics rustc_const_eval
113+
log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics
114+
DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics
120115

121116
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
122117
test rustc_lint rustc_front
@@ -130,8 +125,8 @@ TOOL_DEPS_error_index_generator := rustdoc syntax serialize
130125
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
131126
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
132127
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
133-
TOOL_SOURCE_rustbook := $(S)src/tools/rustbook/main.rs
134-
TOOL_SOURCE_error_index_generator := $(S)src/tools/error_index_generator/main.rs
128+
TOOL_SOURCE_rustbook := $(S)src/rustbook/main.rs
129+
TOOL_SOURCE_error_index_generator := $(S)src/error_index_generator/main.rs
135130

136131
ONLY_RLIB_core := 1
137132
ONLY_RLIB_libc := 1

‎branches/beta/mk/dist.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ PKG_FILES := \
5454
doc \
5555
driver \
5656
etc \
57+
error_index_generator \
5758
$(foreach crate,$(CRATES),lib$(crate)) \
5859
libcollectionstest \
5960
libcoretest \
@@ -64,7 +65,7 @@ PKG_FILES := \
6465
rustc \
6566
snapshots.txt \
6667
rust-installer \
67-
tools \
68+
rustbook \
6869
test) \
6970
$(PKG_GITMODULES) \
7071
$(filter-out config.stamp, \

‎branches/beta/mk/main.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,6 @@ ifdef CFG_ENABLE_DEBUGINFO
134134
CFG_RUSTC_FLAGS += -g
135135
endif
136136

137-
ifdef CFG_ENABLE_ORBIT
138-
$(info cfg: launching MIR (CFG_ENABLE_ORBIT))
139-
CFG_RUSTC_FLAGS += -Z orbit
140-
endif
141-
142137
ifdef SAVE_TEMPS
143138
CFG_RUSTC_FLAGS += --save-temps
144139
endif

‎branches/beta/mk/rt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ COMPRT_AR_$(1) := $$(AR_$(1))
253253
# We chomp -Werror here because GCC warns about the type signature of
254254
# builtins not matching its own and the build fails. It's a bit hacky,
255255
# but what can we do, we're building libclang-rt using GCC ......
256-
COMPRT_CFLAGS_$(1) := $$(CFG_GCCISH_CFLAGS_$(1)) -Wno-error -std=c99
256+
COMPRT_CFLAGS_$(1) := $$(filter-out -Werror -Werror=*,$$(CFG_GCCISH_CFLAGS_$(1))) -std=c99
257257

258258
# FreeBSD Clang's packaging is problematic; it doesn't copy unwind.h to
259259
# the standard include directory. This should really be in our changes to
@@ -361,7 +361,7 @@ $$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS)
361361
CC="$$(CC_$(1))" \
362362
AR="$$(AR_$(1))" \
363363
RANLIB="$$(AR_$(1)) s" \
364-
CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1)) -Wno-error -fno-stack-protector" \
364+
CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) -fno-stack-protector" \
365365
$(S)src/libbacktrace/configure --build=$(CFG_GNU_TRIPLE_$(CFG_BUILD)) --host=$(CFG_GNU_TRIPLE_$(1)))
366366
$$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \
367367
$$(BACKTRACE_BUILD_DIR_$(1))/config.h

‎branches/beta/mk/tests.mk

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
299299
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
300300
check-stage$(1)-T-$(2)-H-$(3)-pfail-exec \
301301
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
302+
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
303+
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
304+
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
302305
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
303306
check-stage$(1)-T-$(2)-H-$(3)-rustdocck-exec \
304307
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
@@ -314,15 +317,6 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
314317
# able to build a compiler (when the target triple is in the set of host triples)
315318
ifneq ($$(findstring $(2),$$(CFG_HOST)),)
316319

317-
check-stage$(1)-T-$(2)-H-$(3)-exec: \
318-
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
319-
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
320-
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec
321-
322-
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
323-
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \
324-
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-full-exec
325-
326320
check-stage$(1)-T-$(2)-H-$(3)-crates-exec: \
327321
$$(foreach crate,$$(TEST_CRATES), \
328322
check-stage$(1)-T-$(2)-H-$(3)-$$(crate)-exec)
@@ -346,7 +340,9 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \
346340
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
347341
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-exec \
348342
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-valgrind-exec \
343+
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \
349344
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \
345+
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-full-exec \
350346
check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-exec
351347

352348
endef

‎branches/beta/src/bootstrap/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ path = "main.rs"
1515
name = "rustc"
1616
path = "rustc.rs"
1717

18-
[[bin]]
19-
name = "rustdoc"
20-
path = "rustdoc.rs"
21-
2218
[dependencies]
2319
build_helper = { path = "../build_helper" }
2420
cmake = "0.1.10"

‎branches/beta/src/bootstrap/bootstrap.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ def download_rust_nightly(self):
7373

7474
if self.rustc().startswith(self.bin_root()) and \
7575
(not os.path.exists(self.rustc()) or self.rustc_out_of_date()):
76-
if os.path.exists(self.bin_root()):
77-
shutil.rmtree(self.bin_root())
76+
shutil.rmtree(self.bin_root())
7877
filename = "rust-std-nightly-" + self.build + ".tar.gz"
7978
url = "https://static.rust-lang.org/dist/" + self.snap_rustc_date()
8079
tarball = os.path.join(rustc_cache, filename)

‎branches/beta/src/bootstrap/build/channel.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,19 @@ pub fn collect(build: &mut Build) {
3636
match &build.config.channel[..] {
3737
"stable" => {
3838
build.release = release_num.to_string();
39-
build.package_vers = build.release.clone();
4039
build.unstable_features = false;
4140
}
4241
"beta" => {
4342
build.release = format!("{}-beta{}", release_num,
4443
prerelease_version);
45-
build.package_vers = "beta".to_string();
4644
build.unstable_features = false;
4745
}
4846
"nightly" => {
4947
build.release = format!("{}-nightly", release_num);
50-
build.package_vers = "nightly".to_string();
5148
build.unstable_features = true;
5249
}
5350
_ => {
5451
build.release = format!("{}-dev", release_num);
55-
build.package_vers = build.release.clone();
5652
build.unstable_features = true;
5753
}
5854
}

‎branches/beta/src/bootstrap/build/check.rs

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

0 commit comments

Comments
 (0)