Skip to content

Commit 4578db3

Browse files
committed
---
yaml --- r: 130399 b: refs/heads/try c: b79930e h: refs/heads/master i: 130397: 87ba972 130395: b911085 130391: 5ac2cda 130383: 9559d5d 130367: b19956f v: v3
1 parent 9982435 commit 4578db3

File tree

2,201 files changed

+62992
-98647
lines changed

Some content is hidden

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

2,201 files changed

+62992
-98647
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: c964cb229bd342bdeb0b4506c3a6d32b03e575f6
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 67b97ab6d2b7de9b69fd97dc171fcf8feec932ff
5-
refs/heads/try: d1a5b277a1cef4cfd48e9aa987e5c8776360fd25
5+
refs/heads/try: b79930eeb94ebc0422f919eab4fdf910d2d0fc3c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
99
src/rt/msvc/* -whitespace
1010
src/rt/valgrind/* -whitespace
11-
*.woff binary

branches/try/.gitignore

Lines changed: 65 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,90 @@
1-
*.a
2-
*.aux
3-
*.bc
1+
*~
2+
\#*\#
3+
\#*
4+
.#*
5+
*.x86
6+
*.llvm
7+
*.out
48
*.boot
5-
*.bz2
6-
*.cmi
7-
*.cmo
9+
*.rustc
810
*.cmx
9-
*.cp
10-
*.cps
11-
*.d
12-
*.dSYM
13-
*.def
14-
*.diff
1511
*.dll
16-
*.dylib
17-
*.elc
18-
*.epub
12+
*.def
1913
*.exe
14+
*.a
15+
*.rlib
16+
*.so
17+
*.dylib
18+
*.orig
19+
*.cmo
20+
*.cmi
21+
*.dSYM
22+
*.d
23+
*.o
24+
*.ll
25+
*.bc
26+
*.aux
27+
*.cp
2028
*.fn
21-
*.html
2229
*.ky
23-
*.ll
24-
*.llvm
30+
*.cps
2531
*.log
26-
*.o
27-
*.orig
28-
*.out
29-
*.patch
3032
*.pdf
33+
*.epub
34+
*.html
3135
*.pg
32-
*.pot
33-
*.pyc
34-
*.rej
35-
*.rlib
36-
*.rustc
37-
*.so
38-
*.swo
39-
*.swp
40-
*.tmp
4136
*.toc
4237
*.tp
4338
*.vr
44-
*.x86
45-
*~
46-
.#*
47-
.DS_Store
48-
.cproject
39+
*.patch
40+
*.diff
41+
*.rej
42+
*.swp
43+
*.swo
44+
*.tmp
45+
*.pyc
46+
*.elc
4947
.hg/
5048
.hgignore
49+
.cproject
5150
.project
52-
.settings/
5351
.valgrindrc
54-
/*-*-*-*/
55-
/*-*-*/
52+
lexer.ml
53+
TAGS
54+
TAGS.emacs
55+
TAGS.vi
56+
version.ml
57+
version.texi
5658
/Makefile
57-
/build
58-
/dist/
59-
/dl/
60-
/doc
61-
/inst/
62-
/llvm/
63-
/mingw-build/
64-
/nd/
59+
config.mk
6560
/rt/
6661
/rustllvm/
67-
/src/libunicode/DerivedCoreProperties.txt
68-
/src/libunicode/EastAsianWidth.txt
69-
/src/libunicode/HangulSyllableType.txt
70-
/src/libunicode/PropList.txt
71-
/src/libunicode/Scripts.txt
72-
/src/libunicode/UnicodeData.txt
62+
/test/
63+
/inst/
64+
/mingw-build/
65+
src/.DS_Store
66+
/tmp/
67+
/dist/
7368
/stage0/
69+
/dl/
7470
/stage1/
7571
/stage2/
7672
/stage3/
77-
/test/
78-
/tmp/
79-
TAGS
80-
TAGS.emacs
81-
TAGS.vi
82-
\#*
83-
\#*\#
84-
config.mk
85-
config.stamp
73+
*.bz2
74+
/doc
75+
/nd/
76+
/llvm/
77+
version.md
8678
keywords.md
87-
lexer.ml
88-
src/.DS_Store
89-
src/etc/dl
90-
src/librustc_llvm/llvmdeps.rs
79+
x86_64-apple-darwin/
80+
x86_64-unknown-linux-gnu/
81+
i686-unknown-linux-gnu/
9182
tmp.*.rs
92-
version.md
93-
version.ml
94-
version.texi
83+
config.stamp
84+
.DS_Store
85+
src/etc/dl
86+
.settings/
87+
/build
88+
i686-pc-mingw32/
89+
src/librustc/lib/llvmdeps.rs
90+
*.pot

branches/try/.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-
make -j4 rustc-stage1 RUSTFLAGS='-Z time-passes' &&
44+
travis_wait make -j4 rustc-stage1 &&
4545
make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
4646
4747
env:

0 commit comments

Comments
 (0)