Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/command_helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ impl StderrForwarder {

// SAFETY: 1) the length is set to the capacity, so we are never using memory beyond
// the underlying buffer and 2) we always call `truncate` below to set the len back
// to the intitialized data.
// to the initialized data.
unsafe {
buffer.set_len(buffer.capacity());
}
Expand Down
16 changes: 8 additions & 8 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ impl Build {

/// Run the compiler, generating the file `output`
///
/// This will return a result instead of panicing; see compile() for the complete description.
/// This will return a result instead of panicking; see compile() for the complete description.
pub fn try_compile(&self, output: &str) -> Result<(), Error> {
let mut output_components = Path::new(output).components();
match (output_components.next(), output_components.next()) {
Expand Down Expand Up @@ -1201,7 +1201,7 @@ impl Build {
/// Run the compiler, generating intermediate files, but without linking
/// them into an archive file.
///
/// This will return a result instead of panicing; see `compile_intermediates()` for the complete description.
/// This will return a result instead of panicking; see `compile_intermediates()` for the complete description.
pub fn try_compile_intermediates(&self) -> Result<Vec<PathBuf>, Error> {
let dst = self.get_out_dir()?;
let objects = objects_from_files(&self.files, &dst)?;
Expand Down Expand Up @@ -1436,7 +1436,7 @@ impl Build {
Ok((cmd, name))
}

/// This will return a result instead of panicing; see expand() for the complete description.
/// This will return a result instead of panicking; see expand() for the complete description.
pub fn try_expand(&self) -> Result<Vec<u8>, Error> {
let compiler = self.try_get_compiler()?;
let mut cmd = compiler.to_command();
Expand Down Expand Up @@ -1523,7 +1523,7 @@ impl Build {

/// Get the compiler that's in use for this configuration.
///
/// This will return a result instead of panicing; see
/// This will return a result instead of panicking; see
/// [`get_compiler()`](Self::get_compiler) for the complete description.
pub fn try_get_compiler(&self) -> Result<Tool, Error> {
let opt_level = self.get_opt_level()?;
Expand Down Expand Up @@ -2778,7 +2778,7 @@ impl Build {

/// Get the archiver that's in use for this configuration.
///
/// This will return a result instead of panicing;
/// This will return a result instead of panicking;
/// see [`Self::get_archiver`] for the complete description.
pub fn try_get_archiver(&self) -> Result<Command, Error> {
Ok(self.try_get_archiver_and_flags()?.0)
Expand Down Expand Up @@ -2829,7 +2829,7 @@ impl Build {

/// Get the ranlib that's in use for this configuration.
///
/// This will return a result instead of panicing;
/// This will return a result instead of panicking;
/// see [`Self::get_ranlib`] for the complete description.
pub fn try_get_ranlib(&self) -> Result<Command, Error> {
let mut cmd = self.get_base_ranlib()?;
Expand Down Expand Up @@ -2873,7 +2873,7 @@ impl Build {
// Formally speaking one should be able to use this approach,
// parsing -print-search-dirs output, to cover all clang targets,
// including Android SDKs and other cross-compilation scenarios...
// And even extend it to gcc targets by seaching for "ar" instead
// And even extend it to gcc targets by searching for "ar" instead
// of "llvm-ar"...
let compiler = self.get_base_compiler().ok()?;
if compiler.family == ToolFamily::Clang {
Expand Down Expand Up @@ -2944,7 +2944,7 @@ impl Build {
Some(p) => {
// GCC uses $target-gcc-ar, whereas binutils uses $target-ar -- try both.
// Prefer -ar if it exists, as builds of `-gcc-ar` have been observed to be
// outright broken (such as when targetting freebsd with `--disable-lto`
// outright broken (such as when targeting freebsd with `--disable-lto`
// toolchain where the archiver attempts to load the LTO plugin anyway but
// fails to find one).
//
Expand Down
2 changes: 1 addition & 1 deletion src/parallel/async_executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ where
let mut fut2 = Some(unsafe { Pin::new_unchecked(&mut fut2) });

// TODO: Once `Waker::noop` stablised and our MSRV is bumped to the version
// which it is stablised, replace this wth `Waker::noop`.
// which it is stablised, replace this with `Waker::noop`.
let waker = unsafe { Waker::from_raw(NOOP_RAW_WAKER) };
let mut context = Context::from_waker(&waker);

Expand Down
2 changes: 1 addition & 1 deletion tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ fn gnu_apple_darwin() {
test.gcc()
.target(&target)
.host(&target)
// Avoid test maintainence when minimum supported OSes change.
// Avoid test maintenance when minimum supported OSes change.
.__set_env("MACOSX_DEPLOYMENT_TARGET", version)
.file("foo.c")
.compile("foo");
Expand Down