Skip to content

Commit e8b2308

Browse files
committed
---
yaml --- r: 272190 b: refs/heads/auto c: d611cc0 h: refs/heads/master
1 parent aa24f46 commit e8b2308

File tree

240 files changed

+1734
-1697
lines changed

Some content is hidden

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

240 files changed

+1734
-1697
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 5428e6e27306519c9957c8f3c448c63b7fef3a06
11+
refs/heads/auto: d611cc080c4f7a5e078990e6cf74083a1d8c4823
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,11 @@ To contribute to Rust, please see [CONTRIBUTING](CONTRIBUTING.md).
177177
Rust has an [IRC] culture and most real-time collaboration happens in a
178178
variety of channels on Mozilla's IRC network, irc.mozilla.org. The
179179
most popular channel is [#rust], a venue for general discussion about
180-
Rust, and a good place to ask for help.
180+
Rust. And a good place to ask for help would be [#rust-beginners].
181181
182182
[IRC]: https://en.wikipedia.org/wiki/Internet_Relay_Chat
183183
[#rust]: irc://irc.mozilla.org/rust
184+
[#rust-beginners]: irc://irc.mozilla.org/rust-beginners
184185
185186
## License
186187

branches/auto/mk/crates.mk

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_
5858
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
5959
rustc_data_structures rustc_front rustc_platform_intrinsics \
6060
rustc_plugin rustc_metadata rustc_passes rustc_save_analysis \
61-
rustc_const_eval
61+
rustc_const_eval rustc_const_math
6262
HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros \
6363
flate arena graphviz rbml log serialize
6464
TOOLS := compiletest rustdoc rustc rustbook error_index_generator
@@ -92,36 +92,39 @@ DEPS_test := std getopts term native:rust_test_helpers
9292
DEPS_syntax := std term serialize log arena libc rustc_bitflags rustc_unicode
9393
DEPS_syntax_ext := syntax fmt_macros
9494

95-
DEPS_rustc_const_eval := std syntax
95+
DEPS_rustc_const_math := std syntax log serialize
96+
DEPS_rustc_const_eval := rustc_const_math rustc syntax log serialize rustc_front \
97+
rustc_back graphviz
9698

9799
DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml rustc_front\
98100
log graphviz rustc_back rustc_data_structures\
99-
rustc_const_eval
101+
rustc_const_math
100102
DEPS_rustc_back := std syntax rustc_front flate log libc
101103
DEPS_rustc_borrowck := rustc rustc_front rustc_mir log graphviz syntax
102104
DEPS_rustc_data_structures := std log serialize
103105
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
104106
rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
105107
rustc_trans rustc_privacy rustc_lint rustc_front rustc_plugin \
106-
rustc_metadata syntax_ext rustc_passes rustc_save_analysis
108+
rustc_metadata syntax_ext rustc_passes rustc_save_analysis rustc_const_eval
107109
DEPS_rustc_front := std syntax log serialize
108-
DEPS_rustc_lint := rustc log syntax
110+
DEPS_rustc_lint := rustc log syntax rustc_const_eval
109111
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
110-
DEPS_rustc_metadata := rustc rustc_front syntax rbml rustc_const_eval
111-
DEPS_rustc_passes := syntax rustc core rustc_front
112-
DEPS_rustc_mir := rustc rustc_front syntax rustc_const_eval
112+
DEPS_rustc_metadata := rustc rustc_front syntax rbml rustc_const_math
113+
DEPS_rustc_passes := syntax rustc core rustc_front rustc_const_eval
114+
DEPS_rustc_mir := rustc rustc_front syntax rustc_const_math rustc_const_eval
113115
DEPS_rustc_resolve := arena rustc rustc_front log syntax
114116
DEPS_rustc_platform_intrinsics := std
115117
DEPS_rustc_plugin := rustc rustc_metadata syntax rustc_mir
116118
DEPS_rustc_privacy := rustc rustc_front log syntax
117119
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir \
118120
log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics \
119-
rustc_const_eval
121+
rustc_const_math rustc_const_eval
120122
DEPS_rustc_save_analysis := rustc log syntax rustc_front
121-
DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics rustc_const_eval
123+
DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics rustc_const_math \
124+
rustc_const_eval
122125

123126
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
124-
test rustc_lint rustc_front
127+
test rustc_lint rustc_front rustc_const_eval
125128

126129

127130
TOOL_DEPS_compiletest := test getopts log

branches/auto/src/doc/book/associated-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ declarations.
131131
## Trait objects with associated types
132132

133133
There’s one more bit of syntax we should talk about: trait objects. If you
134-
try to create a trait object from an associated type, like this:
134+
try to create a trait object from a trait with an associated type, like this:
135135

136136
```rust,ignore
137137
# trait Graph {

branches/auto/src/doc/book/getting-started.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,15 @@ installed. Doing so will depend on your specific system, consult its
164164
documentation for more details.
165165

166166
If not, there are a number of places where we can get help. The easiest is
167-
[the #rust IRC channel on irc.mozilla.org][irc], which we can access through
168-
[Mibbit][mibbit]. Click that link, and we'll be chatting with other Rustaceans
169-
(a silly nickname we call ourselves) who can help us out. Other great resources
170-
include [the user’s forum][users], and [Stack Overflow][stackoverflow].
167+
[the #rust-beginners IRC channel on irc.mozilla.org][irc-beginners] and for
168+
general discussion [the #rust IRC channel on irc.mozilla.org][irc], which we
169+
can access through [Mibbit][mibbit]. Then we'll be chatting with other
170+
Rustaceans (a silly nickname we call ourselves) who can help us out. Other great
171+
resources include [the user’s forum][users] and [Stack Overflow][stackoverflow].
171172

173+
[irc-beginners]: irc://irc.mozilla.org/#rust-beginners
172174
[irc]: irc://irc.mozilla.org/#rust
173-
[mibbit]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
175+
[mibbit]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-beginners,%23rust
174176
[users]: https://users.rust-lang.org/
175177
[stackoverflow]: http://stackoverflow.com/questions/tagged/rust
176178

branches/auto/src/doc/nomicon/vec.md

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

33
To bring everything together, we're going to write `std::Vec` from scratch.
44
Because all the best tools for writing unsafe code are unstable, this
5-
project will only work on nightly (as of Rust 1.2.0). With the exception of the
5+
project will only work on nightly (as of Rust 1.9.0). With the exception of the
66
allocator API, much of the unstable code we'll use is expected to be stabilized
77
in a similar form as it is today.
88

branches/auto/src/libcollections/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#![feature(placement_new_protocol)]
4949
#![feature(shared)]
5050
#![feature(slice_patterns)]
51+
#![feature(specialization)]
5152
#![feature(staged_api)]
5253
#![feature(step_by)]
5354
#![feature(str_char)]

branches/auto/src/libcollections/string.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@ pub trait ToString {
17551755
#[stable(feature = "rust1", since = "1.0.0")]
17561756
impl<T: fmt::Display + ?Sized> ToString for T {
17571757
#[inline]
1758-
fn to_string(&self) -> String {
1758+
default fn to_string(&self) -> String {
17591759
use core::fmt::Write;
17601760
let mut buf = String::new();
17611761
let _ = buf.write_fmt(format_args!("{}", self));
@@ -1764,6 +1764,14 @@ impl<T: fmt::Display + ?Sized> ToString for T {
17641764
}
17651765
}
17661766

1767+
#[stable(feature = "str_to_string_specialization", since = "1.9.0")]
1768+
impl ToString for str {
1769+
#[inline]
1770+
fn to_string(&self) -> String {
1771+
String::from(self)
1772+
}
1773+
}
1774+
17671775
#[stable(feature = "rust1", since = "1.0.0")]
17681776
impl AsRef<str> for String {
17691777
#[inline]

branches/auto/src/libcore/cell.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,6 @@ impl<T:Copy> Cell<T> {
216216

217217
/// Returns a reference to the underlying `UnsafeCell`.
218218
///
219-
/// # Safety
220-
///
221-
/// This function is `unsafe` because `UnsafeCell`'s field is public.
222-
///
223219
/// # Examples
224220
///
225221
/// ```
@@ -229,11 +225,11 @@ impl<T:Copy> Cell<T> {
229225
///
230226
/// let c = Cell::new(5);
231227
///
232-
/// let uc = unsafe { c.as_unsafe_cell() };
228+
/// let uc = c.as_unsafe_cell();
233229
/// ```
234230
#[inline]
235231
#[unstable(feature = "as_unsafe_cell", issue = "27708")]
236-
pub unsafe fn as_unsafe_cell(&self) -> &UnsafeCell<T> {
232+
pub fn as_unsafe_cell(&self) -> &UnsafeCell<T> {
237233
&self.value
238234
}
239235
}

branches/auto/src/librustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ log = { path = "../liblog" }
1818
rbml = { path = "../librbml" }
1919
rustc_back = { path = "../librustc_back" }
2020
rustc_bitflags = { path = "../librustc_bitflags" }
21-
rustc_const_eval = { path = "../librustc_const_eval" }
21+
rustc_const_math = { path = "../librustc_const_math" }
2222
rustc_data_structures = { path = "../librustc_data_structures" }
2323
rustc_front = { path = "../librustc_front" }
2424
serialize = { path = "../libserialize" }

0 commit comments

Comments
 (0)