Skip to content

Commit 3e47a63

Browse files
borsbors
committed
---
yaml --- r: 228277 b: refs/heads/try c: da1b296 h: refs/heads/master i: 228275: e7fecaa v: v3
1 parent cae561f commit 3e47a63

File tree

11 files changed

+34
-23
lines changed

11 files changed

+34
-23
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: c415683402e2c93afaa1b7aa9a127b1fd302ccdd
4+
refs/heads/try: da1b296e16b1c1c07afac10026bb77e96fa64a0d
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/src/liballoc/boxed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ use core::raw::{TraitObject};
7171
/// The following two examples are equivalent:
7272
///
7373
/// ```
74-
/// # #![feature(box_heap)]
74+
/// #![feature(box_heap)]
7575
/// #![feature(box_syntax)]
7676
/// use std::boxed::HEAP;
7777
///
@@ -162,7 +162,7 @@ impl<T : ?Sized> Box<T> {
162162
///
163163
/// # Examples
164164
/// ```
165-
/// # #![feature(box_raw)]
165+
/// #![feature(box_raw)]
166166
/// use std::boxed;
167167
///
168168
/// let seventeen = Box::new(17u32);

‎branches/try/src/libcollections/vec_deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl<T> VecDeque<T> {
108108
ptr::write(self.ptr.offset(off as isize), t);
109109
}
110110

111-
/// Returns true iff the buffer is at capacity
111+
/// Returns true if and only if the buffer is at capacity
112112
#[inline]
113113
fn is_full(&self) -> bool { self.cap - self.len() == 1 }
114114

‎branches/try/src/libcore/fmt/builders.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
175175
fn is_pretty(&self) -> bool {
176176
self.fmt.flags() & (1 << (FlagV1::Alternate as usize)) != 0
177177
}
178+
179+
/// Returns the wrapped `Formatter`.
180+
#[unstable(feature = "debug_builder_formatter", reason = "recently added")]
181+
pub fn formatter(&mut self) -> &mut fmt::Formatter<'b> {
182+
&mut self.fmt
183+
}
178184
}
179185

180186
struct DebugInner<'a, 'b: 'a> {

‎branches/try/src/libcore/fmt/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,20 +1488,19 @@ macro_rules! tuple {
14881488
impl<$($name:Debug),*> Debug for ($($name,)*) {
14891489
#[allow(non_snake_case, unused_assignments)]
14901490
fn fmt(&self, f: &mut Formatter) -> Result {
1491-
try!(write!(f, "("));
1491+
let mut builder = f.debug_tuple("");
14921492
let ($(ref $name,)*) = *self;
14931493
let mut n = 0;
14941494
$(
1495-
if n > 0 {
1496-
try!(write!(f, ", "));
1497-
}
1498-
try!(write!(f, "{:?}", *$name));
1495+
builder.field($name);
14991496
n += 1;
15001497
)*
1498+
15011499
if n == 1 {
1502-
try!(write!(f, ","));
1500+
try!(write!(builder.formatter(), ","));
15031501
}
1504-
write!(f, ")")
1502+
1503+
builder.finish()
15051504
}
15061505
}
15071506
peel! { $($name,)* }

‎branches/try/src/libcore/num/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ macro_rules! uint_impl {
11261126
acc
11271127
}
11281128

1129-
/// Returns `true` iff `self == 2^k` for some `k`.
1129+
/// Returns `true` if and only if `self == 2^k` for some `k`.
11301130
#[stable(feature = "rust1", since = "1.0.0")]
11311131
#[inline]
11321132
pub fn is_power_of_two(self) -> bool {

‎branches/try/src/librustdoc/html/layout.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ r##"<!DOCTYPE html>
7272
<div class="search-container">
7373
<input class="search-input" name="search"
7474
autocomplete="off"
75-
placeholder="Click or press 'S' to search, '?' for more options..."
75+
placeholder="Click or press ‘S’ to search, ‘?’ for more options…"
7676
type="search">
7777
</div>
7878
</form>
@@ -85,7 +85,7 @@ r##"<!DOCTYPE html>
8585
8686
<div id="help" class="hidden">
8787
<div class="shortcuts">
88-
<h1>Keyboard shortcuts</h1>
88+
<h1>Keyboard Shortcuts</h1>
8989
<dl>
9090
<dt>?</dt>
9191
<dd>Show this help dialog</dd>
@@ -100,7 +100,7 @@ r##"<!DOCTYPE html>
100100
</dl>
101101
</div>
102102
<div class="infos">
103-
<h1>Search tricks</h1>
103+
<h1>Search Tricks</h1>
104104
<p>
105105
Prefix searches with a type followed by a colon (e.g.
106106
<code>fn:</code>) to restrict the search to a given type.

‎branches/try/src/librustdoc/html/static/main.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
447447

448448
#help {
449449
background: #e9e9e9;
450-
border-radius: 4px;
451450
box-shadow: 0 0 6px rgba(0,0,0,.2);
452451
position: absolute;
453452
top: 300px;
@@ -461,7 +460,7 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
461460

462461
#help dt {
463462
float: left;
464-
border-radius: 3px;
463+
border-radius: 4px;
465464
border: 1px solid #bfbfbf;
466465
background: #fff;
467466
width: 23px;

‎branches/try/src/librustdoc/html/static/playpen.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ document.addEventListener('DOMContentLoaded', function() {
1616
return;
1717
}
1818

19+
var featureRegexp = new RegExp('^\s*#!\\[feature\\(\.*?\\)\\]');
1920
var elements = document.querySelectorAll('pre.rust');
2021

2122
Array.prototype.forEach.call(elements, function(el) {
@@ -29,8 +30,14 @@ document.addEventListener('DOMContentLoaded', function() {
2930
a.setAttribute('class', 'test-arrow');
3031

3132
var code = el.previousElementSibling.textContent;
33+
34+
var channel = '';
35+
if (featureRegexp.test(code)) {
36+
channel = '&version=nightly';
37+
}
38+
3239
a.setAttribute('href', window.playgroundUrl + '?code=' +
33-
encodeURIComponent(code));
40+
encodeURIComponent(code) + channel);
3441
a.setAttribute('target', '_blank');
3542

3643
el.appendChild(a);

‎branches/try/src/libstd/array.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
//! A fixed-size array is denoted `[T; N]` for the element type `T` and
12-
//! the compile time constant size `N`. The size should be zero or positive.
12+
//! the compile time constant size `N`. The size must be zero or positive.
1313
//!
1414
//! Arrays values are created either with an explicit expression that lists
1515
//! each element: `[x, y, z]` or a repeat expression: `[x; N]`. The repeat
@@ -32,7 +32,9 @@
3232
//!
3333
//! [slice]: primitive.slice.html
3434
//!
35-
//! ## Examples
35+
//! Rust does not currently support generics over the size of an array type.
36+
//!
37+
//! # Examples
3638
//!
3739
//! ```
3840
//! let mut array: [i32; 3] = [0; 3];
@@ -49,7 +51,5 @@
4951
//!
5052
//! ```
5153
//!
52-
//! Rust does not currently support generics over the size of an array type.
53-
//!
5454
5555
#![doc(primitive = "array")]

‎branches/try/src/rust-installer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 0da191a30ba385215c5eb1dc97c2b5f076f93b07
1+
Subproject commit c37d3747da75c280237dc2d6b925078e69555499

0 commit comments

Comments
 (0)