nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollup merge of #18251 : steveklabnik/build_module_guide

Browse Source
This commit is contained in:
Alex Crichton 2014-10-27 09:07:00 -07:00
commit 6f65ad1a44
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -989,6 +989,7 @@ do
make_dir $h/test/doc-guide-container make_dir $h/test/doc-guide-container
make_dir $h/test/doc-guide-tasks make_dir $h/test/doc-guide-tasks
make_dir $h/test/doc-guide-plugin make_dir $h/test/doc-guide-plugin
make_dir $h/test/doc-guide-crates
make_dir $h/test/doc-rust make_dir $h/test/doc-rust
done done

2
mk/docs.mk
View File

@ -27,7 +27,7 @@
###################################################################### ######################################################################
DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \ DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
guide-tasks guide-container guide-pointers guide-testing \ guide-tasks guide-container guide-pointers guide-testing \
guide-plugin complement-bugreport \ guide-plugin guide-crates complement-bugreport \
complement-lang-faq complement-design-faq complement-project-faq rust \ complement-lang-faq complement-design-faq complement-project-faq rust \
rustdoc guide-unsafe guide-strings reference rustdoc guide-unsafe guide-strings reference

2
src/doc/guide-crates.md
View File

@ -452,7 +452,7 @@ fn main() {
Rust will give us a compile-time error: Rust will give us a compile-time error:
```{rust,ignore} ```{notrust,ignore}
Compiling phrases v0.0.1 (file:///home/you/projects/phrases) Compiling phrases v0.0.1 (file:///home/you/projects/phrases)
/home/you/projects/phrases/src/main.rs:4:5: 4:40 error: a value named `hello` has already been imported in this module /home/you/projects/phrases/src/main.rs:4:5: 4:40 error: a value named `hello` has already been imported in this module
/home/you/projects/phrases/src/main.rs:4 use phrases::japanese::greetings::hello; /home/you/projects/phrases/src/main.rs:4 use phrases::japanese::greetings::hello;

1
src/doc/index.md
View File

@ -57,6 +57,7 @@ a guide that can help you out:
* [Strings](guide-strings.html) * [Strings](guide-strings.html)
* [Pointers](guide-pointers.html) * [Pointers](guide-pointers.html)
* [References and Lifetimes](guide-lifetimes.html) * [References and Lifetimes](guide-lifetimes.html)
* [Crates and modules](guide-crates.html)
* [Tasks and Communication](guide-tasks.html) * [Tasks and Communication](guide-tasks.html)
* [Foreign Function Interface](guide-ffi.html) * [Foreign Function Interface](guide-ffi.html)
* [Writing Unsafe and Low-Level Code](guide-unsafe.html) * [Writing Unsafe and Low-Level Code](guide-unsafe.html)

1
src/doc/po4a.conf
View File

@ -19,6 +19,7 @@
[type: text] src/doc/guide-tasks.md $lang:doc/l10n/$lang/guide-tasks.md [type: text] src/doc/guide-tasks.md $lang:doc/l10n/$lang/guide-tasks.md
[type: text] src/doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md [type: text] src/doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md
[type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-unsafe.md [type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-unsafe.md
[type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-crates.md
[type: text] src/doc/guide.md $lang:doc/l10n/$lang/guide.md [type: text] src/doc/guide.md $lang:doc/l10n/$lang/guide.md
[type: text] src/doc/index.md $lang:doc/l10n/$lang/index.md [type: text] src/doc/index.md $lang:doc/l10n/$lang/index.md
[type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md [type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md