From 340aa6b205090b90829d7365e7fba8086ba08ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= Date: Sun, 20 Jul 2014 13:06:04 -0700 Subject: [PATCH] Fix for latest rustc. --- src/hal/k20/uart.rs | 2 +- src/hal/lpc17xx/peripheral_clock.rs | 2 +- src/hal/lpc17xx/uart.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hal/k20/uart.rs b/src/hal/k20/uart.rs index 4d1e09ff..135bc542 100644 --- a/src/hal/k20/uart.rs +++ b/src/hal/k20/uart.rs @@ -78,7 +78,7 @@ enum ParitySelect { } impl UARTPeripheral { - fn reg(self) -> ®::UART { + fn reg(self) -> &'static reg::UART { match self { UART0 => ®::UART0, UART1 => ®::UART1, diff --git a/src/hal/lpc17xx/peripheral_clock.rs b/src/hal/lpc17xx/peripheral_clock.rs index 9f9e371d..41f5c1c8 100644 --- a/src/hal/lpc17xx/peripheral_clock.rs +++ b/src/hal/lpc17xx/peripheral_clock.rs @@ -195,7 +195,7 @@ impl PeripheralClock { } } - fn divisor_reg_and_offset(self) -> (®::PCLKSEL, u32) { + fn divisor_reg_and_offset(self) -> (&'static reg::PCLKSEL, u32) { match self.to_divisor() { WDTDivisor|TIMER0Divisor|TIMER1Divisor|UART0Divisor|UART1Divisor| PWM1Divisor|I2C0Divisor|SPIDivisor|SSP1Divisor|DACDivisor|ADCDivisor| diff --git a/src/hal/lpc17xx/uart.rs b/src/hal/lpc17xx/uart.rs index 3b91eb9c..1f1fe585 100644 --- a/src/hal/lpc17xx/uart.rs +++ b/src/hal/lpc17xx/uart.rs @@ -113,7 +113,7 @@ pub struct UART { } impl UARTPeripheral { - fn reg(self) -> ®::UART { + fn reg(self) -> &'static reg::UART { match self { UART0 => ®::UART0, UART2 => ®::UART2,