savanni
/
ruduino
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add explicit 'dyn' to trait references 

Fix deprecation warnings.
This commit is contained in:
Dylan McKay 2020-06-20 05:59:12 +12:00
parent 181a0b7214
commit 15dc60d9a1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core_generator/build.rs
View File

@ -88,7 +88,7 @@ fn generate_cores_mod_rs(mcus: &[Mcu]) -> Result<(), io::Error> {
writeln!(w) writeln!(w)
} }
fn write_core_module(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> { fn write_core_module(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
writeln!(w, "//! Core for {}.", mcu.device.name)?; writeln!(w, "//! Core for {}.", mcu.device.name)?;
writeln!(w)?; writeln!(w)?;
writeln!(w, "use {{RegisterBits, Register}};")?; writeln!(w, "use {{RegisterBits, Register}};")?;

10
core_generator/gen.rs
View File

@ -2,7 +2,7 @@ use avr_mcu::*;
use std::io; use std::io;
use std::io::prelude::*; use std::io::prelude::*;
pub fn write_registers(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> { pub fn write_registers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
for register in mcu.registers() { for register in mcu.registers() {
let ty = if register.size == 1 { "u8" } else { "u16" }; let ty = if register.size == 1 { "u8" } else { "u16" };
@ -44,7 +44,7 @@ pub fn write_registers(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> {
Ok(()) Ok(())
} }
pub fn write_pins(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> { pub fn write_pins(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
if let Some(port) = mcu.peripheral("PORT") { if let Some(port) = mcu.peripheral("PORT") {
writeln!(w, "pub mod port {{")?; writeln!(w, "pub mod port {{")?;
writeln!(w, " use super::*;")?; writeln!(w, " use super::*;")?;
@ -87,7 +87,7 @@ pub fn write_pins(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> {
Ok(()) Ok(())
} }
pub fn write_spi_modules(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> { pub fn write_spi_modules(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
if let Some(module) = mcu.module("SPI") { if let Some(module) = mcu.module("SPI") {
let peripheral = mcu.peripheral("SPI").expect("found SPI module but no peripheral"); let peripheral = mcu.peripheral("SPI").expect("found SPI module but no peripheral");
let port_peripheral = mcu.port_peripheral(); let port_peripheral = mcu.port_peripheral();
@ -129,7 +129,7 @@ pub fn write_spi_modules(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> {
Ok(()) Ok(())
} }
pub fn write_usarts(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> { pub fn write_usarts(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
if let Some(module) = mcu.module("USART") { if let Some(module) = mcu.module("USART") {
for usart in module.register_groups.iter() { for usart in module.register_groups.iter() {
writeln!(w, "/// The {} module.", usart.name)?; writeln!(w, "/// The {} module.", usart.name)?;
@ -156,7 +156,7 @@ pub fn write_usarts(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> {
Ok(()) Ok(())
} }
pub fn write_timers(mcu: &Mcu, w: &mut Write) -> Result<(), io::Error> { pub fn write_timers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
if let Some(tc) = mcu.module("TC8") { // Timer/Counter, 8-bit. if let Some(tc) = mcu.module("TC8") { // Timer/Counter, 8-bit.
const TYPE_NAME: &'static str = "Timer8"; const TYPE_NAME: &'static str = "Timer8";