Skip to content

Commit

Permalink
Merge pull request #254 from KodrAus/cargo/1.3.1
Browse files Browse the repository at this point in the history
Prepare for 1.3.1 release
  • Loading branch information
KodrAus committed Aug 12, 2021
2 parents 186af85 + b4dbed0 commit b234906
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 407 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
@@ -1,4 +1,10 @@
# 1.3.0
# 1.3.1

- Revert unconditional `#[repr(transparent)]` ([#252])

[#252]: https://github.com/bitflags/bitflags/pull/252

# 1.3.0 (yanked)

- Add `#[repr(transparent)]` ([#187])

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -3,7 +3,7 @@ name = "bitflags"
# NB: When modifying, also modify:
# 1. html_root_url in lib.rs
# 2. number in readme (for breaking changes)
version = "1.3.0"
version = "1.3.1"
edition = "2018"
authors = ["The Rust Project Developers"]
license = "MIT/Apache-2.0"
Expand Down
20 changes: 19 additions & 1 deletion src/lib.rs
Expand Up @@ -113,6 +113,24 @@
//! Attributes can be attached to the generated `struct`s by placing them
//! before the `struct` keyword.
//!
//! ## Representations
//!
//! It's valid to add a `#[repr(C)]` or `#[repr(transparent)]` attribute to a type
//! generated by `bitflags!`. In these cases, the type is guaranteed to be a newtype.
//!
//! ```
//! use bitflags::bitflags;
//!
//! bitflags! {
//! #[repr(transparent)]
//! struct Flags: u32 {
//! const A = 0b00000001;
//! const B = 0b00000010;
//! const C = 0b00000100;
//! }
//! }
//! ```
//!
//! # Trait implementations
//!
//! The `Copy`, `Clone`, `PartialEq`, `Eq`, `PartialOrd`, `Ord` and `Hash`
Expand Down Expand Up @@ -258,7 +276,7 @@
//! Users should generally avoid defining a flag with a value of zero.

#![cfg_attr(not(test), no_std)]
#![doc(html_root_url = "https://docs.rs/bitflags/1.3.0")]
#![doc(html_root_url = "https://docs.rs/bitflags/1.3.1")]

#[doc(hidden)]
pub extern crate core as _core;
Expand Down
27 changes: 0 additions & 27 deletions tests/compile-fail/non_integer_base/all_defined.stderr.beta

This file was deleted.

0 comments on commit b234906

Please sign in to comment.