diff options
| author | bors <bors@rust-lang.org> | 2020-09-26 17:50:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-26 17:50:26 +0000 |
| commit | e37c99fa1ca2341d652a1b1859ea9aa2ae993e1e (patch) | |
| tree | b9e095a23ea81994bc8aaeffe492b6cd4aa5c7b8 /src/tools | |
| parent | 6f9a8a7f9b9732c55511d2a2a3914e8feafc7c52 (diff) | |
| parent | 9e02642fb3f1f78793c24bbad9c39368e2024968 (diff) | |
| download | rust-e37c99fa1ca2341d652a1b1859ea9aa2ae993e1e.tar.gz rust-e37c99fa1ca2341d652a1b1859ea9aa2ae993e1e.zip | |
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`
Diffstat (limited to 'src/tools')
| m--------- | src/tools/miri | 16 | ||||
| -rw-r--r-- | src/tools/rustbook/Cargo.toml | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/tools/miri b/src/tools/miri -Subproject 02a33d411d8e385942776760a99535d69826349 +Subproject 2f84bfc57dd0ef22269bb84dae10f71e5e23e85 diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml index f0a6ce2fa06..f5e5c0867b4 100644 --- a/src/tools/rustbook/Cargo.toml +++ b/src/tools/rustbook/Cargo.toml @@ -9,6 +9,6 @@ edition = "2018" clap = "2.25.0" [dependencies.mdbook] -version = "0.4.0" +version = "0.4.3" default-features = false features = ["search"] |