Skip to content

Commit fb72bad

Browse files
committed
Auto merge of #136332 - jhpratt:rollup-aa69d0e, r=jhpratt
Rollup of 9 pull requests Successful merges: - #132156 (When encountering unexpected closure return type, point at return type/expression) - #133429 (Autodiff Upstreaming - rustc_codegen_ssa, rustc_middle) - #136281 (`rustc_hir_analysis` cleanups) - #136297 (Fix a typo in profile-guided-optimization.md) - #136300 (atomic: extend compare_and_swap migration docs) - #136310 (normalize `*.long-type.txt` paths for compare-mode tests) - #136312 (Disable `overflow_delimited_expr` in edition 2024) - #136313 (Filter out RPITITs when suggesting unconstrained assoc type on too many generics) - #136323 (Fix a typo in conventions.md) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2f400ee + 4eb4894 commit fb72bad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: src/conventions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ environment.
4343

4444
## Formatting and linting Python code
4545

46-
The Rust repository contains quite a lof of Python code. We try to keep
46+
The Rust repository contains quite a lot of Python code. We try to keep
4747
it both linted and formatted by the [ruff][ruff] tool.
4848

4949
When modifying Python code, use this command to format it:

0 commit comments

Comments
 (0)