Skip to content

Commit 74ca287

Browse files
baroslbarosl
committed
---
yaml --- r: 174476 b: refs/heads/auto c: d8a8923 h: refs/heads/master v: v3
1 parent 7a8f228 commit 74ca287

File tree

225 files changed

+2526
-1688
lines changed

Some content is hidden

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

225 files changed

+2526
-1688
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 8da284a045c4d59a850f63fe9a11ab7ddb38ef17
13+
refs/heads/auto: d8a892303cab952b1af787122e5551bce95d8770
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/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 +%N`}"
615+
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
616616
putvar CFG_BOOTSTRAP_KEY
617617

618618
step_msg "looking for build programs"

‎branches/auto/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-
endif
334333
# Subvert unstable feature lints to do the self-build
335-
export CFG_BOOTSTRAP_KEY
336334
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
335+
endif
336+
export CFG_BOOTSTRAP_KEY
337337

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

‎branches/auto/mk/tests.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,8 @@ $(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)
1014+
$(1) \
1015+
$$(S)
10151016
@touch $$@
10161017
else
10171018
# FIXME #11094 - The above rule doesn't work right for multiple targets

‎branches/auto/src/compiletest/compiletest.rs

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

1718
#![deny(warnings)]
1819

‎branches/auto/src/doc/guide-crates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Crates and Modules Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/crates-and-modules.html).

‎branches/auto/src/doc/guide-error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% Error Handling in Rust
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/error-handling.html).

‎branches/auto/src/doc/guide-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Foreign Function Interface Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/ffi.html).

‎branches/auto/src/doc/guide-macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Macros Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/macros.html).

‎branches/auto/src/doc/guide-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Ownership Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/ownership.html).

‎branches/auto/src/doc/guide-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Compiler Plugins Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/plugins.html).

‎branches/auto/src/doc/guide-pointers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Pointer Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/pointers.html).

‎branches/auto/src/doc/guide-strings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Guide to Rust Strings
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/strings.html).

‎branches/auto/src/doc/guide-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Threads and Communication Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/tasks.html).

‎branches/auto/src/doc/guide-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Testing Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/testing.html).

‎branches/auto/src/doc/guide-unsafe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% Writing Safe Low-level and Unsafe Code in Rust
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/unsafe.html).

‎branches/auto/src/doc/guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/README.html).

0 commit comments

Comments
 (0)