diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-01 22:04:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-01 22:04:16 +0100 |
| commit | 92f56fc15053ecaa45f96706fab4fb367d36a894 (patch) | |
| tree | 06c068dd4c1b9500af845d075c9ae1ff8dcc183f /src | |
| parent | afdb6270efdde805085552601476e81cd2fac93e (diff) | |
| parent | e34465f8527d77e43f7195a505679de1e437945d (diff) | |
| download | rust-92f56fc15053ecaa45f96706fab4fb367d36a894.tar.gz rust-92f56fc15053ecaa45f96706fab4fb367d36a894.zip | |
Rollup merge of #134973 - ericlehong:fix-typo, r=GuillaumeGomez
Fix typos This PR fixes typos errors in comments and docs. Thank you very much.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/markdown/footnotes.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/render/sorted_template.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/search.js | 4 | ||||
| -rw-r--r-- | src/tools/rust-installer/install-template.sh | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/ext_tool_checks.rs | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/librustdoc/html/markdown/footnotes.rs b/src/librustdoc/html/markdown/footnotes.rs index 519778e4d3b..ded0585ddcc 100644 --- a/src/librustdoc/html/markdown/footnotes.rs +++ b/src/librustdoc/html/markdown/footnotes.rs @@ -91,7 +91,7 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for Footnotes<'a, I> { Some(e) => return Some(e), None => { if !self.footnotes.is_empty() { - // After all the markdown is emmited, emit an <hr> then all the footnotes + // After all the markdown is emitted, emit an <hr> then all the footnotes // in a list. let defs: Vec<_> = self.footnotes.drain(..).map(|(_, x)| x).collect(); self.existing_footnotes.fetch_add(defs.len(), Ordering::Relaxed); diff --git a/src/librustdoc/html/render/sorted_template.rs b/src/librustdoc/html/render/sorted_template.rs index dc894840f92..a7b954ab70b 100644 --- a/src/librustdoc/html/render/sorted_template.rs +++ b/src/librustdoc/html/render/sorted_template.rs @@ -27,7 +27,7 @@ struct Offset { } impl<F> SortedTemplate<F> { - /// Generate this template from arbitary text. + /// Generate this template from arbitrary text. /// Will insert wherever the substring `delimiter` can be found. /// Errors if it does not appear exactly once. pub(crate) fn from_template(template: &str, delimiter: &str) -> Result<Self, Error> { diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index 04eeee37fe8..5fd5eb14478 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -2848,7 +2848,7 @@ class DocSearch { * - Limit checks that Ty matches Vec<Ty>, * but not Vec<ParamEnvAnd<WithInfcx<ConstTy<Interner<Ty=Ty>>>>> * - * @return {[FunctionType]|null} - Returns highlighed results if a match, null otherwise. + * @return {[FunctionType]|null} - Returns highlighted results if a match, null otherwise. */ function unifyFunctionTypes( fnTypesIn, @@ -3148,7 +3148,7 @@ class DocSearch { * - Limit checks that Ty matches Vec<Ty>, * but not Vec<ParamEnvAnd<WithInfcx<ConstTy<Interner<Ty=Ty>>>>> * - * @return {[FunctionType]|null} - Returns highlighed results if a match, null otherwise. + * @return {[FunctionType]|null} - Returns highlighted results if a match, null otherwise. */ function unifyGenericTypes( fnTypesIn, diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh index b477c3eac35..f7f408be882 100644 --- a/src/tools/rust-installer/install-template.sh +++ b/src/tools/rust-installer/install-template.sh @@ -584,7 +584,7 @@ install_components() { # HACK: Try to support overriding --docdir. Paths with the form # "share/doc/$product/" can be redirected to a single --docdir # path. If the following detects that --docdir has been specified - # then it will replace everything preceeding the "$product" path + # then it will replace everything preceding the "$product" path # component. The problem here is that the combined rust installer # contains two "products": rust and cargo; so the contents of those # directories will both be dumped into the same directory; and the diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 1794d0fbca7..d00d5a9b4da 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -214,7 +214,7 @@ const EXCEPTIONS_BOOTSTRAP: ExceptionList = &[ ]; const EXCEPTIONS_UEFI_QEMU_TEST: ExceptionList = &[ - ("r-efi", "MIT OR Apache-2.0 OR LGPL-2.1-or-later"), // LGPL is not acceptible, but we use it under MIT OR Apache-2.0 + ("r-efi", "MIT OR Apache-2.0 OR LGPL-2.1-or-later"), // LGPL is not acceptable, but we use it under MIT OR Apache-2.0 ]; /// Placeholder for non-standard license file. diff --git a/src/tools/tidy/src/ext_tool_checks.rs b/src/tools/tidy/src/ext_tool_checks.rs index e8370a0af02..6269d91c7ec 100644 --- a/src/tools/tidy/src/ext_tool_checks.rs +++ b/src/tools/tidy/src/ext_tool_checks.rs @@ -1,6 +1,6 @@ //! Optional checks for file types other than Rust source //! -//! Handles python tool version managment via a virtual environment in +//! Handles python tool version management via a virtual environment in //! `build/venv`. //! //! # Functional outline |
