Merge pull request #25 from hashmismatch/beta_0.3.0

Rust stabilization

Author: rudib

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 
 language: rust
 rust:
-  - nightly 
+  - beta
 
 cache:
   directories:
@@ -21,11 +21,10 @@ install:
   - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION  
   - source ~/.cargo/env
   - export QEMU_ARCHIVE=$HOME/qemueclipse.tgz
-  - export QEMU_URL=https://github.com/gnuarmeclipse/qemu/releases/download/gae-2.6.0-20160728/gnuarmeclipse-qemu-debian64-2.6.0-201607280535.tgz
-  - export QEMU_DIR=$HOME/qemu/2.6.0-201607280535
+  - export QEMU_URL=https://github.com/gnu-mcu-eclipse/qemu/releases/download/v2.8.0-6-20190517/gnu-mcu-eclipse-qemu-2.8.0-6-20190517-1329-centos64.tgz
+  - export QEMU_DIR=$HOME/gnu-mcu-eclipse/qemu/2.8.0-6-20190517-1329
   - if [ ! -e $QEMU_DIR/bin/qemu-system-gnuarmeclipse ]; then wget $QEMU_URL -O $QEMU_ARCHIVE && tar xzf $QEMU_ARCHIVE -C $HOME ; fi
   - export PATH=$PATH:$QEMU_DIR/bin:$HOME/.cargo/bin  
-  - rustup component add rust-src
   - rustup target add thumbv7m-none-eabi
 
 script:

qemu_runner/src/builder.rs

@@ -101,7 +101,8 @@ pub fn crossbuild_rust_tests(options: &CrossbuildOptions) -> CrossbuiltTests {
 				.expect("Can't get a current toolchain");
 
 			let active_toolchain = String::from_utf8_lossy(&output.stdout);
-			active_toolchain.trim().to_owned()
+			let mut split = active_toolchain.split_whitespace();
+			split.next().expect("active toolchain missing").trim().to_owned()
 		};
 
 		let rustup_sysroot = {
@@ -120,9 +121,21 @@ pub fn crossbuild_rust_tests(options: &CrossbuildOptions) -> CrossbuiltTests {
 			copy(sysroot_rlib.absolute_path, format!("{}/{}.o", tests_deps_dir, sysroot_rlib.name.trim_right_matches(".rlib")));
 		}
 
-		let mut test_objects: Vec<String> = find_files(&tests_deps_dir, |n| {
+		let mut test_objects: Vec<_> = find_files(&tests_deps_dir, |n| {
 			n.ends_with(".o")
-		}).iter().cloned().map(|f| f.absolute_path).collect();
+		}).iter().cloned().collect();
+		
+		test_objects.sort_by_key(|f| {
+			if f.name.contains("freertos_rs") { 0 }
+			else if f.name.contains("lazy_static") { 1 }
+			else if f.name.contains("liballoc") { 2 }
+			else if f.name.contains("libcompiler_builtins") { 3 }
+			else if f.name.contains("libcore") { 4 }
+			else if f.name.contains("librustc_std_workspace_core") { 5 }
+			else { 6 }
+		});
+
+		let mut test_objects: Vec<_> = test_objects.into_iter().map(|f| f.absolute_path).collect();
 
 		let mut objects = vec![];
 		objects.append(&mut test_objects);

qemu_stm32_tests/Cargo.toml

@@ -11,5 +11,5 @@ crate-type = ["lib"]
 freertos_rs = { path = "../" }
 
 [dependencies.lazy_static]
-version = "0.2.1"
-features = ["nightly", "spin_no_std"]
+version = "1.3.0"
+features = ["spin_no_std"]

qemu_stm32_tests/src/lib.rs

@@ -1,13 +1,7 @@
 #![no_std]
-#![feature(lang_items)]
-
-#![feature(alloc)]
-#![feature(fnbox)]
 
 use core::panic::PanicInfo;
 
-#[lang = "eh_unwind_resume"] extern fn eh_unwind_resume() {}
-
 #[panic_handler]
 #[inline(never)]
 fn panic(info: &PanicInfo) -> ! {
@@ -89,6 +83,3 @@ pub mod test_stats;
 pub mod test_processor;
 pub mod test_timers;
 
-
-
-

qemu_stm32_tests/src/prelude/no_std.rs

@@ -12,7 +12,7 @@ pub use core::ops::{Deref, DerefMut};
 pub use core::cell::UnsafeCell;
 
 pub use alloc::rc::Rc;
-pub use alloc::boxed::{Box, FnBox};
+pub use alloc::boxed::Box;
 pub use alloc::sync::Arc;
 pub use alloc::vec::Vec;
 pub use alloc::string::*;

qemu_stm32_tests/src/test_mem_leaks1.rs

@@ -17,21 +17,19 @@ pub fn test_mem_leaks1() -> i8 {
 		// simple task spawn		
 		for i in 0..100 {
 			Task::new().name(&format!("t_{}", i)).stack_size(256).start(move || {
-				let a = i;
-				let s: String = "Hello world".into();
+				let s = format!("Hello world {}", i);
 			}).unwrap();
 
-			CurrentTask::delay(Duration::ms(1));
+			CurrentTask::delay(Duration::ms(2));
 		}
 
-
 		// simple mutexes
 		for i in 0..100 {
 			let m = Mutex::new(0).unwrap();
 			let mut v = m.lock(Duration::ms(50)).unwrap();
 			*v += 1;
 		}
-
+		
 		// recursive mutexes
 		for i in 0..100 {
 			let m = RecursiveMutex::new(0).unwrap();
@@ -75,7 +73,7 @@ pub fn test_mem_leaks1() -> i8 {
 			q.send(10, Duration::ms(5)).unwrap();
 			q.receive(Duration::ms(100)).unwrap();
 		}
-
+		
 		end_memory_usage = heap_allocated_memory();
 		assert_eq!(start_memory_usage, end_memory_usage, "Mem usage #1");
 

src/lib.rs

@@ -9,8 +9,7 @@
 //! your firmware's sources directory and modify it to include the appropriate headers for
 //! target your system.
 //!
-//! For a complete example, check the enclosed GCC ARM/Rust/QEMU based unit tests. The Rust
-//! cargo crate [xargo](https://crates.io/crates/xargo) is used for cross-compilation. The project
+//! For a complete example, check the enclosed GCC ARM/Rust/QEMU based unit tests. The project
 //! ``qemu_runner`` cross-compiles this library, compiles the main firmware using GCC ARM and links
 //! in the appropriate entry points for unit tests. [GNU ARM Eclipse QEMU](http://gnuarmeclipse.github.io/qemu/)
 //! is used to run the test binaries.
@@ -53,13 +52,9 @@
 
 #![no_std]
 
-#![feature(alloc)]
-#![feature(fnbox)]
-
 #[macro_use]
 extern crate alloc;
 
-
 mod prelude;
 mod shim;
 

src/patterns/compute_task.rs

@@ -83,6 +83,7 @@ impl ComputeTaskBuilder for TaskBuilder {
 /// let result = task.into_result(Duration::ms(1000)).unwrap();
 /// # println!("{}", result);
 /// ```
+
 pub struct ComputeTask<R> {
     task: Task,
     result: Arc<Mutex<Option<R>>>,

src/prelude/no_std.rs

@@ -13,7 +13,7 @@ pub use core::cell::UnsafeCell;
 pub use core::ptr;
 
 pub use alloc::rc::Rc;
-pub use alloc::boxed::{Box, FnBox};
+pub use alloc::boxed::Box;
 pub use alloc::sync::{Arc, Weak};
 pub use alloc::vec::Vec;
 pub use alloc::string::*;

src/semaphore.rs

@@ -32,14 +32,7 @@ impl Semaphore {
             Ok(Semaphore { semaphore: s })
         }
     }
-
-    // pub fn get_count(&self) -> u32 {
-    // unsafe {
-    // freertos_rs_get_semaphore_count(self.semaphore)
-    // }
-    // }
-    //
-
+    
     /// Lock this semaphore in a RAII fashion
     pub fn lock<D: DurationTicks>(&self, max_wait: D) -> Result<SemaphoreGuard, FreeRtosError> {
         unsafe {