Skip to content

Commit f7d78e7

Browse files
authored
Unrolled build for rust-lang#134973
Rollup merge of rust-lang#134973 - ericlehong:fix-typo, r=GuillaumeGomez Fix typos This PR fixes typos errors in comments and docs. Thank you very much.
2 parents 45d11e5 + e34465f commit f7d78e7

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/librustdoc/html/markdown/footnotes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for Footnotes<'a, I> {
9191
Some(e) => return Some(e),
9292
None => {
9393
if !self.footnotes.is_empty() {
94-
// After all the markdown is emmited, emit an <hr> then all the footnotes
94+
// After all the markdown is emitted, emit an <hr> then all the footnotes
9595
// in a list.
9696
let defs: Vec<_> = self.footnotes.drain(..).map(|(_, x)| x).collect();
9797
self.existing_footnotes.fetch_add(defs.len(), Ordering::Relaxed);

src/librustdoc/html/render/sorted_template.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct Offset {
2727
}
2828

2929
impl<F> SortedTemplate<F> {
30-
/// Generate this template from arbitary text.
30+
/// Generate this template from arbitrary text.
3131
/// Will insert wherever the substring `delimiter` can be found.
3232
/// Errors if it does not appear exactly once.
3333
pub(crate) fn from_template(template: &str, delimiter: &str) -> Result<Self, Error> {

src/librustdoc/html/static/js/search.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2848,7 +2848,7 @@ class DocSearch {
28482848
* - Limit checks that Ty matches Vec<Ty>,
28492849
* but not Vec<ParamEnvAnd<WithInfcx<ConstTy<Interner<Ty=Ty>>>>>
28502850
*
2851-
* @return {[FunctionType]|null} - Returns highlighed results if a match, null otherwise.
2851+
* @return {[FunctionType]|null} - Returns highlighted results if a match, null otherwise.
28522852
*/
28532853
function unifyFunctionTypes(
28542854
fnTypesIn,
@@ -3148,7 +3148,7 @@ class DocSearch {
31483148
* - Limit checks that Ty matches Vec<Ty>,
31493149
* but not Vec<ParamEnvAnd<WithInfcx<ConstTy<Interner<Ty=Ty>>>>>
31503150
*
3151-
* @return {[FunctionType]|null} - Returns highlighed results if a match, null otherwise.
3151+
* @return {[FunctionType]|null} - Returns highlighted results if a match, null otherwise.
31523152
*/
31533153
function unifyGenericTypes(
31543154
fnTypesIn,

src/tools/rust-installer/install-template.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ install_components() {
584584
# HACK: Try to support overriding --docdir. Paths with the form
585585
# "share/doc/$product/" can be redirected to a single --docdir
586586
# path. If the following detects that --docdir has been specified
587-
# then it will replace everything preceeding the "$product" path
587+
# then it will replace everything preceding the "$product" path
588588
# component. The problem here is that the combined rust installer
589589
# contains two "products": rust and cargo; so the contents of those
590590
# directories will both be dumped into the same directory; and the

src/tools/tidy/src/deps.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ const EXCEPTIONS_BOOTSTRAP: ExceptionList = &[
214214
];
215215

216216
const EXCEPTIONS_UEFI_QEMU_TEST: ExceptionList = &[
217-
("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
217+
("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
218218
];
219219

220220
/// Placeholder for non-standard license file.

src/tools/tidy/src/ext_tool_checks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Optional checks for file types other than Rust source
22
//!
3-
//! Handles python tool version managment via a virtual environment in
3+
//! Handles python tool version management via a virtual environment in
44
//! `build/venv`.
55
//!
66
//! # Functional outline

0 commit comments

Comments
 (0)