diff options
| author | bors <bors@rust-lang.org> | 2024-12-24 06:12:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-24 06:12:04 +0000 |
| commit | 32c8a9f49d5b753ccb0aee2fd1f7a232a9c5baf3 (patch) | |
| tree | 5c79aa57502752fd45ef2f5b49cd610519bc419b | |
| parent | d3e71fd2d3cf68addac558a807c9ba83f6217a64 (diff) | |
| parent | e97be25aa950c25b8f099ef3f9ed642dab0aafae (diff) | |
| download | rust-32c8a9f49d5b753ccb0aee2fd1f7a232a9c5baf3.tar.gz rust-32c8a9f49d5b753ccb0aee2fd1f7a232a9c5baf3.zip | |
Auto merge of #134513 - fudancoder:master, r=jieyouxu
Fix some typos
6 files changed, 8 insertions, 8 deletions
diff --git a/tests/ui/lint/lint-overflowing-ops.rs b/tests/ui/lint/lint-overflowing-ops.rs index c5b9f892b0b..eec347010ad 100644 --- a/tests/ui/lint/lint-overflowing-ops.rs +++ b/tests/ui/lint/lint-overflowing-ops.rs @@ -1,5 +1,5 @@ // Tests that overflowing or bound-exceeding operations -// are correclty linted including when they are const promoted +// are correctly linted including when they are const promoted // We are using "-Z deduplicate-diagnostics=yes" because different // build configurations emit different number of duplicate diagnostics diff --git a/tests/ui/lint/unconditional_panic_promoted.rs b/tests/ui/lint/unconditional_panic_promoted.rs index 37bcf046513..e9ae834c8d8 100644 --- a/tests/ui/lint/unconditional_panic_promoted.rs +++ b/tests/ui/lint/unconditional_panic_promoted.rs @@ -2,7 +2,7 @@ fn main() { // MIR encodes this as a reborrow from a promoted constant. - // But the array lenth can still be gotten from the type. + // But the array length can still be gotten from the type. let slice = &[0, 1]; let _ = slice[2]; //~ ERROR: this operation will panic at runtime [unconditional_panic] } diff --git a/tests/ui/moves/auxiliary/suggest-borrow-for-generic-arg-aux.rs b/tests/ui/moves/auxiliary/suggest-borrow-for-generic-arg-aux.rs index c71238ba072..a5f58d88fb1 100644 --- a/tests/ui/moves/auxiliary/suggest-borrow-for-generic-arg-aux.rs +++ b/tests/ui/moves/auxiliary/suggest-borrow-for-generic-arg-aux.rs @@ -1,4 +1,4 @@ -//! auxiliary definitons for suggest-borrow-for-generic-arg.rs, to ensure the suggestion works on +//! auxiliary definitions for suggest-borrow-for-generic-arg.rs, to ensure the suggestion works on //! functions defined in other crates. use std::io::{self, Read, Write}; diff --git a/tests/ui/moves/suggest-borrow-for-generic-arg.fixed b/tests/ui/moves/suggest-borrow-for-generic-arg.fixed index b5e0b468aa6..e47a2d08b61 100644 --- a/tests/ui/moves/suggest-borrow-for-generic-arg.fixed +++ b/tests/ui/moves/suggest-borrow-for-generic-arg.fixed @@ -1,5 +1,5 @@ -//! Test suggetions to borrow generic arguments instead of moving. Tests for other instances of this -//! can be found in `moved-value-on-as-ref-arg.rs` and `borrow-closures-instead-of-move.rs` +//! Test suggestions to borrow generic arguments instead of moving. Tests for other instances of +//! this can be found in `moved-value-on-as-ref-arg.rs` and `borrow-closures-instead-of-move.rs` //@ run-rustfix //@ aux-crate:aux=suggest-borrow-for-generic-arg-aux.rs //@ edition: 2021 diff --git a/tests/ui/moves/suggest-borrow-for-generic-arg.rs b/tests/ui/moves/suggest-borrow-for-generic-arg.rs index e08978db63a..5895999c51d 100644 --- a/tests/ui/moves/suggest-borrow-for-generic-arg.rs +++ b/tests/ui/moves/suggest-borrow-for-generic-arg.rs @@ -1,5 +1,5 @@ -//! Test suggetions to borrow generic arguments instead of moving. Tests for other instances of this -//! can be found in `moved-value-on-as-ref-arg.rs` and `borrow-closures-instead-of-move.rs` +//! Test suggestions to borrow generic arguments instead of moving. Tests for other instances of +//! this can be found in `moved-value-on-as-ref-arg.rs` and `borrow-closures-instead-of-move.rs` //@ run-rustfix //@ aux-crate:aux=suggest-borrow-for-generic-arg-aux.rs //@ edition: 2021 diff --git a/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs b/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs index eb6e66818fc..3219f63f5df 100644 --- a/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs +++ b/tests/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs @@ -1,7 +1,7 @@ // Test that we are imposing the requirement that every associated // type of a bound that appears in the where clause on a struct must // outlive the location in which the type appears, even when the -// associted type is in a supertype. Issue #22246. +// associated type is in a supertype. Issue #22246. #![allow(dead_code)] |
