Skip to content

Commit b8bb296

Browse files
committed
Auto merge of #132079 - fmease:rollup-agrd358, r=fmease
Rollup of 9 pull requests Successful merges: - #130991 (Vectorized SliceContains) - #131928 (rustdoc: Document `markdown` module.) - #131955 (Set `signext` or `zeroext` for integer arguments on RISC-V and LoongArch64) - #131979 (Minor tweaks to `compare_impl_item.rs`) - #132036 (Add a test case for #131164) - #132039 (Specialize `read_exact` and `read_buf_exact` for `VecDeque`) - #132060 ("innermost", "outermost", "leftmost", and "rightmost" don't need hyphens) - #132065 (Clarify documentation of `ptr::dangling()` function) - #132066 (Fix a typo in documentation of `pointer::sub_ptr()`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4f2f477 + fbe33e3 commit b8bb296

File tree

54 files changed

+738
-317
lines changed

Some content is hidden

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

54 files changed

+738
-317
lines changed

Diff for: compiler/rustc_codegen_gcc/src/type_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ impl<'tcx> LayoutGccExt<'tcx> for TyAndLayout<'tcx> {
197197
/// `[T]` becomes `T`, while `str` and `Trait` turn into `i8` - this
198198
/// is useful for indexing slices, as `&[T]`'s data pointer is `T*`.
199199
/// If the type is an unsized struct, the regular layout is generated,
200-
/// with the inner-most trailing unsized field using the "minimal unit"
200+
/// with the innermost trailing unsized field using the "minimal unit"
201201
/// of that field's type - this is useful for taking the address of
202202
/// that field and ensuring the struct has the right alignment.
203203
fn gcc_type<'gcc>(&self, cx: &CodegenCx<'gcc, 'tcx>) -> Type<'gcc> {

Diff for: compiler/rustc_codegen_llvm/src/type_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyAndLayout<'tcx> {
191191
/// `[T]` becomes `T`, while `str` and `Trait` turn into `i8` - this
192192
/// is useful for indexing slices, as `&[T]`'s data pointer is `T*`.
193193
/// If the type is an unsized struct, the regular layout is generated,
194-
/// with the inner-most trailing unsized field using the "minimal unit"
194+
/// with the innermost trailing unsized field using the "minimal unit"
195195
/// of that field's type - this is useful for taking the address of
196196
/// that field and ensuring the struct has the right alignment.
197197
fn llvm_type<'a>(&self, cx: &CodegenCx<'a, 'tcx>) -> &'a Type {

Diff for: compiler/rustc_codegen_ssa/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ impl CrateInfo {
888888
// below.
889889
//
890890
// In order to get this left-to-right dependency ordering, we use the reverse
891-
// postorder of all crates putting the leaves at the right-most positions.
891+
// postorder of all crates putting the leaves at the rightmost positions.
892892
let mut compiler_builtins = None;
893893
let mut used_crates: Vec<_> = tcx
894894
.postorder_cnums(())

Diff for: compiler/rustc_errors/src/emitter.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ impl HumanReadableErrorType {
5858
struct Margin {
5959
/// The available whitespace in the left that can be consumed when centering.
6060
pub whitespace_left: usize,
61-
/// The column of the beginning of left-most span.
61+
/// The column of the beginning of leftmost span.
6262
pub span_left: usize,
63-
/// The column of the end of right-most span.
63+
/// The column of the end of rightmost span.
6464
pub span_right: usize,
6565
/// The beginning of the line to be displayed.
6666
pub computed_left: usize,
@@ -128,7 +128,7 @@ impl Margin {
128128
} else {
129129
0
130130
};
131-
// We want to show as much as possible, max_line_len is the right-most boundary for the
131+
// We want to show as much as possible, max_line_len is the rightmost boundary for the
132132
// relevant code.
133133
self.computed_right = max(max_line_len, self.computed_left);
134134

@@ -685,7 +685,7 @@ impl HumanEmitter {
685685
buffer.puts(line_offset, code_offset, "...", Style::LineNumber);
686686
}
687687
if margin.was_cut_right(line_len) {
688-
// We have stripped some code after the right-most span end, make it clear we did so.
688+
// We have stripped some code after the rightmost span end, make it clear we did so.
689689
buffer.puts(line_offset, code_offset + taken - 3, "...", Style::LineNumber);
690690
}
691691
buffer.puts(line_offset, 0, &self.maybe_anonymized(line_index), Style::LineNumber);

Diff for: compiler/rustc_expand/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ expand_collapse_debuginfo_illegal =
2525
illegal value for attribute #[collapse_debuginfo(no|external|yes)]
2626
2727
expand_count_repetition_misplaced =
28-
`count` can not be placed inside the inner-most repetition
28+
`count` can not be placed inside the innermost repetition
2929
3030
expand_crate_name_in_cfg_attr =
3131
`crate_name` within an `#![cfg_attr]` attribute is forbidden

Diff for: compiler/rustc_expand/src/mbe/metavar_expr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ pub(crate) enum MetaVarExpr {
2323
/// Ignore a meta-variable for repetition without expansion.
2424
Ignore(Ident),
2525

26-
/// The index of the repetition at a particular depth, where 0 is the inner-most
26+
/// The index of the repetition at a particular depth, where 0 is the innermost
2727
/// repetition. The `usize` is the depth.
2828
Index(usize),
2929

30-
/// The length of the repetition at a particular depth, where 0 is the inner-most
30+
/// The length of the repetition at a particular depth, where 0 is the innermost
3131
/// repetition. The `usize` is the depth.
3232
Len(usize),
3333
}

Diff for: compiler/rustc_expand/src/mbe/transcribe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ fn lockstep_iter_size(
570570
}
571571
}
572572

573-
/// Used solely by the `count` meta-variable expression, counts the outer-most repetitions at a
573+
/// Used solely by the `count` meta-variable expression, counts the outermost repetitions at a
574574
/// given optional nested depth.
575575
///
576576
/// For example, a macro parameter of `$( { $( $foo:ident ),* } )*` called with `{ a, b } { c }`:

0 commit comments

Comments
 (0)