Skip to content

Commit 1ddaf8b

Browse files
committed
Auto merge of #30309 - alexcrichton:more-tier-two, r=steveklabnik
We've got lots of new automation set up in the past few months, so these platforms are now all tier 2 as we're building artifacts and gating on them.
2 parents 8babb7d + 453375b commit 1ddaf8b

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

src/doc/book/getting-started.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ these platforms are required to have each of the following:
6363
| Target | std |rustc|cargo| notes |
6464
|-------------------------------|-----|-----|-----|----------------------------|
6565
| `i686-pc-windows-msvc` |||| 32-bit MSVC (Windows 7+) |
66+
| `x86_64-unknown-linux-musl` || | | 64-bit Linux with MUSL |
67+
| `arm-linux-androideabi` || | | ARM Android |
68+
| `arm-unknown-linux-gnueabi` ||| | ARM Linux (2.6.18+) |
69+
| `arm-unknown-linux-gnueabihf` ||| | ARM Linux (2.6.18+) |
70+
| `aarch64-unknown-linux-gnu` || | | ARM64 Linux (2.6.18+) |
71+
| `mips-unknown-linux-gnu` || | | MIPS Linux (2.6.18+) |
72+
| `mipsel-unknown-linux-gnu` || | | MIPS (LE) Linux (2.6.18+) |
6673

6774
### Tier 3
6875

@@ -75,15 +82,8 @@ unofficial locations.
7582

7683
| Target | std |rustc|cargo| notes |
7784
|-------------------------------|-----|-----|-----|----------------------------|
78-
| `x86_64-unknown-linux-musl` || | | 64-bit Linux with MUSL |
79-
| `arm-linux-androideabi` || | | ARM Android |
8085
| `i686-linux-android` || | | 32-bit x86 Android |
8186
| `aarch64-linux-android` || | | ARM64 Android |
82-
| `arm-unknown-linux-gnueabi` ||| | ARM Linux (2.6.18+) |
83-
| `arm-unknown-linux-gnueabihf` ||| | ARM Linux (2.6.18+) |
84-
| `aarch64-unknown-linux-gnu` || | | ARM64 Linux (2.6.18+) |
85-
| `mips-unknown-linux-gnu` || | | MIPS Linux (2.6.18+) |
86-
| `mipsel-unknown-linux-gnu` || | | MIPS (LE) Linux (2.6.18+) |
8787
| `powerpc-unknown-linux-gnu` || | | PowerPC Linux (2.6.18+) |
8888
| `i386-apple-ios` || | | 32-bit x86 iOS |
8989
| `x86_64-apple-ios` || | | 64-bit x86 iOS |
@@ -127,7 +127,7 @@ not want the script to run ‘sudo’ then pass it the --disable-sudo flag.
127127
You may uninstall later by running /usr/local/lib/rustlib/uninstall.sh,
128128
or by running this script again with the --uninstall flag.
129129
130-
Continue? (y/N)
130+
Continue? (y/N)
131131
```
132132

133133
From here, press `y` for ‘yes’, and then follow the rest of the prompts.
@@ -188,7 +188,7 @@ was installed.
188188
Now that you have Rust installed, we'll help you write your first Rust program.
189189
It's traditional when learning a new language to write a little program to
190190
print the text “Hello, world!” to the screen, and in this section, we'll follow
191-
that tradition.
191+
that tradition.
192192

193193
The nice thing about starting with such a simple program is that you can
194194
quickly verify that your compiler is installed, and that it's working properly.
@@ -202,7 +202,7 @@ practicing it early on is good.
202202
> There are a number of extensions in development by the community, and the
203203
> Rust team ships plugins for [various editors]. Configuring your editor or
204204
> IDE is out of the scope of this tutorial, so check the documentation for your
205-
> specific setup.
205+
> specific setup.
206206
207207
[SolidOak]: https://github.com/oakes/SolidOak
208208
[various editors]: https://github.com/rust-lang/rust/blob/master/src/etc/CONFIGS.md
@@ -244,14 +244,14 @@ following commands:
244244

245245
```bash
246246
$ rustc main.rs
247-
$ ./main
247+
$ ./main
248248
Hello, world!
249249
```
250250

251251
In Windows, just replace `main` with `main.exe`. Regardless of your operating
252252
system, you should see the string `Hello, world!` print to the terminal. If you
253253
did, then congratulations! You've officially written a Rust program. That makes
254-
you a Rust programmer! Welcome.
254+
you a Rust programmer! Welcome.
255255

256256
## Anatomy of a Rust Program
257257

@@ -285,13 +285,13 @@ Inside the `main()` function:
285285
This line does all of the work in this little program: it prints text to the
286286
screen. There are a number of details that are important here. The first is
287287
that it’s indented with four spaces, not tabs.
288-
288+
289289
The second important part is the `println!()` line. This is calling a Rust
290290
*[macro]*, which is how metaprogramming is done in Rust. If it were calling a
291291
function instead, it would look like this: `println()` (without the !). We'll
292292
discuss Rust macros in more detail later, but for now you just need to
293293
know that when you see a `!` that means that you’re calling a macro instead of
294-
a normal function.
294+
a normal function.
295295

296296

297297
[macro]: macros.html
@@ -313,7 +313,7 @@ begin. Most lines of Rust code end with a `;`.
313313
## Compiling and Running Are Separate Steps
314314

315315
In "Writing and Running a Rust Program", we showed you how to run a newly
316-
created program. We'll break that process down and examine each step now.
316+
created program. We'll break that process down and examine each step now.
317317

318318
Before running a Rust program, you have to compile it. You can use the Rust
319319
compiler by entering the `rustc` command and passing it the name of your source
@@ -395,7 +395,7 @@ in which you installed Rust, to determine if Cargo is separate.
395395
## Converting to Cargo
396396

397397
Let’s convert the Hello World program to Cargo. To Cargo-fy a project, you need
398-
to do three things:
398+
to do three things:
399399

400400
1. Put your source file in the right directory.
401401
2. Get rid of the old executable (`main.exe` on Windows, `main` everywhere else)
@@ -419,7 +419,7 @@ Cargo expects your source files to live inside a *src* directory, so do that
419419
first. This leaves the top-level project directory (in this case,
420420
*hello_world*) for READMEs, license information, and anything else not related
421421
to your code. In this way, using Cargo helps you keep your projects nice and
422-
tidy. There's a place for everything, and everything is in its place.
422+
tidy. There's a place for everything, and everything is in its place.
423423

424424
Now, copy *main.rs* to the *src* directory, and delete the compiled file you
425425
created with `rustc`. As usual, replace `main` with `main.exe` if you're on
@@ -428,15 +428,15 @@ Windows.
428428
This example retains `main.rs` as the source filename because it's creating an
429429
executable. If you wanted to make a library instead, you'd name the file
430430
`lib.rs`. This convention is used by Cargo to successfully compile your
431-
projects, but it can be overridden if you wish.
431+
projects, but it can be overridden if you wish.
432432

433433
### Creating a Configuration File
434434

435435
Next, create a new file inside your *hello_world* directory, and call it
436436
`Cargo.toml`.
437437

438438
Make sure to capitalize the `C` in `Cargo.toml`, or Cargo won't know what to do
439-
with the configuration file.
439+
with the configuration file.
440440

441441
This file is in the *[TOML]* (Tom's Obvious, Minimal Language) format. TOML is
442442
similar to INI, but has some extra goodies, and is used as Cargo’s
@@ -464,7 +464,7 @@ know to compile your program: its name, what version it is, and who wrote it.
464464
Once you've added this information to the *Cargo.toml* file, save it to finish
465465
creating the configuration file.
466466

467-
## Building and Running a Cargo Project
467+
## Building and Running a Cargo Project
468468

469469
With your *Cargo.toml* file in place in your project's root directory, you
470470
should be ready to build and run your Hello World program! To do so, enter the
@@ -477,7 +477,7 @@ $ ./target/debug/hello_world
477477
Hello, world!
478478
```
479479

480-
Bam! If all goes well, `Hello, world!` should print to the terminal once more.
480+
Bam! If all goes well, `Hello, world!` should print to the terminal once more.
481481

482482
You just built a project with `cargo build` and ran it with
483483
`./target/debug/hello_world`, but you can actually do both in one step with
@@ -532,7 +532,7 @@ doesn't have dependencies, so the file is a bit sparse. Realistically, you
532532
won't ever need to touch this file yourself; just let Cargo handle it.
533533

534534
That’s it! If you've been following along, you should have successfully built
535-
`hello_world` with Cargo.
535+
`hello_world` with Cargo.
536536

537537
Even though the project is simple, it now uses much of the real tooling you’ll
538538
use for the rest of your Rust career. In fact, you can expect to start
@@ -587,7 +587,7 @@ fn main() {
587587
}
588588
```
589589

590-
Cargo has generated a "Hello World!" for you, and you’re ready to start coding!
590+
Cargo has generated a "Hello World!" for you, and you’re ready to start coding!
591591

592592
> Note: If you want to look at Cargo in more detail, check out the official [Cargo
593593
guide], which covers all of its features.
@@ -598,7 +598,7 @@ guide], which covers all of its features.
598598

599599
This chapter covered the basics that will serve you well through the rest of
600600
this book, and the rest of your time with Rust. Now that you’ve got the tools
601-
down, we'll cover more about the Rust language itself.
601+
down, we'll cover more about the Rust language itself.
602602

603603
You have two options: Dive into a project with ‘[Learn Rust][learnrust]’, or
604604
start from the bottom and work your way up with ‘[Syntax and

0 commit comments

Comments
 (0)