Skip to content

Commit 2989daa

Browse files
committed
---
yaml --- r: 131514 b: refs/heads/dist-snap c: c9e2ca0 h: refs/heads/master v: v3
1 parent 866ebf4 commit 2989daa

File tree

135 files changed

+2655
-1538
lines changed

Some content is hidden

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

135 files changed

+2655
-1538
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: a34fd5a1bb76256770b95dad16b9fc237fec254b
9+
refs/heads/dist-snap: c9e2ca0dfad8f2aff48c64887b1ec4276929eced
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ script: |
4141
if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
4242
fi &&
4343
make tidy &&
44-
travis_wait make -j4 rustc-stage1 &&
44+
make -j4 rustc-stage1 RUSTFLAGS='-Z time-passes' &&
4545
make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
4646
4747
env:

branches/dist-snap/man/rustc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "March 2014" "rustc 0.11-pre" "User Commands"
1+
.TH RUSTC "1" "March 2014" "rustc 0.11.0" "User Commands"
22
.SH NAME
33
rustc \- The Rust compiler
44
.SH SYNOPSIS

branches/dist-snap/man/rustdoc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTDOC "1" "March 2014" "rustdoc 0.11-pre" "User Commands"
1+
.TH RUSTDOC "1" "March 2014" "rustdoc 0.11.0" "User Commands"
22
.SH NAME
33
rustdoc \- generate documentation from Rust source code
44
.SH SYNOPSIS

branches/dist-snap/mk/main.mk

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

1515
# The version number
1616
CFG_RELEASE_NUM=0.11.0
17-
CFG_RELEASE_LABEL=-pre
17+
CFG_RELEASE_LABEL=
1818

1919
ifndef CFG_ENABLE_NIGHTLY
2020
# This is the normal version string

branches/dist-snap/mk/platform.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ CFG_PATH_MUNGE_i686-pc-mingw32 :=
461461
CFG_LDPATH_i686-pc-mingw32 :=$(CFG_LDPATH_i686-pc-mingw32):$(PATH)
462462
CFG_RUN_i686-pc-mingw32=PATH="$(CFG_LDPATH_i686-pc-mingw32):$(1)" $(2)
463463
CFG_RUN_TARG_i686-pc-mingw32=$(call CFG_RUN_i686-pc-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
464+
RUSTC_FLAGS_i686-pc-mingw32=-C link-args="-Wl,--large-address-aware"
464465

465466
# i586-mingw32msvc configuration
466467
CC_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-gcc

branches/dist-snap/src/doc/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ To generate .pot and .po files, do something like:
5353
~~~~
5454
po4a --copyright-holder="The Rust Project Developers" \
5555
--package-name="Rust" \
56-
--package-version="0.11.0-pre" \
56+
--package-version="0.11.0" \
5757
-M UTF-8 -L UTF-8 \
5858
src/doc/po4a.conf
5959
~~~~
6060

61-
(the version number must be changed if it is not 0.11.0-pre now.)
61+
(the version number must be changed if it is not 0.11.0 now.)
6262

6363
Now you can translate documents with .po files, commonly used with gettext. If
6464
you are not familiar with gettext-based translation, please read the online

0 commit comments

Comments
 (0)