Skip to content

Commit a80a873

Browse files
committedAug 13, 2017
Auto merge of #43839 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 8 pull requests - Successful merges: #43782, #43803, #43814, #43819, #43821, #43822, #43824, #43833 - Failed merges:
2 parents d4fbc7a + a7ead41 commit a80a873

File tree

63 files changed

+268
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+268
-175
lines changed
 

‎src/bootstrap/builder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ impl<'a> Builder<'a> {
324324
StepDescription::run(&Builder::get_step_descriptions(Kind::Doc), self, paths);
325325
}
326326

327-
/// Obtain a compiler at a given stage and for a given host. Explictly does
327+
/// Obtain a compiler at a given stage and for a given host. Explicitly does
328328
/// not take `Compiler` since all `Compiler` instances are meant to be
329329
/// obtained through this function, since it ensures that they are valid
330330
/// (i.e., built and assembled).
@@ -489,7 +489,7 @@ impl<'a> Builder<'a> {
489489
// crates). Let's say, for example that rustc itself depends on the
490490
// bitflags crate. If an external crate then depends on the
491491
// bitflags crate as well, we need to make sure they don't
492-
// conflict, even if they pick the same verison of bitflags. We'll
492+
// conflict, even if they pick the same version of bitflags. We'll
493493
// want to make sure that e.g. a plugin and rustc each get their
494494
// own copy of bitflags.
495495

‎src/bootstrap/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ impl Step for Standalone {
306306
///
307307
/// This will list all of `src/doc` looking for markdown files and appropriately
308308
/// perform transformations like substituting `VERSION`, `SHORT_HASH`, and
309-
/// `STAMP` alongw ith providing the various header/footer HTML we've cutomized.
309+
/// `STAMP` along with providing the various header/footer HTML we've customized.
310310
///
311311
/// In the end, this is just a glorified wrapper around rustdoc!
312312
fn run(self, builder: &Builder) {

0 commit comments

Comments
 (0)