Skip to content

Commit d6487c1

Browse files
committed
---
yaml --- r: 229110 b: refs/heads/try c: 21dd5e6 h: refs/heads/master v: v3
1 parent 955088b commit d6487c1

File tree

707 files changed

+24343
-14129
lines changed

Some content is hidden

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

707 files changed

+24343
-14129
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 243982443f0b94c8fb7dca42b7d8f3d5f7f0209f
4+
refs/heads/try: 21dd5e62a225f90e4d7a182d8029af5d54222212
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@
66
*.rs rust
77
src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
9-
src/rt/msvc/* -whitespace
10-
src/rt/valgrind/* -whitespace
119
*.woff binary

branches/try/.travis.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1-
# Use something that's not 'ruby' so we don't set up things like
2-
# RVM/bundler/ruby and whatnot. Right now 'rust' as a language actually
3-
# downloads a rust/cargo snapshot, which we don't really want for building rust.
1+
# ccache support is disabled unless your language is a C-derivative. However
2+
# `language: C` unconditionally sets `CC=compiler`. If we just set it in our
3+
# `env` it will be overwritten by the default (gcc 4.6).
44
language: c
5+
compiler: /usr/bin/gcc-4.7
6+
cache: ccache
57
sudo: false
68

79
# The test suite is in general way too stressful for travis, especially in
810
# terms of time limit and reliability. In the past we've tried to scale things
911
# back to only build the stage1 compiler and run a subset of tests, but this
1012
# didn't end up panning out very well.
1113
#
12-
# As a result, we're just using travis to run `make tidy` now. It'll help
13-
# everyone find out about their trailing spaces early on!
14+
# As a result, we're just using travis to run `make tidy` and *only* build
15+
# stage1 but *not* test it for now (a strict subset of the bootstrap). This will
16+
# catch "obvious" errors like style or not even compiling.
17+
#
18+
# We need gcc4.7 or higher to build LLVM, and travis (well, Ubuntu 12.04)
19+
# currently ships with 4.6. Gotta download our own.
1420
before_script:
15-
- ./configure --llvm-root=path/to/nowhere
21+
- ./configure --enable-ccache
1622
script:
1723
- make tidy
24+
- make rustc-stage1 -j4
25+
26+
env:
27+
- CXX=/usr/bin/g++-4.7
28+
29+
addons:
30+
apt:
31+
sources:
32+
- ubuntu-toolchain-r-test
33+
packages:
34+
- gcc-4.7
35+
- g++-4.7
1836

1937
# Real testing happens on http://buildbot.rust-lang.org/
2038
#

branches/try/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ Santiago Rodriguez <[email protected]>
958958
Saurabh Anand <[email protected]>
959959
Scott Jenkins <[email protected]>
960960
Scott Lawrence <[email protected]>
961-
Scott Olson <scott@scott-olson.org>
961+
Scott Olson <scott@solson.me>
962962
Sean Bowe <[email protected]>
963963
Sean Chalmers <[email protected]>
964964
Sean Collins <[email protected]>

branches/try/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ Documentation improvements are very welcome. The source of `doc.rust-lang.org`
133133
is located in `src/doc` in the tree, and standard API documentation is generated
134134
from the source code itself.
135135

136-
Documentation pull requests function in the same as other pull requests, though
137-
you may see a slightly different form of `r+`:
136+
Documentation pull requests function in the same way as other pull requests,
137+
though you may see a slightly different form of `r+`:
138138

139139
@bors: r+ 38fe8d2 rollup
140140

branches/try/RELEASES.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Highlights
1616
jobs). It's not enabled by default, but will be "in the near
1717
future". It can be activated with the `-C codegen-units=N` flag to
1818
`rustc`.
19+
* This is the first release with [experimental support for linking
20+
with the MSVC linker and lib C on Windows (instead of using the GNU
21+
variants via MinGW)][win]. It is yet recommended only for the most
22+
intrepid Rusticians.
23+
* Benchmark compilations are showing a 30% improvement in
24+
bootstrapping over 1.1.
1925

2026
Breaking Changes
2127
----------------
@@ -28,6 +34,13 @@ Breaking Changes
2834
in, and the same value reported by clang's
2935
`alignof`. [`mem::min_align_of`] is deprecated. This is not known to
3036
break real code.
37+
* [The `#[packed]` attribute is no longer silently accepted by the
38+
compiler][packed]. This attribute did nothing and code that
39+
mentioned it likely did not work as intended.
40+
* Associated type defaults are [now behind the
41+
`associated_type_defaults` feature gate][ad]. In 1.1 associated type
42+
defaults *did not work*, but could be mentioned syntactically. As
43+
such this breakage has minimal impact.
3144

3245
Language
3346
--------
@@ -43,12 +56,11 @@ Libraries
4356
`LinkedList`, `VecDeque`, `EnumSet`, `BinaryHeap`, `VecMap`,
4457
`BTreeSet` and `BTreeMap`. [RFC][extend-rfc].
4558
* The [`iter::once`] function returns an iterator that yields a single
46-
element.
47-
* The [`iter::empty`] function returns an iterator that yields no
59+
element, and [`iter::empty`] returns an iterator that yields no
4860
elements.
4961
* The [`matches`] and [`rmatches`] methods on `str` return iterators
5062
over substring matches.
51-
* [`Cell`] and [`RefCell`] both implement [`Eq`].
63+
* [`Cell`] and [`RefCell`] both implement `Eq`.
5264
* A number of methods for wrapping arithmetic are added to the
5365
integral types, [`wrapping_div`], [`wrapping_rem`],
5466
[`wrapping_neg`], [`wrapping_shl`], [`wrapping_shr`]. These are in
@@ -140,7 +152,9 @@ Misc
140152
[fat]: https://github.com/rust-lang/rust/pull/26411
141153
[dst]: https://github.com/rust-lang/rfcs/blob/master/text/0982-dst-coercion.md
142154
[parcodegen]: https://github.com/rust-lang/rust/pull/26018
143-
155+
[packed]: https://github.com/rust-lang/rust/pull/25541
156+
[ad]: https://github.com/rust-lang/rust/pull/27382
157+
[win]: https://github.com/rust-lang/rust/pull/25350
144158

145159
Version 1.1.0 (June 2015)
146160
=========================

0 commit comments

Comments
 (0)