Skip to content

Commit e2fe7a0

Browse files
committed
Lifetime guide -> ownership guide
1 parent 930f877 commit e2fe7a0

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

Diff for: configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ do
10461046
make_dir $h/test/doc-guide-ffi
10471047
make_dir $h/test/doc-guide-runtime
10481048
make_dir $h/test/doc-guide-macros
1049-
make_dir $h/test/doc-guide-lifetimes
1049+
make_dir $h/test/doc-guide-ownership
10501050
make_dir $h/test/doc-guide-pointers
10511051
make_dir $h/test/doc-guide-container
10521052
make_dir $h/test/doc-guide-tasks

Diff for: 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 \
File renamed without changes.

Diff for: src/doc/guide-pointers.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@ test.rs:4 let y = &x;
408408
```
409409

410410
As you might guess, this kind of analysis is complex for a human, and therefore
411-
hard for a computer, too! There is an entire [guide devoted to references
412-
and lifetimes](guide-lifetimes.html) that goes into lifetimes in
411+
hard for a computer, too! There is an entire [guide devoted to references, ownership,
412+
and lifetimes](guide-ownership.html) that goes into this topic in
413413
great detail, so if you want the full details, check that out.
414414

415415
## Best practices
@@ -526,7 +526,7 @@ with some improvements:
526526
4. Rust enforces that no other writeable pointers alias to this heap memory,
527527
which means writing to an invalid pointer is not possible.
528528

529-
See the section on references or the [lifetimes guide](guide-lifetimes.html)
529+
See the section on references or the [ownership guide](guide-ownership.html)
530530
for more detail on how lifetimes work.
531531

532532
Using boxes and references together is very common. For example:
@@ -759,5 +759,5 @@ Here's a quick rundown of Rust's pointer types:
759759
# Related resources
760760

761761
* [API documentation for Box](std/boxed/index.html)
762-
* [Lifetimes guide](guide-lifetimes.html)
762+
* [Ownership guide](guide-ownership.html)
763763
* [Cyclone paper on regions](http://www.cs.umd.edu/projects/cyclone/papers/cyclone-regions.pdf), which inspired Rust's lifetime system

Diff for: src/doc/guide-unsafe.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ build safe interfaces.
3737
## References
3838

3939
One of Rust's biggest features is memory safety. This is achieved in
40-
part via [the lifetime system](guide-lifetimes.html), which is how the
40+
part via [the ownership system](guide-ownership.html), which is how the
4141
compiler can guarantee that every `&` reference is always valid, and,
4242
for example, never pointing to freed memory.
4343

Diff for: src/doc/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ Rust Guides are in-depth looks at a particular topic that's relevant to Rust
5454
development. If you're trying to figure out how to do something, there may be
5555
a guide that can help you out:
5656

57+
* [Ownership](guide-ownership.html)
5758
* [Strings](guide-strings.html)
5859
* [Pointers](guide-pointers.html)
59-
* [References and Lifetimes](guide-lifetimes.html)
6060
* [Crates and modules](guide-crates.html)
6161
* [Tasks and Communication](guide-tasks.html)
6262
* [Error Handling](guide-error-handling.html)

Diff for: src/doc/po4a.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[type: text] src/doc/complement-project-faq.md $lang:doc/l10n/$lang/complement-project-faq.md
1212
[type: text] src/doc/guide-container.md $lang:doc/l10n/$lang/guide-container.md
1313
[type: text] src/doc/guide-ffi.md $lang:doc/l10n/$lang/guide-ffi.md
14-
[type: text] src/doc/guide-lifetimes.md $lang:doc/l10n/$lang/guide-lifetimes.md
14+
[type: text] src/doc/guide-ownership.md $lang:doc/l10n/$lang/guide-ownership.md
1515
[type: text] src/doc/guide-macros.md $lang:doc/l10n/$lang/guide-macros.md
1616
[type: text] src/doc/guide-plugin.md $lang:doc/l10n/$lang/guide-plugin.md
1717
[type: text] src/doc/guide-pointers.md $lang:doc/l10n/$lang/guide-pointers.md

0 commit comments

Comments
 (0)