Skip to content
This repository was archived by the owner on Jul 6, 2019. It is now read-only.

6/23 Nightly fallout #317

Merged
merged 1 commit into from
Jul 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/app_blink.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_blink_k20.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_blink_k20_isr.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(no_std, core, start)]
#![feature(no_std, core, start, core_intrinsics)]
#![no_std]

extern crate core;
Expand Down
2 changes: 1 addition & 1 deletion examples/app_blink_pt.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_platformtree)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_blink_stm32f4.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_blink_stm32l1.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_blink_tiva_c.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_platformtree)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_bluenrg_stm32l1.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(no_std, core, start)]
#![feature(no_std, core, start, core_intrinsics)]
#![no_std]

//! Sample application for BlueNRG communication over SPI in X-NUCLEO-IDB04A1
Expand Down
2 changes: 1 addition & 1 deletion examples/app_dht22.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(start, plugin, no_std, core)]
#![feature(start, plugin, no_std, core, core_intrinsics)]
#![crate_type="staticlib"]
#![no_std]
#![plugin(macro_platformtree)]
Expand Down
2 changes: 1 addition & 1 deletion examples/app_empty.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(core, plugin, asm, no_std, start)]
#![feature(core, plugin, asm, no_std, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_lcd_tiva_c.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![crate_type="staticlib"]
#![no_std]
#![plugin(macro_platformtree)]
Expand Down
2 changes: 1 addition & 1 deletion examples/app_nothing.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
2 changes: 1 addition & 1 deletion examples/app_uart.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(start, plugin, no_std, core)]
#![feature(start, plugin, no_std, core, core_intrinsics)]
#![crate_type="staticlib"]
#![no_std]
#![plugin(macro_platformtree)]
Expand Down
2 changes: 1 addition & 1 deletion examples/app_uart_tiva_c.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![crate_type="staticlib"]
#![no_std]
#![plugin(macro_platformtree)]
Expand Down
2 changes: 1 addition & 1 deletion examples/app_usart_stm32l1.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(plugin, no_std, core, start)]
#![feature(plugin, no_std, core, start, core_intrinsics)]
#![no_std]
#![plugin(macro_zinc)]

Expand Down
4 changes: 2 additions & 2 deletions ioreg/src/builder/accessors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fn build_field_set_fn(cx: &ExtCtxt, path: &Vec<String>,
{
let reg_ty = cx.ty_ident(reg.name.span, utils::path_ident(cx, path));
let fn_name =
cx.ident_of((String::from_str("set_")+field.name.node.as_str()).as_str());
cx.ident_of((String::from("set_")+field.name.node.as_str()).as_str());
let field_ty: P<ast::Ty> =
cx.ty_path(utils::field_type_path(cx, path, reg, field));
let setter_ty = utils::setter_name(cx, path);
Expand Down Expand Up @@ -194,7 +194,7 @@ fn build_field_clear_fn(cx: &ExtCtxt, path: &Vec<String>,
{
let reg_ty = cx.ty_ident(reg.name.span, utils::path_ident(cx, path));
let fn_name =
cx.ident_of((String::from_str("clear_")+field.name.node.as_str()).as_str());
cx.ident_of((String::from("clear_")+field.name.node.as_str()).as_str());
let setter_ty = utils::setter_name(cx, path);
utils::unwrap_impl_item(if field.count.node == 1 {
quote_item!(cx,
Expand Down
4 changes: 2 additions & 2 deletions ioreg/src/builder/setter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ fn build_field_set_fn(cx: &ExtCtxt, path: &Vec<String>, reg: &node::Reg,
let unpacked_ty = utils::reg_primitive_type(cx, reg)
.expect("Unexpected non-primitive register");
let fn_name =
cx.ident_of((String::from_str("set_")+field.name.node.as_str()).as_str());
cx.ident_of((String::from("set_")+field.name.node.as_str()).as_str());
let field_ty: P<ast::Ty> =
cx.ty_path(utils::field_type_path(cx, path, reg, field));
let mask = utils::mask(cx, field);
Expand Down Expand Up @@ -247,7 +247,7 @@ fn build_field_clear_fn(cx: &ExtCtxt, path: &Vec<String>,
{
let setter_ty = utils::setter_name(cx, path);
let fn_name =
cx.ident_of((String::from_str("clear_")+field.name.node.as_str()).as_str());
cx.ident_of((String::from("clear_")+field.name.node.as_str()).as_str());
let mask = utils::mask(cx, field);

let field_doc = match field.docstring {
Expand Down
2 changes: 1 addition & 1 deletion ioreg/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ N => NAME

*/

#![feature(quote, plugin_registrar, rustc_private, collections, core)]
#![feature(quote, plugin_registrar, rustc_private)]
#![feature(convert)]
#![feature(plugin)]

Expand Down
4 changes: 2 additions & 2 deletions ioreg/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ impl Reg {

/// Size of registers of register group in bytes
pub fn regs_size(regs: &Vec<Reg>) -> u64 {
match regs.iter().max_by(|r| r.offset) {
Some(last) => last.offset + last.ty.size(),
match regs.iter().map(|r| r.offset + r.ty.size()).max() {
Some(last) => last,
None => 0,
}
}
Expand Down
2 changes: 1 addition & 1 deletion ioreg/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ impl<'a> Parser<'a> {
self.bump();
let stripped = s[prefix.len() ..]
.trim_left_matches(' ');
docs.push(String::from_str(stripped));
docs.push(String::from(stripped));
},
_ => break,
}
Expand Down
8 changes: 6 additions & 2 deletions platformtree/src/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ impl Builder {
));

let mut stmts = vec!(init_stack_stmt, init_data_stmt);
stmts.push_all(self.main_stmts.as_slice());
for s in self.main_stmts.clone().into_iter() {
stmts.push(s);
}

let body = cx.block(DUMMY_SP, stmts, None);

Expand Down Expand Up @@ -219,7 +221,9 @@ impl Builder {
let attr_no_mangle = cx.attribute(span, cx.meta_word(
span, InternedString::new("no_mangle")));
let mut attrs = vec!(attr_no_mangle);
attrs.push_all(local_attrs);
for a in local_attrs {
attrs.push(a.clone());
}

P(ast::Item {
ident: cx.ident_of(name),
Expand Down
2 changes: 1 addition & 1 deletion platformtree/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

//! Platform tree operations crate

#![feature(quote, rustc_private, collections, alloc, hash, convert)]
#![feature(quote, rustc_private, hash_default, convert, rc_weak)]

// extern crate regex;
extern crate syntax;
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#![feature(asm, lang_items, plugin, core)]
#![feature(asm, lang_items, plugin, core, core_intrinsics, core_prelude, range_inclusive, core_slice_ext)]
#![allow(improper_ctypes)]
#![deny(missing_docs)]
#![no_std]
Expand Down
2 changes: 1 addition & 1 deletion volatile_cell/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

//! A cell that with volatile setter and getter.

#![feature(core, no_std)]
#![feature(core, no_std, core_intrinsics)]
#![no_std]

#[cfg(feature="replayer")] extern crate hamcrest;
Expand Down