Skip to content

Commit

Permalink
Auto merge of #9751 - ehuss:remove-nbsp, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove nbsp characters.

Due to an accident due to the way I've been typing em-dash characters, a bunch of non-breaking space characters have snuck in to the source here.  I never intended that, and I think having invisible characters that are not normal spaces can be confusing, so I just replaced them with spaces. There's still a few nbsp's where they are needed.
  • Loading branch information
bors committed Jul 30, 2021
2 parents 77d5647 + 70a607e commit d555e49
Show file tree
Hide file tree
Showing 16 changed files with 183 additions and 183 deletions.
6 changes: 3 additions & 3 deletions crates/mdman/doc/mdman.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ man page:

{{#option "`-t` _type_"}}
Specifies the output type. The following output types are supported:
- `man` A troff-style man page. Outputs with a numbered extension (like
- `man` A troff-style man page. Outputs with a numbered extension (like
`.1`) matching the man page section.
- `md` A markdown file, after all handlebars processing has been finished.
- `md` A markdown file, after all handlebars processing has been finished.
Outputs with the `.md` extension.
- `txt` A text file, rendered for situations where a man page viewer isn't
- `txt` A text file, rendered for situations where a man page viewer isn't
available. Outputs with the `.txt` extension.
{{/option}}

Expand Down
6 changes: 3 additions & 3 deletions crates/mdman/doc/out/mdman.1
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ next to the source file. Templates can be included with an expression like
Specifies the output type. The following output types are supported:
.sp
.RS 4
\h'-04'\(bu\h'+02'\fBman\fR \[em]\ A troff\-style man page. Outputs with a numbered extension (like
\h'-04'\(bu\h'+02'\fBman\fR \[em] A troff\-style man page. Outputs with a numbered extension (like
\fB\&.1\fR) matching the man page section.
.RE
.sp
.RS 4
\h'-04'\(bu\h'+02'\fBmd\fR \[em]\ A markdown file, after all handlebars processing has been finished.
\h'-04'\(bu\h'+02'\fBmd\fR \[em] A markdown file, after all handlebars processing has been finished.
Outputs with the \fB\&.md\fR extension.
.RE
.sp
.RS 4
\h'-04'\(bu\h'+02'\fBtxt\fR \[em]\ A text file, rendered for situations where a man page viewer isn't
\h'-04'\(bu\h'+02'\fBtxt\fR \[em] A text file, rendered for situations where a man page viewer isn't
available. Outputs with the \fB\&.txt\fR extension.
.RE
.RE
Expand Down
26 changes: 13 additions & 13 deletions crates/mdman/doc/out/mdman.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,36 +54,36 @@ man page:

<dl>

<dt><code>-t</code> <em>type</em></dt>
<dd>Specifies the output type. The following output types are supported:</p>
<dt class="option-term" id="option-mdman--t"><a class="option-anchor" href="#option-mdman--t"></a><code>-t</code> <em>type</em></dt>
<dd class="option-desc">Specifies the output type. The following output types are supported:</p>
<ul>
<li><code>man</code> — A troff-style man page. Outputs with a numbered extension (like
<li><code>man</code> — A troff-style man page. Outputs with a numbered extension (like
<code>.1</code>) matching the man page section.</li>
<li><code>md</code> — A markdown file, after all handlebars processing has been finished.
<li><code>md</code> — A markdown file, after all handlebars processing has been finished.
Outputs with the <code>.md</code> extension.</li>
<li><code>txt</code> — A text file, rendered for situations where a man page viewer isn't
<li><code>txt</code> — A text file, rendered for situations where a man page viewer isn't
available. Outputs with the <code>.txt</code> extension.</li>
</ul></dd>


<dt><code>-o</code> <em>outdir</em></dt>
<dd>Specifies the directory where to save the output.</dd>
<dt class="option-term" id="option-mdman--o"><a class="option-anchor" href="#option-mdman--o"></a><code>-o</code> <em>outdir</em></dt>
<dd class="option-desc">Specifies the directory where to save the output.</dd>


<dt><code>--url</code> <em>base_url</em></dt>
<dd>Specifies a base URL to use for relative URLs within the document. Any
<dt class="option-term" id="option-mdman---url"><a class="option-anchor" href="#option-mdman---url"></a><code>--url</code> <em>base_url</em></dt>
<dd class="option-desc">Specifies a base URL to use for relative URLs within the document. Any
relative URL will be joined with this URL.</dd>


<dt><code>--man</code> <em>name</em><code>:</code><em>section</em><code>=</code><em>url</em></dt>
<dd>Specifies a URL to use for the given man page. When the <code>{{man name section}}</code> expression is used, the given URL will be inserted as a link. This
<dt class="option-term" id="option-mdman---man"><a class="option-anchor" href="#option-mdman---man"></a><code>--man</code> <em>name</em><code>:</code><em>section</em><code>=</code><em>url</em></dt>
<dd class="option-desc">Specifies a URL to use for the given man page. When the <code>{{man name section}}</code> expression is used, the given URL will be inserted as a link. This
may be specified multiple times. If a man page reference does not have a
matching <code>--man</code> entry, then a relative link to a file named <em>name</em><code>.md</code> will
be used.</dd>


<dt><em>sources...</em></dt>
<dd>The source input filename, may be specified multiple times.</dd>
<dt class="option-term" id="option-mdman-sources..."><a class="option-anchor" href="#option-mdman-sources..."></a><em>sources...</em></dt>
<dd class="option-desc">The source input filename, may be specified multiple times.</dd>


</dl>
Expand Down
8 changes: 4 additions & 4 deletions crates/mdman/doc/out/mdman.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ OPTIONS
-t type
Specifies the output type. The following output types are supported:

o man — A troff-style man page. Outputs with a numbered
extension (like .1) matching the man page section.
o man — A troff-style man page. Outputs with a numbered extension
(like .1) matching the man page section.

o md — A markdown file, after all handlebars processing has been
o md — A markdown file, after all handlebars processing has been
finished. Outputs with the .md extension.

o txt — A text file, rendered for situations where a man page
o txt — A text file, rendered for situations where a man page
viewer isn't available. Outputs with the .txt extension.

-o outdir
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/timings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ fn render_rustc_info(bcx: &BuildContext<'_, '_>) -> String {
static HTML_TMPL: &str = r#"
<html>
<head>
<title>Cargo Build Timings — {ROOTS}</title>
<title>Cargo Build Timings — {ROOTS}</title>
<meta charset="utf-8">
<style type="text/css">
html {
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/profiles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ pub struct UnitFor {
/// uses the `get_profile_run_custom_build` method to get the correct
/// profile information for the unit. `host` needs to be true so that all
/// of the dependencies of that `RunCustomBuild` unit have this flag be
/// sticky (and forced to `true` for all further dependencies) — which is
/// sticky (and forced to `true` for all further dependencies) — which is
/// the whole point of `UnitFor`.
host: bool,
/// A target for a build dependency or proc-macro (or any of its
Expand Down
36 changes: 18 additions & 18 deletions src/doc/contrib/src/architecture/codebase.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@ This is a very high-level overview of the Cargo codebase.
[SubCommands](subcommands.md).

* [`src/cargo/ops`](https://github.com/rust-lang/cargo/tree/master/src/cargo/ops)
 Every major operation is implemented here. This is where the binary CLI
Every major operation is implemented here. This is where the binary CLI
usually calls into to perform the appropriate action.

* [`src/cargo/ops/cargo_compile.rs`](https://github.com/rust-lang/cargo/blob/master/src/cargo/ops/cargo_compile.rs)
 This is the entry point for all the compilation commands. This is a
This is the entry point for all the compilation commands. This is a
good place to start if you want to follow how compilation starts and
flows to completion.

* [`src/cargo/core/resolver`](https://github.com/rust-lang/cargo/tree/master/src/cargo/core/resolver)
 This is the dependency and feature resolvers.
This is the dependency and feature resolvers.

* [`src/cargo/core/compiler`](https://github.com/rust-lang/cargo/tree/master/src/cargo/core/compiler)
 This is the code responsible for running `rustc` and `rustdoc`.
This is the code responsible for running `rustc` and `rustdoc`.

* [`src/cargo/core/compiler/build_context/mod.rs`](https://github.com/rust-lang/cargo/blob/master/src/cargo/core/compiler/build_context/mod.rs)
 The `BuildContext` is the result of the "front end" of the build
The `BuildContext` is the result of the "front end" of the build
process. This contains the graph of work to perform and any settings
necessary for `rustc`. After this is built, the next stage of building
is handled in `Context`.

* [`src/cargo/core/compiler/context`](https://github.com/rust-lang/cargo/blob/master/src/cargo/core/compiler/context/mod.rs)
 The `Context` is the mutable state used during the build process. This
The `Context` is the mutable state used during the build process. This
is the core of the build process, and everything is coordinated through
this.

* [`src/cargo/core/compiler/fingerprint.rs`](https://github.com/rust-lang/cargo/blob/master/src/cargo/core/compiler/fingerprint.rs)
 The `fingerprint` module contains all the code that handles detecting
The `fingerprint` module contains all the code that handles detecting
if a crate needs to be recompiled.

* [`src/cargo/core/source`](https://github.com/rust-lang/cargo/tree/master/src/cargo/core/source)
 The `Source` trait is an abstraction over different sources of packages.
The `Source` trait is an abstraction over different sources of packages.
Sources are uniquely identified by a `SourceId`. Sources are implemented in
the
[`src/cargo/sources`](https://github.com/rust-lang/cargo/tree/master/src/cargo/sources)
Expand All @@ -56,37 +56,37 @@ This is a very high-level overview of the Cargo codebase.
though references to it are scattered around for more convenient access.

* [`src/cargo/util/toml`](https://github.com/rust-lang/cargo/tree/master/src/cargo/util/toml)
 This directory contains the code for parsing `Cargo.toml` files.
This directory contains the code for parsing `Cargo.toml` files.

* [`src/cargo/ops/lockfile.rs`](https://github.com/rust-lang/cargo/blob/master/src/cargo/ops/lockfile.rs)
 This is where `Cargo.lock` files are loaded and saved.
This is where `Cargo.lock` files are loaded and saved.

* [`src/doc`](https://github.com/rust-lang/cargo/tree/master/src/doc)
 This directory contains Cargo's documentation and man pages.
This directory contains Cargo's documentation and man pages.

* [`src/etc`](https://github.com/rust-lang/cargo/tree/master/src/etc)
 These are files that get distributed in the `etc` directory in the Rust release.
These are files that get distributed in the `etc` directory in the Rust release.
The man pages are auto-generated by a script in the `src/doc` directory.

* [`crates`](https://github.com/rust-lang/cargo/tree/master/crates)
 A collection of independent crates used by Cargo.
A collection of independent crates used by Cargo.

## Extra crates

Some functionality is split off into separate crates, usually in the
[`crates`](https://github.com/rust-lang/cargo/tree/master/crates) directory.

* [`cargo-platform`](https://github.com/rust-lang/cargo/tree/master/crates/cargo-platform)
 This library handles parsing `cfg` expressions.
This library handles parsing `cfg` expressions.
* [`cargo-test-macro`](https://github.com/rust-lang/cargo/tree/master/crates/cargo-test-macro)
 This is a proc-macro used by the test suite to define tests. More
This is a proc-macro used by the test suite to define tests. More
information can be found at [`cargo_test`
attribute](../tests/writing.md#cargo_test-attribute).
* [`cargo-test-support`](https://github.com/rust-lang/cargo/tree/master/crates/cargo-test-support)
 This contains a variety of code to support [writing
This contains a variety of code to support [writing
tests](../tests/writing.md).
* [`cargo-util`](https://github.com/rust-lang/cargo/tree/master/crates/cargo-util)
 This contains general utility code that is shared between cargo and the
This contains general utility code that is shared between cargo and the
testsuite.
* [`crates-io`](https://github.com/rust-lang/cargo/tree/master/crates/crates-io)
— This contains code for accessing the crates.io API.
Expand All @@ -100,5 +100,5 @@ Some functionality is split off into separate crates, usually in the
pages](https://github.com/rust-lang/cargo/tree/master/src/doc#building-the-man-pages)
for more information.
* [`resolver-tests`](https://github.com/rust-lang/cargo/tree/master/crates/resolver-tests)
 This is a dedicated package that defines tests for the [dependency
This is a dedicated package that defines tests for the [dependency
resolver](../architecture/packages.md#resolver).
14 changes: 7 additions & 7 deletions src/doc/contrib/src/architecture/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ actually compiled by `rustc`.
There are several data structures that are important to understand how
packages are found and loaded:

* [`Package`] A package, which is a `Cargo.toml` manifest and its associated
* [`Package`] A package, which is a `Cargo.toml` manifest and its associated
source files.
* [`PackageId`] A unique identifier for a package.
* [`PackageId`] A unique identifier for a package.
* [`Source`] — An abstraction for something that can fetch packages (a remote
registry, a git repo, the local filesystem, etc.). Check out the [source
implementations] for all the details about registries, indexes, git
dependencies, etc.
* [`SourceId`] A unique identifier for a source.
* [`SourceMap`] Map of all available sources.
* [`PackageRegistry`] This is the main interface for how the dependency
* [`SourceId`] A unique identifier for a source.
* [`SourceMap`] Map of all available sources.
* [`PackageRegistry`] This is the main interface for how the dependency
resolver finds packages. It contains the `SourceMap`, and handles things
like the `[patch]` table. The `Registry` trait provides a generic interface
to the `PackageRegistry`, but this is only used for providing an alternate
implementation of the `PackageRegistry` for testing. The dependency resolver
sends a query to the `PackageRegistry` to "get me all packages that match
this dependency declaration".
* [`Summary`] A summary is a subset of a [`Manifest`], and is essentially
* [`Summary`] A summary is a subset of a [`Manifest`], and is essentially
the information that can be found in a registry index. Queries against the
`PackageRegistry` yields a `Summary`. The resolver uses the summary
information to build the dependency graph.
* [`PackageSet`] Contains all of the `Package` objects. This works with the
* [`PackageSet`] Contains all of the `Package` objects. This works with the
[`Downloads`] struct to coordinate downloading packages. It has a reference
to the `SourceMap` to get the `Source` objects which tell the `Downloads`
struct which URLs to fetch.
Expand Down
10 changes: 5 additions & 5 deletions src/doc/contrib/src/issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ If you file in the wrong tracker, someone will either transfer it to the
correct one or ask you to move it. Some other repositories that may be
relevant are:

* [`rust-lang/rust`] Home for the [`rustc`] compiler and [`rustdoc`].
* [`rust-lang/rustup`] Home for the [`rustup`] toolchain installer.
* [`rust-lang/rustfmt`] Home for the `rustfmt` tool, which also includes `cargo fmt`.
* [`rust-lang/rust-clippy`] Home for the `clippy` tool, which also includes `cargo clippy`.
* [`rust-lang/crates.io`] Home for the [crates.io] website.
* [`rust-lang/rust`] Home for the [`rustc`] compiler and [`rustdoc`].
* [`rust-lang/rustup`] Home for the [`rustup`] toolchain installer.
* [`rust-lang/rustfmt`] Home for the `rustfmt` tool, which also includes `cargo fmt`.
* [`rust-lang/rust-clippy`] Home for the `clippy` tool, which also includes `cargo clippy`.
* [`rust-lang/crates.io`] Home for the [crates.io] website.

Issues with [`cargo fix`] can be tricky to know where they should be filed,
since the fixes are driven by `rustc`, processed by [`rustfix`], and the
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The commands will let you interact with Cargo using its command-line interface.
**Other Documentation:**
* [Changelog](https://github.com/rust-lang/cargo/blob/master/CHANGELOG.md)
Detailed notes about changes in Cargo in each release.
* [Rust documentation website](https://doc.rust-lang.org/) Links to official
* [Rust documentation website](https://doc.rust-lang.org/) Links to official
Rust documentation and tools.

[def-crate]: ./appendix/glossary.md#crate '"crate" (glossary entry)'
Expand Down
20 changes: 10 additions & 10 deletions src/doc/src/reference/build-scripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,30 +90,30 @@ configuration). The stderr output is also saved in that same directory.
The following is a summary of the instructions that Cargo recognizes, with each
one detailed below.

* [`cargo:rerun-if-changed=PATH`](#rerun-if-changed) Tells Cargo when to
* [`cargo:rerun-if-changed=PATH`](#rerun-if-changed) Tells Cargo when to
re-run the script.
* [`cargo:rerun-if-env-changed=VAR`](#rerun-if-env-changed) Tells Cargo when
* [`cargo:rerun-if-env-changed=VAR`](#rerun-if-env-changed) Tells Cargo when
to re-run the script.
* [`cargo:rustc-link-arg=FLAG`](#rustc-link-arg) – Passes custom flags to a
linker for benchmarks, binaries, `cdylib` crates, examples, and tests.
* [`cargo:rustc-link-arg-bin=BIN=FLAG`](#rustc-link-arg-bin) – Passes custom
flags to a linker for the binary `BIN`.
* [`cargo:rustc-link-arg-bins=FLAG`](#rustc-link-arg-bins) – Passes custom
flags to a linker for binaries.
* [`cargo:rustc-link-lib=[KIND=]NAME`](#rustc-link-lib) Adds a library to
* [`cargo:rustc-link-lib=[KIND=]NAME`](#rustc-link-lib) Adds a library to
link.
* [`cargo:rustc-link-search=[KIND=]PATH`](#rustc-link-search) Adds to the
* [`cargo:rustc-link-search=[KIND=]PATH`](#rustc-link-search) Adds to the
library search path.
* [`cargo:rustc-flags=FLAGS`](#rustc-flags) Passes certain flags to the
* [`cargo:rustc-flags=FLAGS`](#rustc-flags) Passes certain flags to the
compiler.
* [`cargo:rustc-cfg=KEY[="VALUE"]`](#rustc-cfg) Enables compile-time `cfg`
* [`cargo:rustc-cfg=KEY[="VALUE"]`](#rustc-cfg) Enables compile-time `cfg`
settings.
* [`cargo:rustc-env=VAR=VALUE`](#rustc-env) Sets an environment variable.
* [`cargo:rustc-cdylib-link-arg=FLAG`](#rustc-cdylib-link-arg) Passes custom
* [`cargo:rustc-env=VAR=VALUE`](#rustc-env) Sets an environment variable.
* [`cargo:rustc-cdylib-link-arg=FLAG`](#rustc-cdylib-link-arg) Passes custom
flags to a linker for cdylib crates.
* [`cargo:warning=MESSAGE`](#cargo-warning) Displays a warning on the
* [`cargo:warning=MESSAGE`](#cargo-warning) Displays a warning on the
terminal.
* [`cargo:KEY=VALUE`](#the-links-manifest-key) Metadata, used by `links`
* [`cargo:KEY=VALUE`](#the-links-manifest-key) Metadata, used by `links`
scripts.


Expand Down
Loading

0 comments on commit d555e49

Please sign in to comment.