Skip to content

Commit

Permalink
Auto merge of #134513 - fudancoder:master, r=jieyouxu
Browse files Browse the repository at this point in the history
Fix some typos
  • Loading branch information
bors committed Dec 24, 2024
2 parents d3e71fd + e97be25 commit 32c8a9f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion tests/ui/lint/lint-overflowing-ops.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/lint/unconditional_panic_promoted.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/moves/suggest-borrow-for-generic-arg.fixed
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/moves/suggest-borrow-for-generic-arg.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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)]

Expand Down

0 comments on commit 32c8a9f

Please sign in to comment.