Skip to content

Commit 1862044

Browse files
committed
fix uses #[cfg(has_termination_lang)]
it was typo-ed in the source code
1 parent 35b1a1e commit 1862044

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

cortex-m-rt/CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10-
## [v0.3.11] - 2018-01-17
10+
## [v0.3.12] - 2018-01-17
11+
12+
### Fixed
13+
14+
- Support for recent nightlies.
15+
16+
## [v0.3.11] - 2018-01-17 - YANKED
1117

1218
### Changed
1319

@@ -212,7 +218,8 @@ section size addr
212218

213219
Initial release
214220

215-
[Unreleased]: https://github.com/japaric/cortex-m-rt/compare/v0.3.11...HEAD
221+
[Unreleased]: https://github.com/japaric/cortex-m-rt/compare/v0.3.12...HEAD
222+
[v0.3.12]: https://github.com/japaric/cortex-m-rt/compare/v0.3.11...v0.3.12
216223
[v0.3.11]: https://github.com/japaric/cortex-m-rt/compare/v0.3.10...v0.3.11
217224
[v0.3.10]: https://github.com/japaric/cortex-m-rt/compare/v0.3.9...v0.3.10
218225
[v0.3.9]: https://github.com/japaric/cortex-m-rt/compare/v0.3.8...v0.3.9

cortex-m-rt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords = ["arm", "cortex-m", "runtime", "startup"]
77
license = "MIT OR Apache-2.0"
88
name = "cortex-m-rt"
99
repository = "https://github.com/japaric/cortex-m-rt"
10-
version = "0.3.11"
10+
version = "0.3.12"
1111

1212
[dependencies]
1313
cortex-m = "0.3.0"

cortex-m-rt/src/lang_items.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ unsafe extern "C" fn panic_fmt(_: ::core::fmt::Arguments, _: &'static str, _: u3
2424
// The final piece is that the entry point of our program, the reset handler,
2525
// has to call `rustc_main`. That's covered by the `reset_handler` function in
2626
// root of this crate.
27-
#[cfg(has_termination_trait)]
27+
#[cfg(has_termination_lang)]
2828
#[lang = "start"]
2929
extern "C" fn start<T>(main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize
3030
where
@@ -35,7 +35,7 @@ where
3535
0
3636
}
3737

38-
#[cfg(not(has_termination_trait))]
38+
#[cfg(not(has_termination_lang))]
3939
#[lang = "start"]
4040
extern "C" fn start(main: fn(), _argc: isize, _argv: *const *const u8) -> isize {
4141
main();
@@ -44,12 +44,12 @@ extern "C" fn start(main: fn(), _argc: isize, _argv: *const *const u8) -> isize
4444
}
4545

4646
#[lang = "termination"]
47-
#[cfg(has_termination_trait)]
47+
#[cfg(has_termination_lang)]
4848
pub trait Termination {
4949
fn report(self) -> i32;
5050
}
5151

52-
#[cfg(has_termination_trait)]
52+
#[cfg(has_termination_lang)]
5353
impl Termination for () {
5454
fn report(self) -> i32 {
5555
0

0 commit comments

Comments
 (0)