Skip to content

Commit e37c99f

Browse files
committedSep 26, 2020
Auto merge of #77224 - RalfJung:rollup-hdvb96c, r=RalfJung
Rollup of 12 pull requests Successful merges: - #75454 (Explicitly document the size guarantees that Option makes.) - #76631 (Add `x.py setup`) - #77076 (Add missing code examples on slice iter types) - #77093 (merge `need_type_info_err(_const)`) - #77122 (Add `#![feature(const_fn_floating_point_arithmetic)]`) - #77127 (Update mdBook) - #77161 (Remove TrustedLen requirement from BuilderMethods::switch) - #77166 (update Miri) - #77181 (Add doc alias for pointer primitive) - #77204 (Remove stray word from `ClosureKind::extends` docs) - #77207 (Rename `whence` to `span`) - #77211 (Remove unused #[allow(...)] statements from compiler/) Failed merges: - #77170 (Remove `#[rustc_allow_const_fn_ptr]` and add `#![feature(const_fn_fn_ptr_basics)]`) r? `@ghost`
2 parents 6f9a8a7 + 9e02642 commit e37c99f

File tree

74 files changed

+809
-343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+809
-343
lines changed
 

‎Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1848,9 +1848,9 @@ dependencies = [
18481848

18491849
[[package]]
18501850
name = "mdbook"
1851-
version = "0.4.2"
1851+
version = "0.4.3"
18521852
source = "registry+https://github.com/rust-lang/crates.io-index"
1853-
checksum = "b75e31ae4eaa0e45e17ee2b6b9e3ed969c3c6ff12bb4c2e352c42493f4ebb706"
1853+
checksum = "29be448fcafb00c5a8966c4020c2a5ffbbc333e5b96d0bb5ef54b5bd0524d9ff"
18541854
dependencies = [
18551855
"ammonia",
18561856
"anyhow",

‎compiler/rustc_arena/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(new_uninit)]
1616
#![feature(maybe_uninit_slice)]
1717
#![cfg_attr(test, feature(test))]
18-
#![allow(deprecated)]
1918

2019
use rustc_data_structures::cold_path;
2120
use smallvec::SmallVec;

0 commit comments

Comments
 (0)
Please sign in to comment.