Skip to content

Commit

Permalink
build the crates guide
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed Oct 23, 2014
1 parent 8a40854 commit 0c3ad8b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions configure
Expand Up @@ -928,6 +928,7 @@ do
make_dir $h/test/doc-guide-container
make_dir $h/test/doc-guide-tasks
make_dir $h/test/doc-guide-plugin
make_dir $h/test/doc-guide-crates
make_dir $h/test/doc-rust
done

Expand Down
2 changes: 1 addition & 1 deletion mk/docs.mk
Expand Up @@ -27,7 +27,7 @@
######################################################################
DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
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 \
rustdoc guide-unsafe guide-strings reference

Expand Down
2 changes: 1 addition & 1 deletion src/doc/guide-crates.md
Expand Up @@ -452,7 +452,7 @@ fn main() {
Rust will give us a compile-time error:
```{rust,ignore}
```{notrust,ignore}
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 use phrases::japanese::greetings::hello;
Expand Down
1 change: 1 addition & 0 deletions src/doc/index.md
Expand Up @@ -57,6 +57,7 @@ a guide that can help you out:
* [Strings](guide-strings.html)
* [Pointers](guide-pointers.html)
* [References and Lifetimes](guide-lifetimes.html)
* [Crates and modules](guide-crates.html)
* [Tasks and Communication](guide-tasks.html)
* [Foreign Function Interface](guide-ffi.html)
* [Writing Unsafe and Low-Level Code](guide-unsafe.html)
Expand Down
1 change: 1 addition & 0 deletions src/doc/po4a.conf
Expand Up @@ -19,6 +19,7 @@
[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-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/index.md $lang:doc/l10n/$lang/index.md
[type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md
Expand Down

9 comments on commit 0c3ad8b

@steveklabnik
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=huonw

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw
at steveklabnik@0c3ad8b

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging steveklabnik/rust/build_module_guide = 0c3ad8b into auto

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

steveklabnik/rust/build_module_guide = 0c3ad8b merged ok, testing candidate = a33d4cbd

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw
at steveklabnik@0c3ad8b

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging steveklabnik/rust/build_module_guide = 0c3ad8b into auto

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

steveklabnik/rust/build_module_guide = 0c3ad8b merged ok, testing candidate = 32f0eae4

@bors
Copy link
Contributor

@bors bors commented on 0c3ad8b Oct 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.