Skip to content

Commit dd31fcf

Browse files
mitaamitaa
committed
---
yaml --- r: 275133 b: refs/heads/stable c: 810a514 h: refs/heads/master i: 275131: 03e9336
1 parent ba5106a commit dd31fcf

File tree

259 files changed

+3009
-6901
lines changed

Some content is hidden

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

259 files changed

+3009
-6901
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: c8fc4817dcbf50690aba1fc8bd4db336aff2dbc6
32+
refs/heads/stable: 810a51402917672a6dd8a3f063ea118c79016481
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
url = https://github.com/rust-lang/rust-installer.git
1717
[submodule "src/liblibc"]
1818
path = src/liblibc
19-
url = https://github.com/rust-lang/libc.git
19+
url = https://github.com/rust-lang-nursery/libc.git

‎branches/stable/.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Gareth Daniel Smith <garethdanielsmith@gmail.com> Gareth Smith <garethdanielsmit
8282
Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
8383
Graham Fawcett <graham.fawcett@gmail.com> Graham Fawcett <fawcett@uwindsor.ca>
8484
Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
85-
Guillaume Gomez <guillaume1.gomez@gmail.com> Guillaume Gomez <ggomez@ggo.ifr.lan>
85+
Guillaume Gomez <guillaume1.gomez@gmail.com>
8686
Heather <heather@cynede.net> <Cynede@Gentoo.org>
8787
Heather <heather@cynede.net> <Heather@cynede.net>
8888
Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtke@gmail.com>

‎branches/stable/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Read ["Installing Rust"] from [The Book].
1717
1. Make sure you have installed the dependencies:
1818

1919
* `g++` 4.7 or `clang++` 3.x
20-
* `python` 2.7 (but not 3.x)
20+
* `python` 2.7 or later (but not 3.x)
2121
* GNU `make` 3.81 or later
2222
* `curl`
2323
* `git`

‎branches/stable/RELEASES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ Misc
9494
the `-Z unstable-options` flag.
9595
* [When running tests with `--test`, rustdoc will pass `--cfg`
9696
arguments to the compiler][1.7dt].
97-
* [The compiler is built with RPATH information by default][1.7rpa].
97+
* [The compiler is built with RPATH information by default][1.7rp].
9898
This means that it will be possible to run `rustc` when installed in
9999
unusual configurations without configuring the dynamic linker search
100100
path explicitly.
101-
* [`rustc` passes `--enable-new-dtags` to GNU ld][1.7dta]. This makes
101+
* [`rustc` passes `--enable-new-dtags` to GNU ld][1.7dt]. This makes
102102
any RPATH entries (emitted with `-C rpath`) *not* take precedence
103103
over `LD_LIBRARY_PATH`.
104104

@@ -132,15 +132,15 @@ Compatibility Notes
132132
[1.7cp]: https://github.com/rust-lang/cargo/pull/2224
133133
[1.7d]: https://github.com/rust-lang/rust/pull/30724
134134
[1.7dt]: https://github.com/rust-lang/rust/pull/30372
135-
[1.7dta]: https://github.com/rust-lang/rust/pull/30394
135+
[1.7dt]: https://github.com/rust-lang/rust/pull/30394
136136
[1.7f]: https://github.com/rust-lang/rust/pull/30672
137137
[1.7h]: https://github.com/rust-lang/rust/pull/30818
138138
[1.7j]: https://github.com/rust-lang/rust/pull/30711
139139
[1.7ll]: https://github.com/rust-lang/rust/pull/30663
140140
[1.7m]: https://github.com/rust-lang/rust/pull/30381
141141
[1.7p]: https://github.com/rust-lang/rust/pull/30681
142142
[1.7rp]: https://github.com/rust-lang/rust/pull/29498
143-
[1.7rpa]: https://github.com/rust-lang/rust/pull/30353
143+
[1.7rp]: https://github.com/rust-lang/rust/pull/30353
144144
[1.7rr]: https://github.com/rust-lang/cargo/pull/2279
145145
[1.7sf]: https://github.com/rust-lang/rust/pull/30389
146146
[1.7utf8]: https://github.com/rust-lang/rust/pull/30740

‎branches/stable/configure

Lines changed: 84 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -729,12 +729,12 @@ step_msg "looking for build programs"
729729

730730
probe_need CFG_CURLORWGET curl wget
731731
if [ -z "$CFG_PYTHON_PROVIDED" ]; then
732-
probe_need CFG_PYTHON python2.7 python2 python
732+
probe_need CFG_PYTHON python2.7 python2.6 python2 python
733733
fi
734734

735735
python_version=$($CFG_PYTHON -V 2>&1)
736-
if [ $(echo $python_version | grep -c '^Python 2\.7') -ne 1 ]; then
737-
err "Found $python_version, but Python 2.7 is required"
736+
if [ $(echo $python_version | grep -c '^Python 2\.[4567]') -ne 1 ]; then
737+
err "Found $python_version, but LLVM requires Python 2.4-2.7"
738738
fi
739739

740740
# If we have no git directory then we are probably a tarball distribution
@@ -1327,101 +1327,97 @@ then
13271327
fi
13281328
fi
13291329

1330-
if [ -z "$CFG_ENABLE_RUSTBUILD" ]; then
1330+
step_msg "making directories"
13311331

1332-
step_msg "making directories"
1333-
1334-
for i in \
1335-
doc doc/std doc/extra \
1336-
dl tmp dist
1337-
do
1338-
make_dir $i
1339-
done
1332+
for i in \
1333+
doc doc/std doc/extra \
1334+
dl tmp dist
1335+
do
1336+
make_dir $i
1337+
done
13401338

1341-
for t in $CFG_HOST
1342-
do
1343-
make_dir $t/llvm
1344-
done
1339+
for t in $CFG_HOST
1340+
do
1341+
make_dir $t/llvm
1342+
done
13451343

1346-
for t in $CFG_HOST
1347-
do
1348-
make_dir $t/rustllvm
1349-
done
1344+
for t in $CFG_HOST
1345+
do
1346+
make_dir $t/rustllvm
1347+
done
13501348

1351-
for t in $CFG_TARGET
1349+
for t in $CFG_TARGET
1350+
do
1351+
make_dir $t/rt
1352+
for s in 0 1 2 3
13521353
do
1353-
make_dir $t/rt
1354-
for s in 0 1 2 3
1354+
make_dir $t/rt/stage$s
1355+
make_dir $t/rt/jemalloc
1356+
make_dir $t/rt/compiler-rt
1357+
for i in \
1358+
isaac sync test \
1359+
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
13551360
do
1356-
make_dir $t/rt/stage$s
1357-
make_dir $t/rt/jemalloc
1358-
make_dir $t/rt/compiler-rt
1359-
for i in \
1360-
isaac sync test \
1361-
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
1362-
do
1363-
make_dir $t/rt/stage$s/$i
1364-
done
1361+
make_dir $t/rt/stage$s/$i
13651362
done
13661363
done
1364+
done
13671365

1368-
for h in $CFG_HOST
1369-
do
1370-
for t in $CFG_TARGET
1371-
do
1372-
# host bin dir stage0
1373-
make_dir $h/stage0/bin
1374-
1375-
# host lib dir stage0
1376-
make_dir $h/stage0/lib
1377-
1378-
# host test dir stage0
1379-
make_dir $h/stage0/test
1380-
1381-
# target bin dir stage0
1382-
make_dir $h/stage0/lib/rustlib/$t/bin
1383-
1384-
# target lib dir stage0
1385-
make_dir $h/stage0/lib/rustlib/$t/lib
1386-
1387-
for i in 1 2 3
1388-
do
1389-
# host bin dir
1390-
make_dir $h/stage$i/bin
1391-
1392-
# host lib dir
1393-
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
1394-
1395-
# host test dir
1396-
make_dir $h/stage$i/test
1397-
1398-
# target bin dir
1399-
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
1400-
1401-
# target lib dir
1402-
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
1403-
done
1404-
done
1405-
1406-
make_dir $h/test/run-pass
1407-
make_dir $h/test/run-pass-valgrind
1408-
make_dir $h/test/run-pass-fulldeps
1409-
make_dir $h/test/run-fail
1410-
make_dir $h/test/run-fail-fulldeps
1411-
make_dir $h/test/compile-fail
1412-
make_dir $h/test/parse-fail
1413-
make_dir $h/test/compile-fail-fulldeps
1414-
make_dir $h/test/bench
1415-
make_dir $h/test/perf
1416-
make_dir $h/test/pretty
1417-
make_dir $h/test/debuginfo-gdb
1418-
make_dir $h/test/debuginfo-lldb
1419-
make_dir $h/test/codegen
1420-
make_dir $h/test/codegen-units
1421-
make_dir $h/test/rustdoc
1422-
done
1366+
for h in $CFG_HOST
1367+
do
1368+
for t in $CFG_TARGET
1369+
do
1370+
# host bin dir stage0
1371+
make_dir $h/stage0/bin
14231372

1424-
fi
1373+
# host lib dir stage0
1374+
make_dir $h/stage0/lib
1375+
1376+
# host test dir stage0
1377+
make_dir $h/stage0/test
1378+
1379+
# target bin dir stage0
1380+
make_dir $h/stage0/lib/rustlib/$t/bin
1381+
1382+
# target lib dir stage0
1383+
make_dir $h/stage0/lib/rustlib/$t/lib
1384+
1385+
for i in 1 2 3
1386+
do
1387+
# host bin dir
1388+
make_dir $h/stage$i/bin
1389+
1390+
# host lib dir
1391+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
1392+
1393+
# host test dir
1394+
make_dir $h/stage$i/test
1395+
1396+
# target bin dir
1397+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
1398+
1399+
# target lib dir
1400+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
1401+
done
1402+
done
1403+
1404+
make_dir $h/test/run-pass
1405+
make_dir $h/test/run-pass-valgrind
1406+
make_dir $h/test/run-pass-fulldeps
1407+
make_dir $h/test/run-fail
1408+
make_dir $h/test/run-fail-fulldeps
1409+
make_dir $h/test/compile-fail
1410+
make_dir $h/test/parse-fail
1411+
make_dir $h/test/compile-fail-fulldeps
1412+
make_dir $h/test/bench
1413+
make_dir $h/test/perf
1414+
make_dir $h/test/pretty
1415+
make_dir $h/test/debuginfo-gdb
1416+
make_dir $h/test/debuginfo-lldb
1417+
make_dir $h/test/codegen
1418+
make_dir $h/test/codegen-units
1419+
make_dir $h/test/rustdoc
1420+
done
14251421

14261422
# Configure submodules
14271423
step_msg "configuring submodules"

‎branches/stable/mk/crates.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_
5959
rustc_data_structures rustc_front rustc_platform_intrinsics \
6060
rustc_plugin rustc_metadata rustc_passes
6161
HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros
62-
TOOLS := compiletest rustdoc rustc rustbook error_index_generator
62+
TOOLS := compiletest rustdoc rustc rustbook error-index-generator
6363

6464
DEPS_core :=
6565
DEPS_alloc := core libc alloc_system
@@ -120,12 +120,12 @@ TOOL_DEPS_compiletest := test getopts
120120
TOOL_DEPS_rustdoc := rustdoc
121121
TOOL_DEPS_rustc := rustc_driver
122122
TOOL_DEPS_rustbook := std rustdoc
123-
TOOL_DEPS_error_index_generator := rustdoc syntax serialize
123+
TOOL_DEPS_error-index-generator := rustdoc syntax serialize
124124
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
125125
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
126126
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
127127
TOOL_SOURCE_rustbook := $(S)src/rustbook/main.rs
128-
TOOL_SOURCE_error_index_generator := $(S)src/error_index_generator/main.rs
128+
TOOL_SOURCE_error-index-generator := $(S)src/error-index-generator/main.rs
129129

130130
ONLY_RLIB_core := 1
131131
ONLY_RLIB_libc := 1

‎branches/stable/mk/dist.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,18 @@ PKG_FILES := \
4848
$(S)configure $(S)Makefile.in \
4949
$(S)man \
5050
$(addprefix $(S)src/, \
51-
bootstrap \
52-
build_helper \
5351
compiletest \
5452
doc \
5553
driver \
5654
etc \
57-
error_index_generator \
55+
error-index-generator \
5856
$(foreach crate,$(CRATES),lib$(crate)) \
5957
libcollectionstest \
6058
libcoretest \
6159
libbacktrace \
6260
rt \
6361
rtstartup \
6462
rustllvm \
65-
rustc \
6663
snapshots.txt \
6764
rust-installer \
6865
rustbook \

‎branches/stable/mk/docs.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ RUSTBOOK_EXE = $(HBIN2_H_$(CFG_BUILD))/rustbook$(X_$(CFG_BUILD))
5959
# ./configure
6060
RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
6161

62-
# The error_index_generator executable...
63-
ERR_IDX_GEN_EXE = $(HBIN2_H_$(CFG_BUILD))/error_index_generator$(X_$(CFG_BUILD))
62+
# The error-index-generator executable...
63+
ERR_IDX_GEN_EXE = $(HBIN2_H_$(CFG_BUILD))/error-index-generator$(X_$(CFG_BUILD))
6464
ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
6565
ERR_IDX_GEN_MD = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE) markdown
6666

@@ -221,9 +221,9 @@ error-index: doc/error-index.html
221221
# Metadata used to generate the index is created as a side effect of
222222
# the build so this depends on every crate being up to date.
223223
doc/error-index.html: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
224-
$(Q)$(call E, error_index_generator: $@)
224+
$(Q)$(call E, error-index-generator: $@)
225225
$(Q)$(ERR_IDX_GEN)
226226

227227
doc/error-index.md: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
228-
$(Q)$(call E, error_index_generator: $@)
228+
$(Q)$(call E, error-index-generator: $@)
229229
$(Q)$(ERR_IDX_GEN_MD)

‎branches/stable/mk/prepare.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ define PREPARE_MAN
8282

8383
endef
8484

85-
PREPARE_TOOLS = $(filter-out compiletest rustbook error_index_generator, $(TOOLS))
85+
PREPARE_TOOLS = $(filter-out compiletest rustbook error-index-generator, $(TOOLS))
8686

8787

8888
# $(1) is tool

‎branches/stable/mk/tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,8 +1072,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10721072
$(3) \
10731073
"$$(LLVM_LIBDIR_RUSTFLAGS_$(3))" \
10741074
"$$(LLVM_ALL_COMPONENTS_$(3))" \
1075-
"$$(LLVM_CXXFLAGS_$(3))" \
1076-
'$$(CXX_$(3))'
1075+
"$$(LLVM_CXXFLAGS_$(3))"
10771076
@touch -r $$@.start_time $$@ && rm $$@.start_time
10781077
else
10791078
# FIXME #11094 - The above rule doesn't work right for multiple targets

‎branches/stable/src/bootstrap/build/mod.rs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,25 +160,24 @@ impl Build {
160160
if fs::metadata(self.src.join(".git")).is_err() {
161161
return
162162
}
163-
let git_submodule = || {
164-
let mut cmd = Command::new("git");
165-
cmd.current_dir(&self.src).arg("submodule");
166-
return cmd
167-
};
168-
let out = output(git_submodule().arg("status"));
163+
let out = output(Command::new("git").arg("submodule").arg("status"));
169164
if !out.lines().any(|l| l.starts_with("+") || l.starts_with("-")) {
170165
return
171166
}
172167

173-
self.run(git_submodule().arg("sync"));
174-
self.run(git_submodule().arg("init"));
175-
self.run(git_submodule().arg("update"));
176-
self.run(git_submodule().arg("update").arg("--recursive"));
177-
self.run(git_submodule().arg("status").arg("--recursive"));
178-
self.run(git_submodule().arg("foreach").arg("--recursive")
179-
.arg("git").arg("clean").arg("-fdx"));
180-
self.run(git_submodule().arg("foreach").arg("--recursive")
181-
.arg("git").arg("checkout").arg("."));
168+
self.run(Command::new("git").arg("submodule").arg("sync"));
169+
self.run(Command::new("git").arg("submodule").arg("init"));
170+
self.run(Command::new("git").arg("submodule").arg("update"));
171+
self.run(Command::new("git").arg("submodule").arg("update")
172+
.arg("--recursive"));
173+
self.run(Command::new("git").arg("submodule").arg("status")
174+
.arg("--recursive"));
175+
self.run(Command::new("git").arg("submodule").arg("foreach")
176+
.arg("--recursive")
177+
.arg("git").arg("clean").arg("-fdx"));
178+
self.run(Command::new("git").arg("submodule").arg("foreach")
179+
.arg("--recursive")
180+
.arg("git").arg("checkout").arg("."));
182181
}
183182

184183
/// Clear out `dir` if our build has been flagged as dirty, and also set

0 commit comments

Comments
 (0)