Skip to content

Commit 8385345

Browse files
committed
add bootstrap and librustdoc
1 parent 5709509 commit 8385345

File tree

10 files changed

+18
-11
lines changed

10 files changed

+18
-11
lines changed

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919
uses: crate-ci/typos@v1.28.2
2020
with:
2121
# sync target files with src/tools/tidy/src/ext_tool_checks.rs
22-
files: ./compiler ./library
22+
files: ./compiler ./library ./src/bootstrap ./src/librustdoc
2323
config: ./typos.toml

src/bootstrap/src/utils/change_tracker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
153153
ChangeInfo {
154154
change_id: 121976,
155155
severity: ChangeSeverity::Info,
156-
summary: "A new `boostrap-cache-path` option has been introduced which can be utilized to modify the cache path for bootstrap.",
156+
summary: "A new `bootstrap-cache-path` option has been introduced which can be utilized to modify the cache path for bootstrap.",
157157
},
158158
ChangeInfo {
159159
change_id: 122108,

src/librustdoc/html/markdown/footnotes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Footnotes<'a, I> {
3838
let key = key.to_owned();
3939
let FootnoteDef { content, id } =
4040
self.footnotes.entry(key).or_insert(FootnoteDef { content: Vec::new(), id: new_id });
41-
// Don't allow changing the ID of existing entrys, but allow changing the contents.
41+
// Don't allow changing the ID of existing entries, but allow changing the contents.
4242
(content, *id)
4343
}
4444

@@ -82,7 +82,7 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for Footnotes<'a, I> {
8282
return Some((self.handle_footnote_reference(reference), range));
8383
}
8484
Some((Event::Start(Tag::FootnoteDefinition(def)), _)) => {
85-
// When we see a footnote definition, collect the assocated content, and store
85+
// When we see a footnote definition, collect the associated content, and store
8686
// that for rendering later.
8787
let content = self.collect_footnote_def();
8888
let (entry_content, _) = self.get_entry(&def);

src/librustdoc/html/render/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ fn render_impl(
18311831
// 3. Functions
18321832
//
18331833
// This order is because you can have associated constants used in associated types (like array
1834-
// length), and both in associcated functions. So with this order, when reading from top to
1834+
// length), and both in associated functions. So with this order, when reading from top to
18351835
// bottom, you should see items definitions before they're actually used most of the time.
18361836
let mut assoc_types = Vec::new();
18371837
let mut methods = Vec::new();

src/librustdoc/html/render/write_shared.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ impl CratesIndexPart {
454454
}
455455
}
456456

457-
/// Might return parts that are duplicate with ones in prexisting index.html
457+
/// Might return parts that are duplicate with ones in preexisting index.html
458458
fn get(crate_name: &str, external_crates: &[String]) -> Result<PartsAndLocations<Self>, Error> {
459459
let mut ret = PartsAndLocations::default();
460460
let path = PathBuf::from("index.html");

src/librustdoc/html/static/js/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.htm
15611561
// 300px, and the RUSTDOC_MOBILE_BREAKPOINT is 700px, so BODY_MIN must be
15621562
// at most 400px. Otherwise, it would start out at the default size, then
15631563
// grabbing the resize handle would suddenly cause it to jank to
1564-
// its contraint-generated maximum.
1564+
// its constraint-generated maximum.
15651565
const RUSTDOC_MOBILE_BREAKPOINT = 700;
15661566
const BODY_MIN = 400;
15671567
// At half-way past the minimum size, vanish the sidebar entirely

src/librustdoc/passes/strip_aliased_non_local.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct NonLocalStripper<'tcx> {
4242
impl DocFolder for NonLocalStripper<'_> {
4343
fn fold_item(&mut self, i: Item) -> Option<Item> {
4444
// If not local, we want to respect the original visibility of
45-
// the field and not the one given by the user for the currrent crate.
45+
// the field and not the one given by the user for the current crate.
4646
//
4747
// FIXME(#125009): Not-local should probably consider same Cargo workspace
4848
if let Some(def_id) = i.def_id()

src/librustdoc/passes/strip_hidden.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl DocFolder for Stripper<'_, '_> {
148148
self.update_retained = old;
149149
if ret.item_id == clean::ItemId::DefId(CRATE_DEF_ID.into()) {
150150
// We don't strip the current crate, even if it has `#[doc(hidden)]`.
151-
debug!("strip_hidden: Not strippping local crate");
151+
debug!("strip_hidden: Not stripping local crate");
152152
Some(ret)
153153
} else {
154154
Some(strip_item(ret))

src/tools/tidy/src/ext_tool_checks.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,14 @@ fn check_impl(
249249
if spellcheck_all || spellcheck_fix {
250250
let config_path = root_path.join("typos.toml");
251251
// sync target files with .github/workflows/ci.yml
252-
let mut args =
253-
vec!["-c", config_path.as_os_str().to_str().unwrap(), "./compiler", "./library"];
252+
let mut args = vec![
253+
"-c",
254+
config_path.as_os_str().to_str().unwrap(),
255+
"./compiler",
256+
"./library",
257+
"./src/bootstrap",
258+
"./src/librustdoc",
259+
];
254260

255261
if spellcheck_all {
256262
eprintln!("spellcheck files");

typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,5 @@ extend-ignore-re = [
6666
"\\.arg\\(\"Oh no, a tpyo!\"\\)",
6767
# string used in benches
6868
"\"core::iter::adapters::Copie\"",
69+
"-Ccontrol-flow-guard",
6970
]

0 commit comments

Comments
 (0)