Skip to content

Commit

Permalink
Merge #176
Browse files Browse the repository at this point in the history
176: Prepare for 1.0.5 release r=KodrAus a=KodrAus

[Diff since the last release](1.0.4...master)

Includes:

- #171 
- #173 
- #175 

Co-authored-by: Ashley Mannix <ashleymannix@live.com.au>
  • Loading branch information
bors[bot] and KodrAus committed May 2, 2019
2 parents 30fbf77 + 7ace11a commit d06e657
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,15 @@
# 1.0.5

- Use compiletest_rs flags supported by stable toolchain ([#171])

- Put the user provided attributes first ([#173])

- Make bitflags methods `const` on newer compilers ([#175])

[#171]: https://github.com/rust-lang-nursery/bitflags/pull/171
[#173]: https://github.com/rust-lang-nursery/bitflags/pull/173
[#175]: https://github.com/rust-lang-nursery/bitflags/pull/175

# 1.0.4

- Support Rust 2018 style macro imports ([#165])
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -4,7 +4,7 @@ name = "bitflags"
# NB: When modifying, also modify:
# 1. html_root_url in lib.rs
# 2. number in readme (for breaking changes)
version = "1.0.4"
version = "1.0.5"
authors = ["The Rust Project Developers"]
license = "MIT/Apache-2.0"
keywords = ["bit", "bitmask", "bitflags", "flags"]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Expand Up @@ -247,7 +247,7 @@
//! ```

#![no_std]
#![doc(html_root_url = "https://docs.rs/bitflags/1.0.4")]
#![doc(html_root_url = "https://docs.rs/bitflags/1.0.5")]

#[cfg(test)]
#[macro_use]
Expand Down

0 comments on commit d06e657

Please sign in to comment.