Skip to content

Rollup of 8 pull requests #123143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
59a3a5d
Clarify atomic bit validity
joshlf Mar 3, 2024
db34b08
Clarify bit validity for AtomicBool
joshlf Mar 3, 2024
00d21c9
Document AtomicPtr bit validity
joshlf Mar 3, 2024
fba87f6
Use "size and alignment" rather than layout
joshlf Mar 3, 2024
c50804c
Update library/core/src/sync/atomic.rs
joshlf Mar 3, 2024
a6e3e02
Update library/core/src/sync/atomic.rs
joshlf Mar 3, 2024
083ee83
Add invariant to VecDeque::pop_* that len < cap if pop successful
Philippe-Cholet Mar 26, 2024
804c047
Load missing type of impl associated constant from trait definition
oli-obk Mar 27, 2024
d0eb9c8
move type inference for missing types on constants into its own method
oli-obk Mar 27, 2024
7786ee3
Remove a call-site to `primary_body_of` as it is only interested in t…
oli-obk Mar 27, 2024
86e750f
Inline `primary_body_of` into its sole call site
oli-obk Mar 27, 2024
0cd9708
Delegation: fix ICE on wrong instantiation
Bryanskiy Mar 26, 2024
3157114
chore: fix some comments
xiaoxiangxianzi Mar 27, 2024
cc4a1f4
Some wording improvement
Vagelis-Prokopiou Mar 27, 2024
336ff42
`num::NonZero::get` can be 1 transmute instead of 3
scottmcm Mar 27, 2024
df4eec8
Let nils know about changes to target docs
Noratrieb Mar 27, 2024
307ebfd
Rollup merge of #121943 - joshlf:patch-11, r=scottmcm
matthiaskrgr Mar 27, 2024
8322a3b
Rollup merge of #123089 - Philippe-Cholet:vecdeque_pop_assume_cap, r=…
matthiaskrgr Mar 27, 2024
8427c80
Rollup merge of #123101 - Bryanskiy:delegation-fixes-2, r=petrochenkov
matthiaskrgr Mar 27, 2024
3a8cacb
Rollup merge of #123130 - oli-obk:missing_type_taint, r=compiler-errors
matthiaskrgr Mar 27, 2024
abe937a
Rollup merge of #123133 - xiaoxiangxianzi:master, r=fmease
matthiaskrgr Mar 27, 2024
fced740
Rollup merge of #123136 - Vagelis-Prokopiou:fix/docs, r=ChrisDenton
matthiaskrgr Mar 27, 2024
f53f843
Rollup merge of #123139 - scottmcm:simpler-nonzero-get, r=jhpratt
matthiaskrgr Mar 27, 2024
98fa10e
Rollup merge of #123142 - Nilstrieb:nils-knows-whats-happening, r=com…
matthiaskrgr Mar 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: fix some comments
Signed-off-by: xiaoxiangxianzi <zhaoyizheng@outlook.com>
  • Loading branch information
xiaoxiangxianzi committed Mar 27, 2024
commit 3157114f0b4b28caad0d593a0cc5d8b04d02a29c
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ toolchain.
directory and uncomment the line `MSYS2_PATH_TYPE=inherit`.

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

3. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
or 64-bit Rust) either from your start menu, or by running `mingw64.exe`
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_ast_pretty/src/pprust/state/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub(crate) struct FixupContext {
}

/// The default amount of fixing is minimal fixing. Fixups should be turned on
/// in a targetted fashion where needed.
/// in a targeted fashion where needed.
impl Default for FixupContext {
fn default() -> Self {
FixupContext {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_borrowck/src/type_check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
}
self.cx.borrowck_context.constraints.outlives_constraints.push(constraint)
}
// If the region is live at at least one location in the promoted MIR,
// If the region is live at least one location in the promoted MIR,
// then add a liveness constraint to the main MIR for this region
// at the location provided as an argument to this method
//
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_const_eval/src/const_eval/eval_queries.rs
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ fn const_validate_mplace<'mir, 'tcx>(
}
};
ecx.const_validate_operand(&mplace.into(), path, &mut ref_tracking, mode)
// Instead of just reporting the `InterpError` via the usual machinery, we give a more targetted
// Instead of just reporting the `InterpError` via the usual machinery, we give a more targeted
// error about the validation failure.
.map_err(|error| report_validation_error(&ecx, error, alloc_id))?;
inner = true;
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_hir_analysis/src/hir_ty_lowering/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use super::HirTyLowerer;
impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
/// Prohibit or lint against *bare* trait object types depending on the edition.
///
/// *Bare* trait object types are ones that aren't preceeded by the keyword `dyn`.
/// *Bare* trait object types are ones that aren't preceded by the keyword `dyn`.
/// In edition 2021 and onward we emit a hard error for them.
pub(super) fn prohibit_or_lint_bare_trait_object_ty(
&self,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_parse/src/parser/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2768,7 +2768,7 @@ impl<'a> Parser<'a> {
};
return if self.token.kind == token::CloseDelim(Delimiter::Parenthesis) {
// We know for sure we have seen `for ($SOMETHING in $EXPR)`, so we recover the
// parser state and emit a targetted suggestion.
// parser state and emit a targeted suggestion.
let span = vec![start_span, self.token.span];
let right = self.prev_token.span.between(self.look_ahead(1, |t| t.span));
self.bump(); // )
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/pin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@
//!
//! As a consequence, the struct *must not* be [`#[repr(packed)]`][packed].
//!
//! 3. *Structural Notice of Destruction.* You must uphold the the
//! 3. *Structural Notice of Destruction.* You must uphold the
//! [`Drop` guarantee][drop-guarantee]: once your struct is pinned, the struct's storage cannot
//! be re-used without calling the structurally-pinned fields' destructors, as well.
//!
Expand Down
2 changes: 1 addition & 1 deletion tests/rustdoc-gui/target.goml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Check that the targetted element has the expected styles.
// Check that the targeted element has the expected styles.
go-to: "file://" + |DOC_PATH| + "/lib2/struct.Foo.html#method.a_method"
show-text: true

Expand Down