Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d779a7a

Browse files
committedMar 28, 2024
Auto merge of rust-lang#123147 - matthiaskrgr:rollup-2t5ot36, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#121943 (Clarify atomic bit validity) - rust-lang#123075 (CFI: Fix drop and drop_in_place) - rust-lang#123101 (Delegation: fix ICE on wrong `Self` instantiation) - rust-lang#123130 (Load missing type of impl associated constant from trait definition) - rust-lang#123133 (chore: fix some comments) - rust-lang#123136 (Some wording improvement) - rust-lang#123139 (`num::NonZero::get` can be 1 transmute instead of 2) - rust-lang#123142 (Let nils know about changes to target docs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9d70954 + 145211e commit d779a7a

Some content is hidden

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

43 files changed

+478
-271
lines changed
 

‎INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ toolchain.
151151
directory and uncomment the line `MSYS2_PATH_TYPE=inherit`.
152152

153153
You could install and use MSYS2's version of git instead with `pacman`,
154-
however this is not recommended as it's excrutiatingly slow, and not frequently
155-
tested for compatability.
154+
however this is not recommended as it's excruciatingly slow, and not frequently
155+
tested for compatibility.
156156

157157
3. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
158158
or 64-bit Rust) either from your start menu, or by running `mingw64.exe`

‎compiler/rustc_ast_pretty/src/pprust/state/expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pub(crate) struct FixupContext {
7575
}
7676

7777
/// The default amount of fixing is minimal fixing. Fixups should be turned on
78-
/// in a targetted fashion where needed.
78+
/// in a targeted fashion where needed.
7979
impl Default for FixupContext {
8080
fn default() -> Self {
8181
FixupContext {

0 commit comments

Comments
 (0)
This repository has been archived.