bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #15706 : phi-gamma/rust/master, r=huonw

Browse source 
I kept changes to each file in a separate commit. Please let me know if you prefer them
squashed!
This commit is contained in:
bors 2014-07-17 17:16:23 +00:00
commit c4b1077dfb
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
man/rustc.1
View file

@ -68,7 +68,7 @@ AST nodes and blocks with IDs), or flowgraph=<nodeid> (graphviz
formatted flowgraph for node)
.TP
\fB\-\-dep-info\fR [FILENAME]
Output dependency info to <filename> after compiling, in o format suitable
Output dependency info to <filename> after compiling, in a format suitable
for use by Makefiles.
.TP
\fB\-\-sysroot\fR PATH

4
src/doc/complement-lang-faq.md
View file

@ -31,7 +31,7 @@ You may also be interested in browsing [GitHub's Rust][github-rust] page.
## Does it run on Windows?
Yes. All development happens in lock-step on all 3 target platforms. Using MinGW, not Cygwin. Note that the windows implementation currently has some limitations: in particular 64-bit build is [not fully supported yet][win64], and all executables created by rustc [depends on libgcc DLL at runtime][libgcc].
Yes. All development happens in lock-step on all 3 target platforms. Using MinGW, not Cygwin. Note that the windows implementation currently has some limitations: in particular 64-bit build is [not fully supported yet][win64], and all executables created by rustc [depend on libgcc DLL at runtime][libgcc].
[win64]: https://github.com/rust-lang/rust/issues/1237
[libgcc]: https://github.com/rust-lang/rust/issues/11782
@ -68,7 +68,7 @@ Cleanup through RAII-style destructors is more likely to work than in catch bloc
## Why aren't modules type-parametric?
We want to maintain the option to parametrize at runtime. We may make eventually change this limitation, but initially this is how type parameters were implemented.
We want to maintain the option to parametrize at runtime. We may eventually change this limitation, but initially this is how type parameters were implemented.
## Why aren't values type-parametric? Why only items?

2
src/libsyntax/parse/obsolete.rs
View file

@ -76,7 +76,7 @@ impl<'a> ParserObsoleteMethods for parser::Parser<'a> {
),
ObsoleteManagedExpr => (
"`@` notation for a managed pointer allocation",
"use the `box(GC)` oeprator instead of `@`"
"use the `box(GC)` operator instead of `@`"
),
};