Skip to content

Commit d09466c

Browse files
committedNov 30, 2018
Auto merge of #56381 - kennytm:rollup, r=kennytm
Rollup of 19 pull requests Successful merges: - #55011 (Add libstd Cargo feature "panic_immediate_abort") - #55821 (Use sort_by_cached_key when the key function is not trivial/free) - #56014 (add test for issue #21335) - #56131 (Assorted tweaks) - #56214 (Implement chalk unification routines) - #56216 (Add TryFrom<&[T]> for [T; $N] where T: Copy) - #56268 (Reuse the `P` in `InvocationCollector::fold_{,opt_}expr`.) - #56324 (Use raw_entry for more efficient interning) - #56336 (Clean up and streamline the pretty-printer) - #56337 (Fix const_fn ICE with non-const function pointer) - #56339 (Remove not used option) - #56341 (Rename conversion util; remove duplicate util in librustc_codegen_llvm.) - #56349 (rustc 1.30.0's linker flavor inference is a non-backwards compat change to -Clinker) - #56355 (Add inline attributes and add unit to CommonTypes) - #56360 (Optimize local linkchecker program) - #56364 (Fix panic with outlives in existential type) - #56365 (Stabilize self_struct_ctor feature.) - #56367 (Moved some feature gate tests to correct location) - #56373 (Update books)
2 parents d48ab69 + a6c4771 commit d09466c

File tree

76 files changed

+1908
-856
lines changed

Some content is hidden

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

76 files changed

+1908
-856
lines changed
 

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,6 @@
6565
[submodule "src/doc/rustc-guide"]
6666
path = src/doc/rustc-guide
6767
url = https://github.com/rust-lang/rustc-guide.git
68+
[submodule "src/doc/edition-guide"]
69+
path = src/doc/edition-guide
70+
url = https://github.com/rust-lang-nursery/edition-guide

‎src/bootstrap/doc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ macro_rules! book {
7070
book!(
7171
Nomicon, "src/doc/nomicon", "nomicon";
7272
Reference, "src/doc/reference", "reference";
73+
EditionGuide, "src/doc/edition-guide", "edition-guide";
7374
RustdocBook, "src/doc/rustdoc", "rustdoc";
7475
RustcBook, "src/doc/rustc", "rustc";
7576
RustByExample, "src/doc/rust-by-example", "rust-by-example";

0 commit comments

Comments
 (0)