Auto merge of #26961 - Manishearth:rollup, r=Manishearth

- Successful merges: #26932, #26936, #26943, #26944
- Failed merges:
This commit is contained in:
bors 2015-07-11 07:40:27 +00:00
commit 1b28ffa521
4 changed files with 15 additions and 8 deletions

View File

@ -71,7 +71,7 @@
/// The following two examples are equivalent:
///
/// ```
/// # #![feature(box_heap)]
/// #![feature(box_heap)]
/// #![feature(box_syntax)]
/// use std::boxed::HEAP;
///
@ -162,7 +162,7 @@ pub fn into_raw(b: Box<T>) -> *mut T {
///
/// # Examples
/// ```
/// # #![feature(box_raw)]
/// #![feature(box_raw)]
/// use std::boxed;
///
/// let seventeen = Box::new(17u32);

View File

@ -16,6 +16,7 @@ document.addEventListener('DOMContentLoaded', function() {
return;
}
var featureRegexp = new RegExp('^\s*#!\\[feature\\(\.*?\\)\\]');
var elements = document.querySelectorAll('pre.rust');
Array.prototype.forEach.call(elements, function(el) {
@ -29,8 +30,14 @@ document.addEventListener('DOMContentLoaded', function() {
a.setAttribute('class', 'test-arrow');
var code = el.previousElementSibling.textContent;
var channel = '';
if (featureRegexp.test(code)) {
channel = '&version=nightly';
}
a.setAttribute('href', window.playgroundUrl + '?code=' +
encodeURIComponent(code));
encodeURIComponent(code) + channel);
a.setAttribute('target', '_blank');
el.appendChild(a);

View File

@ -9,7 +9,7 @@
// except according to those terms.
//! A fixed-size array is denoted `[T; N]` for the element type `T` and
//! the compile time constant size `N`. The size should be zero or positive.
//! the compile time constant size `N`. The size must be zero or positive.
//!
//! Arrays values are created either with an explicit expression that lists
//! each element: `[x, y, z]` or a repeat expression: `[x; N]`. The repeat
@ -32,7 +32,9 @@
//!
//! [slice]: primitive.slice.html
//!
//! ## Examples
//! Rust does not currently support generics over the size of an array type.
//!
//! # Examples
//!
//! ```
//! let mut array: [i32; 3] = [0; 3];
@ -49,7 +51,5 @@
//!
//! ```
//!
//! Rust does not currently support generics over the size of an array type.
//!
#![doc(primitive = "array")]

@ -1 +1 @@
Subproject commit 0da191a30ba385215c5eb1dc97c2b5f076f93b07
Subproject commit c37d3747da75c280237dc2d6b925078e69555499