Skip to content

Commit 706e4d3

Browse files
authored
Rollup merge of #101684 - zahash:readme-changes, r=jyn514
smol grammar changes to README.md smol grammar changes to README.md
2 parents 4301231 + e82922f commit 706e4d3

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

README.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Read ["Installation"] from [The Book].
2222
## Installing from Source
2323

2424
The Rust build system uses a Python script called `x.py` to build the compiler,
25-
which manages the bootstrapping process. It lives in the root of the project.
25+
which manages the bootstrapping process. It lives at the root of the project.
2626

2727
The `x.py` command can be run directly on most systems in the following format:
2828

@@ -32,7 +32,7 @@ The `x.py` command can be run directly on most systems in the following format:
3232

3333
This is how the documentation and examples assume you are running `x.py`.
3434

35-
Systems such as Ubuntu 20.04 LTS do not create the necessary `python` command by default when Python is installed that allows `x.py` to be run directly. In that case you can either create a symlink for `python` (Ubuntu provides the `python-is-python3` package for this), or run `x.py` using Python itself:
35+
Systems such as Ubuntu 20.04 LTS do not create the necessary `python` command by default when Python is installed that allows `x.py` to be run directly. In that case, you can either create a symlink for `python` (Ubuntu provides the `python-is-python3` package for this), or run `x.py` using Python itself:
3636

3737
```sh
3838
# Python 3
@@ -103,22 +103,21 @@ by running it with the `--help` flag or reading the [rustc dev guide][rustcguide
103103
### Building on Windows
104104
105105
There are two prominent ABIs in use on Windows: the native (MSVC) ABI used by
106-
Visual Studio, and the GNU ABI used by the GCC toolchain. Which version of Rust
107-
you need depends largely on what C/C++ libraries you want to interoperate with:
108-
for interop with software produced by Visual Studio use the MSVC build of Rust;
109-
for interop with GNU software built using the MinGW/MSYS2 toolchain use the GNU
110-
build.
106+
Visual Studio and the GNU ABI used by the GCC toolchain. Which version of Rust
107+
you need depends largely on what C/C++ libraries you want to interoperate with.
108+
Use the MSVC build of Rust to interop with software produced by Visual Studio and
109+
the GNU build to interop with GNU software built using the MinGW/MSYS2 toolchain.
111110
112111
#### MinGW
113112
114113
[MSYS2][msys2] can be used to easily build Rust on Windows:
115114
116115
[msys2]: https://www.msys2.org/
117116
118-
1. Grab the latest [MSYS2 installer][msys2] and go through the installer.
117+
1. Download the latest [MSYS2 installer][msys2] and go through the installer.
119118
120-
2. Run `mingw32_shell.bat` or `mingw64_shell.bat` from wherever you installed
121-
MSYS2 (i.e. `C:\msys64`), depending on whether you want 32-bit or 64-bit
119+
2. Run `mingw32_shell.bat` or `mingw64_shell.bat` from the MSYS2 installation
120+
directory (e.g. `C:\msys64`), depending on whether you want 32-bit or 64-bit
122121
Rust. (As of the latest version of MSYS2 you have to run `msys2_shell.cmd
123122
-mingw32` or `msys2_shell.cmd -mingw64` from the command line instead)
124123
@@ -168,7 +167,7 @@ shell with:
168167
python x.py build
169168
```
170169
171-
Currently, building Rust only works with some known versions of Visual Studio. If
170+
Right now, building Rust only works with some known versions of Visual Studio. If
172171
you have a more recent version installed and the build system doesn't understand,
173172
you may need to force rustbuild to use an older version. This can be done
174173
by manually calling the appropriate vcvars file before running the bootstrap.
@@ -225,7 +224,7 @@ the ABI used. I.e., if the ABI was `x86_64-pc-windows-msvc`, the directory will
225224
226225
Since the Rust compiler is written in Rust, it must be built by a
227226
precompiled "snapshot" version of itself (made in an earlier stage of
228-
development). As such, source builds require a connection to the Internet, to
227+
development). As such, source builds require an Internet connection to
229228
fetch snapshots, and an OS that can execute the available snapshot binaries.
230229
231230
Snapshot binaries are currently built and tested on several platforms:

0 commit comments

Comments
 (0)