From 1accaa9f86002e95c1d0a677349ab033ec6dd2e2 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sat, 28 Mar 2015 18:09:51 +0300 Subject: [PATCH] Fix some typos --- configure | 2 +- mk/platform.mk | 2 +- mk/target.mk | 2 +- src/doc/trpl/associated-types.md | 2 +- src/doc/trpl/documentation.md | 2 +- src/etc/rustup.sh | 4 ++-- src/libcore/marker.rs | 2 +- src/librbml/lib.rs | 2 +- src/librustc_back/target/mod.rs | 2 +- src/librustdoc/stability_summary.rs | 2 +- src/libstd/fs/mod.rs | 2 +- src/libstd/old_io/fs.rs | 2 +- src/test/compile-fail/issue-9814.rs | 2 +- src/test/debuginfo/generic-struct-style-enum.rs | 2 +- src/test/debuginfo/generic-tuple-style-enum.rs | 2 +- src/test/debuginfo/struct-in-enum.rs | 2 +- src/test/debuginfo/struct-style-enum.rs | 2 +- src/test/debuginfo/tuple-style-enum.rs | 2 +- src/test/debuginfo/unique-enum.rs | 2 +- src/test/run-make/pretty-print-path-suffix/foo_method.pp | 2 +- src/test/run-make/pretty-print-path-suffix/input.rs | 2 +- src/test/run-pass/core-run-destroy.rs | 2 +- src/test/run-pass/issue-23485.rs | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 683c7fd056396..b4bc66933dde0 100755 --- a/configure +++ b/configure @@ -404,7 +404,7 @@ case $CFG_OSTYPE in CFG_OSTYPE=pc-windows-gnu ;; -# Thad's Cygwin identifers below +# Thad's Cygwin identifiers below # Vista 32 bit CYGWIN_NT-6.0) diff --git a/mk/platform.mk b/mk/platform.mk index ed50585822ed4..cd86b273c6de2 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -179,7 +179,7 @@ define CFG_MAKE_TOOLCHAIN ifeq ($$(findstring $(HOST_$(1)),arm aarch64 mips mipsel powerpc),) - # On Bitrig, we need the relocation model to be PIC for everthing + # On Bitrig, we need the relocation model to be PIC for everything ifeq (,$(filter $(OSTYPE_$(1)),bitrig)) LLVM_MC_RELOCATION_MODEL="pic" else diff --git a/mk/target.mk b/mk/target.mk index da18a9a43924a..8cc74a9cbfb76 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -132,7 +132,7 @@ endef # on $$(TSREQ$(1)_T_$(2)_H_$(3)), to ensure that no products will be # put into the target area until after the get-snapshot.py script has # had its chance to clean it out; otherwise the other products will be -# inadvertantly included in the clean out. +# inadvertently included in the clean out. SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) define TARGET_HOST_RULES diff --git a/src/doc/trpl/associated-types.md b/src/doc/trpl/associated-types.md index f36c2c56b6a76..7161cd33f89be 100644 --- a/src/doc/trpl/associated-types.md +++ b/src/doc/trpl/associated-types.md @@ -170,7 +170,7 @@ let obj = Box::new(graph) as Box; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` -We can’t create a trait object like this, becuase we don’t know the associated +We can’t create a trait object like this, because we don’t know the associated types. Instead, we can write this: ```rust diff --git a/src/doc/trpl/documentation.md b/src/doc/trpl/documentation.md index 43b49c09ae4ac..d591019e9c045 100644 --- a/src/doc/trpl/documentation.md +++ b/src/doc/trpl/documentation.md @@ -529,7 +529,7 @@ This will create documentation for bar both inside the documentation for the crate `foo`, as well as the documentation for your crate. It will use the same documentation in both places. -This behavior can be supressed with `no_inline`: +This behavior can be suppressed with `no_inline`: ```ignore extern crate foo; diff --git a/src/etc/rustup.sh b/src/etc/rustup.sh index d4f1071c724b6..47e64547eed39 100755 --- a/src/etc/rustup.sh +++ b/src/etc/rustup.sh @@ -335,7 +335,7 @@ case $CFG_OSTYPE in MINGW32*) CFG_OSTYPE=pc-mingw32 ;; -# Thad's Cygwin identifers below +# Thad's Cygwin identifiers below # Vista 32 bit CYGWIN_NT-6.0) @@ -437,7 +437,7 @@ CFG_TMP_DIR=$(mktemp -d 2>/dev/null \ || create_tmp_dir) # If we're saving nightlies and we didn't specify which one, grab the latest -# verison from the perspective of the server. Buildbot has typically finished +# version from the perspective of the server. Buildbot has typically finished # building and uploading by ~8UTC, but we want to include a little buffer. # # FIXME It would be better to use the known most recent nightly that has been diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 35fde2cb64a31..3f4b39da4b3bb 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -476,7 +476,7 @@ pub struct InvariantType; /// particular, thanks to the `Reflect` bound, callers know that a /// function declared like `fn bar(...)` will always act in /// precisely the same way no matter what type `T` is supplied, -/// beacuse there are no bounds declared on `T`. (The ability for a +/// because there are no bounds declared on `T`. (The ability for a /// caller to reason about what a function may do based solely on what /// generic bounds are declared is often called the ["parametricity /// property"][1].) diff --git a/src/librbml/lib.rs b/src/librbml/lib.rs index fd35c9c6be96d..234b8cf5eb571 100644 --- a/src/librbml/lib.rs +++ b/src/librbml/lib.rs @@ -83,7 +83,7 @@ //! - `Sub32` (`0d`): 4-byte unsigned integer for supplementary information. //! Those two tags normally occur as the first subdocument of certain tags, //! namely `Enum`, `Vec` and `Map`, to provide a variant or size information. -//! They can be used interchangably. +//! They can be used interchangeably. //! //! Predefined tags with an explicit length: //! diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index c464658f447ac..07528df97f133 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -157,7 +157,7 @@ pub struct TargetOptions { /// particular running dsymutil and some other stuff like `-dead_strip`. Defaults to false. pub is_like_osx: bool, /// Whether the target toolchain is like Windows'. Only useful for compiling against Windows, - /// only realy used for figuring out how to find libraries, since Windows uses its own + /// only really used for figuring out how to find libraries, since Windows uses its own /// library naming convention. Defaults to false. pub is_like_windows: bool, /// Whether the target toolchain is like Android's. Only useful for compiling against Android. diff --git a/src/librustdoc/stability_summary.rs b/src/librustdoc/stability_summary.rs index 0726a822b59b7..f75fced3bc26d 100644 --- a/src/librustdoc/stability_summary.rs +++ b/src/librustdoc/stability_summary.rs @@ -86,7 +86,7 @@ impl Ord for ModuleSummary { } } -// is the item considered publically visible? +// is the item considered publicly visible? fn visible(item: &Item) -> bool { match item.inner { ImplItem(_) => true, diff --git a/src/libstd/fs/mod.rs b/src/libstd/fs/mod.rs index c1253706832df..a3128ef0f8d95 100644 --- a/src/libstd/fs/mod.rs +++ b/src/libstd/fs/mod.rs @@ -1511,7 +1511,7 @@ mod tests { assert_eq!(v, b"foobar\0\0\0\0".to_vec()); // Truncate to a smaller length, don't seek, and then write something. - // Ensure that the intermediate zeroes are all filled in (we're seeked + // Ensure that the intermediate zeroes are all filled in (we have `seek`ed // past the end of the file). check!(file.set_len(2)); assert_eq!(check!(file.metadata()).len(), 2); diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index e47c1b238ebee..6aa63c395c625 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -1532,7 +1532,7 @@ mod test { b"foobar\0\0\0\0".to_vec()); // Truncate to a smaller length, don't seek, and then write something. - // Ensure that the intermediate zeroes are all filled in (we're seeked + // Ensure that the intermediate zeroes are all filled in (we have `seek`ed // past the end of the file). check!(file.truncate(2)); assert_eq!(check!(file.stat()).size, 2); diff --git a/src/test/compile-fail/issue-9814.rs b/src/test/compile-fail/issue-9814.rs index 8aefc5919d133..226734b84d638 100644 --- a/src/test/compile-fail/issue-9814.rs +++ b/src/test/compile-fail/issue-9814.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// Verify that single-variant enums cant be de-referenced +// Verify that single-variant enums can't be de-referenced // Regression test for issue #9814 enum Foo { Bar(isize) } diff --git a/src/test/debuginfo/generic-struct-style-enum.rs b/src/test/debuginfo/generic-struct-style-enum.rs index 455861b1ea1eb..caed4bd181d64 100644 --- a/src/test/debuginfo/generic-struct-style-enum.rs +++ b/src/test/debuginfo/generic-struct-style-enum.rs @@ -53,7 +53,7 @@ enum Univariant { fn main() { - // In order to avoid endianess trouble all of the following test values consist of a single + // In order to avoid endianness trouble all of the following test values consist of a single // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. diff --git a/src/test/debuginfo/generic-tuple-style-enum.rs b/src/test/debuginfo/generic-tuple-style-enum.rs index da62e335557a2..b0f0852c69e46 100644 --- a/src/test/debuginfo/generic-tuple-style-enum.rs +++ b/src/test/debuginfo/generic-tuple-style-enum.rs @@ -71,7 +71,7 @@ enum Univariant { fn main() { - // In order to avoid endianess trouble all of the following test values consist of a single + // In order to avoid endianness trouble all of the following test values consist of a single // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. diff --git a/src/test/debuginfo/struct-in-enum.rs b/src/test/debuginfo/struct-in-enum.rs index b2971329cc8fb..b7956c221224e 100644 --- a/src/test/debuginfo/struct-in-enum.rs +++ b/src/test/debuginfo/struct-in-enum.rs @@ -66,7 +66,7 @@ enum Univariant { fn main() { - // In order to avoid endianess trouble all of the following test values consist of a single + // In order to avoid endianness trouble all of the following test values consist of a single // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. diff --git a/src/test/debuginfo/struct-style-enum.rs b/src/test/debuginfo/struct-style-enum.rs index d522e9f891056..43cb48d16bf4b 100644 --- a/src/test/debuginfo/struct-style-enum.rs +++ b/src/test/debuginfo/struct-style-enum.rs @@ -68,7 +68,7 @@ enum Univariant { fn main() { - // In order to avoid endianess trouble all of the following test values consist of a single + // In order to avoid endianness trouble all of the following test values consist of a single // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. diff --git a/src/test/debuginfo/tuple-style-enum.rs b/src/test/debuginfo/tuple-style-enum.rs index 7c9760c3a5353..6ed231726b163 100644 --- a/src/test/debuginfo/tuple-style-enum.rs +++ b/src/test/debuginfo/tuple-style-enum.rs @@ -68,7 +68,7 @@ enum Univariant { fn main() { - // In order to avoid endianess trouble all of the following test values consist of a single + // In order to avoid endianness trouble all of the following test values consist of a single // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. diff --git a/src/test/debuginfo/unique-enum.rs b/src/test/debuginfo/unique-enum.rs index 607a237d22e41..e450ead009bb2 100644 --- a/src/test/debuginfo/unique-enum.rs +++ b/src/test/debuginfo/unique-enum.rs @@ -59,7 +59,7 @@ enum Univariant { fn main() { - // In order to avoid endianess trouble all of the following test values consist of a single + // In order to avoid endianness trouble all of the following test values consist of a single // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. diff --git a/src/test/run-make/pretty-print-path-suffix/foo_method.pp b/src/test/run-make/pretty-print-path-suffix/foo_method.pp index acf3f90cb0e1f..4879fbfe6d343 100644 --- a/src/test/run-make/pretty-print-path-suffix/foo_method.pp +++ b/src/test/run-make/pretty-print-path-suffix/foo_method.pp @@ -12,5 +12,5 @@ -fn foo_method(&self) -> &'static str { return "i am very similiar to foo."; } +fn foo_method(&self) -> &'static str { return "i am very similar to foo."; } /* nest::S::foo_method */ diff --git a/src/test/run-make/pretty-print-path-suffix/input.rs b/src/test/run-make/pretty-print-path-suffix/input.rs index 4942540126b11..8ea86a94f935e 100644 --- a/src/test/run-make/pretty-print-path-suffix/input.rs +++ b/src/test/run-make/pretty-print-path-suffix/input.rs @@ -22,7 +22,7 @@ pub mod nest { struct S; impl S { fn foo_method(&self) -> &'static str { - return "i am very similiar to foo."; + return "i am very similar to foo."; } } } diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs index a4413fa85d241..a969f6911545f 100644 --- a/src/test/run-pass/core-run-destroy.rs +++ b/src/test/run-pass/core-run-destroy.rs @@ -52,7 +52,7 @@ pub fn sleeper() -> Process { fn test_destroy_twice() { let mut p = sleeper(); - succeed!(p.signal_exit()); // this shouldnt crash... + succeed!(p.signal_exit()); // this shouldn't crash... let _ = p.signal_exit(); // ...and nor should this (and nor should the destructor) } diff --git a/src/test/run-pass/issue-23485.rs b/src/test/run-pass/issue-23485.rs index f1afa2bb90772..f176c60346b14 100644 --- a/src/test/run-pass/issue-23485.rs +++ b/src/test/run-pass/issue-23485.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// Test for an ICE that occured when a default method implementation +// Test for an ICE that occurred when a default method implementation // was applied to a type that did not meet the prerequisites. The // problem occurred specifically because normalizing // `Self::Item::Target` was impossible in this case.