Skip to content

Commit 49e434f

Browse files
committed
---
yaml --- r: 35751 b: refs/heads/try2 c: f0c4140 h: refs/heads/master i: 35749: 2604e54 35747: 0f194ee 35743: 493a322 v: v3
1 parent 38018e0 commit 49e434f

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c6330036a4e20a60f7ade12ed9f4d53b8fc9d762
8+
refs/heads/try2: f0c4140dd09555e274e472a0d14fd22bbef579d8
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/tutorial.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,7 @@ fn main() {
128128

129129
If the Rust compiler was installed successfully, running `rustc
130130
hello.rs` will produce an executable called `hello` (or `hello.exe` on
131-
Windows) which, upon running, will likely do exactly what you expect
132-
(unless you are on Windows, in which case what it does is subject
133-
to local weather conditions).
134-
135-
> ***Note:*** That may or may not be hyperbole, but there are some
136-
> 'gotchas' to be aware of on Windows. First, the MinGW environment
137-
> must be set up perfectly. Please read [the
138-
> wiki][wiki-started]. Second, `rustc` may need to be [referred to as
139-
> `rustc.exe`][bug-3319]. It's a bummer, I know, and I am so very
140-
> sorry.
141-
142-
[bug-3319]: https://github.com/mozilla/rust/issues/3319
143-
[wiki-started]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
131+
Windows) which, upon running, will likely do exactly what you expect.
144132

145133
The Rust compiler tries to provide useful information when it runs
146134
into an error. If you modify the program to make it invalid (for
@@ -160,6 +148,15 @@ declaration to appear at the top level of the file—all statements must
160148
live inside a function. Rust programs can also be compiled as
161149
libraries, and included in other programs.
162150

151+
> ***Note:*** There are some 'gotchas' to be aware of on
152+
> Windows. First, the MinGW environment must be set up
153+
> perfectly. Please read [the wiki][wiki-started]. Second, `rustc` may
154+
> need to be [referred to as `rustc.exe`][bug-3319]. It's a bummer, I
155+
> know.
156+
157+
[bug-3319]: https://github.com/mozilla/rust/issues/3319
158+
[wiki-started]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
159+
163160
## Editing Rust code
164161

165162
There are vim highlighting and indentation scripts in the Rust source

0 commit comments

Comments
 (0)