Skip to content

Commit 3c89031

Browse files
committed
auto merge of rust-lang#18613 : steveklabnik/rust/ownership_guide, r=huonw
This is a work in progress, but this should get *extensive* review, so I'm putting it up early and often. This is the start of a draft of the new 'ownership guide,' which explains ownership, borrowing, etc. I'm feeling better about this framing than last time's, but we'll see.
2 parents 207a508 + 7213704 commit 3c89031

8 files changed

+463
-574
lines changed

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ do
10441044
make_dir $h/test/doc-guide-ffi
10451045
make_dir $h/test/doc-guide-runtime
10461046
make_dir $h/test/doc-guide-macros
1047-
make_dir $h/test/doc-guide-lifetimes
1047+
make_dir $h/test/doc-guide-ownership
10481048
make_dir $h/test/doc-guide-pointers
10491049
make_dir $h/test/doc-guide-container
10501050
make_dir $h/test/doc-guide-tasks

mk/docs.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# L10N_LANGS are the languages for which the docs have been
2626
# translated.
2727
######################################################################
28-
DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
28+
DOCS := index intro tutorial guide guide-ffi guide-macros guide-ownership \
2929
guide-tasks guide-container guide-pointers guide-testing \
3030
guide-plugin guide-crates complement-bugreport guide-error-handling \
3131
complement-lang-faq complement-design-faq complement-project-faq \

0 commit comments

Comments
 (0)