diff options
| author | bors <bors@rust-lang.org> | 2021-07-07 03:31:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-07 03:31:23 +0000 |
| commit | c5e344f7747dbd7e7d4b209e3c480deb5979a56f (patch) | |
| tree | 0390ebc50ec6f445460fefd566a67be3be79a088 /library/core/src/lib.rs | |
| parent | c0bd5a584da4f26a1391163a0bdc21b34cf1ba54 (diff) | |
| parent | 51968854f4c3bd9cc54cf35c3e84047adfc6cf21 (diff) | |
| download | rust-c5e344f7747dbd7e7d4b209e3c480deb5979a56f.tar.gz rust-c5e344f7747dbd7e7d4b209e3c480deb5979a56f.zip | |
Auto merge of #86920 - JohnTitor:rollup-buvzpkr, r=JohnTitor
Rollup of 8 pull requests
Successful merges:
- #80918 (Add Integer::log variants)
- #86717 (Rename some Rust 2021 lints to better names )
- #86819 (Clean up rustdoc IDs)
- #86880 (Test ManuallyDrop::clone_from.)
- #86906 (Replace deprecated compare_and_swap and fix typo in core::sync::atomic::{fence, compiler_fence} docs)
- #86907 (Migrate `cpu-usage-over-time.py` to Python 3)
- #86916 (rewrote documentation for thread::yield_now())
- #86919 (Update books)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src/lib.rs')
| -rw-r--r-- | library/core/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 866cd5ec535..3557dbad90c 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -164,7 +164,8 @@ #![feature(no_niche)] // rust-lang/rust#68303 #![feature(no_coverage)] // rust-lang/rust#84605 #![deny(unsafe_op_in_unsafe_fn)] -#![deny(or_patterns_back_compat)] +#![cfg_attr(bootstrap, deny(or_patterns_back_compat))] +#![cfg_attr(not(bootstrap), deny(rust_2021_incompatible_or_patterns))] // allow using `core::` in intra-doc links #[allow(unused_extern_crates)] |