Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion compiler/rustc_mir/src/transform/check_unsafety.rs
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ pub fn check_unsafety(tcx: TyCtxt<'_>, def_id: LocalDefId) {
// should only issue a warning for the sake of backwards compatibility.
//
// The solution those 2 expectations is to always take the minimum of both lints.
// This prevent any new errors (unless both lints are explicitely set to `deny`).
// This prevent any new errors (unless both lints are explicitly set to `deny`).
let lint = if tcx.lint_level_at_node(SAFE_PACKED_BORROWS, lint_root).0
<= tcx.lint_level_at_node(UNSAFE_OP_IN_UNSAFE_FN, lint_root).0
{
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_typeck/src/check/pat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
sp,
&format!(
"if you don't care about {} missing field{}, you can explicitely ignore {}",
"if you don't care about {} missing field{}, you can explicitly ignore {}",
if len == 1 { "this" } else { "these" },
if len == 1 { "" } else { "s" },
if len == 1 { "it" } else { "them" },
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/error-codes/E0027.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ help: include the missing field in the pattern
|
LL | Dog { age: x, name } => {}
| ^^^^^^
help: if you don't care about this missing field, you can explicitely ignore it
help: if you don't care about this missing field, you can explicitly ignore it
|
LL | Dog { age: x, .. } => {}
| ^^^^
Expand All @@ -23,7 +23,7 @@ help: include the missing fields in the pattern
|
LL | Dog { name, age } => {}
| ^^^^^^^^^^^^^
help: if you don't care about these missing fields, you can explicitely ignore them
help: if you don't care about these missing fields, you can explicitly ignore them
|
LL | Dog { .. } => {}
| ^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/structs/struct-field-cfg.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ help: include the missing field in the pattern
|
LL | let Foo { present } = foo;
| ^^^^^^^^^^^
help: if you don't care about this missing field, you can explicitely ignore it
help: if you don't care about this missing field, you can explicitly ignore it
|
LL | let Foo { .. } = foo;
| ^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/structs/struct-pat-derived-error.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ help: include the missing fields in the pattern
|
LL | let A { x, y, b, c } = self.d;
| ^^^^^^
help: if you don't care about these missing fields, you can explicitely ignore them
help: if you don't care about these missing fields, you can explicitly ignore them
|
LL | let A { x, y, .. } = self.d;
| ^^^^
Expand Down