From 578dfc7f863a26f99cc98f772f48042e646aef5c Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Mon, 26 Feb 2018 22:31:17 +0100
Subject: [PATCH] v0.2.5

---
 CHANGELOG.md                 | 10 ++++++++++
 Cargo.toml                   |  2 +-
 src/examples/_2_panic.rs     |  4 ++--
 src/examples/_6_allocator.rs |  3 +--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 874bab5..a908426 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.2.5] - 2018-02-26
+
+### Added
+
+- Comments to Cargo.toml and Xargo.toml to make it easier to try the examples.
+
+### Fixed
+
+- The `allocator` example to use the `#[global_allocator]` feature.
+
 ## [v0.2.4] - 2018-01-26
 
 ### Changed
diff --git a/Cargo.toml b/Cargo.toml
index ebcc9c2..2623cac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["arm", "cortex-m", "template"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-quickstart"
 repository = "https://github.com/japaric/cortex-m-quickstart"
-version = "0.2.4"
+version = "0.2.5"
 
 [dependencies]
 cortex-m = "0.4.0"
diff --git a/src/examples/_2_panic.rs b/src/examples/_2_panic.rs
index 5d6ebc5..a08d1c8 100644
--- a/src/examples/_2_panic.rs
+++ b/src/examples/_2_panic.rs
@@ -31,7 +31,7 @@
 //! 
 //! #[lang = "panic_fmt"]
 //! #[no_mangle]
-//! unsafe extern "C" fn rust_begin_unwind(
+//! pub unsafe extern "C" fn rust_begin_unwind(
 //!     args: core::fmt::Arguments,
 //!     file: &'static str,
 //!     line: u32,
@@ -42,7 +42,7 @@
 //!             .and_then(|_| {
 //!                 stdout
 //!                     .write_fmt(args)
-//!                     .and_then(|_| writeln!(stdout, "', {}:{}", file, line))
+//!                     .and_then(|_| writeln!(stdout, "', {}:{}:{}", file, line, col))
 //!             })
 //!             .ok();
 //!     }
diff --git a/src/examples/_6_allocator.rs b/src/examples/_6_allocator.rs
index 6168be8..58231e6 100644
--- a/src/examples/_6_allocator.rs
+++ b/src/examples/_6_allocator.rs
@@ -31,7 +31,6 @@
 //! #![feature(used)]
 //! #![feature(global_allocator)]
 //! #![no_std]
-//! #[allow(deprecated)]
 //! 
 //! // This is the allocator crate; you can use a different one
 //! extern crate alloc_cortex_m;
@@ -58,7 +57,7 @@
 //! fn main() {
 //!     // Initialize the allocator
 //!     let start = unsafe { &mut _sheap as *mut u32 as usize };
-//!     let end = unsafe { &mut _sheap as *mut u32 as usize };
+//!     let end = unsafe { &mut _eheap as *mut u32 as usize };
 //!     unsafe { ALLOCATOR.init(start, end - start) }
 //! 
 //!     // Growable array allocated on the heap