fix typos
This commit is contained in:
parent
285fa7ecd0
commit
13e889986d
@ -328,7 +328,7 @@ impl UnsafeCode {
|
||||
cx.struct_span_lint(UNSAFE_CODE, span, decorate);
|
||||
}
|
||||
|
||||
fn report_overriden_symbol_name(&self, cx: &EarlyContext<'_>, span: Span, msg: &str) {
|
||||
fn report_overridden_symbol_name(&self, cx: &EarlyContext<'_>, span: Span, msg: &str) {
|
||||
self.report_unsafe(cx, span, |lint| {
|
||||
lint.build(msg)
|
||||
.note(
|
||||
@ -380,14 +380,14 @@ impl EarlyLintPass for UnsafeCode {
|
||||
|
||||
ast::ItemKind::Fn(..) => {
|
||||
if let Some(attr) = cx.sess().find_by_name(&it.attrs, sym::no_mangle) {
|
||||
self.report_overriden_symbol_name(
|
||||
self.report_overridden_symbol_name(
|
||||
cx,
|
||||
attr.span,
|
||||
"declaration of a `no_mangle` function",
|
||||
);
|
||||
}
|
||||
if let Some(attr) = cx.sess().find_by_name(&it.attrs, sym::export_name) {
|
||||
self.report_overriden_symbol_name(
|
||||
self.report_overridden_symbol_name(
|
||||
cx,
|
||||
attr.span,
|
||||
"declaration of a function with `export_name`",
|
||||
@ -397,14 +397,14 @@ impl EarlyLintPass for UnsafeCode {
|
||||
|
||||
ast::ItemKind::Static(..) => {
|
||||
if let Some(attr) = cx.sess().find_by_name(&it.attrs, sym::no_mangle) {
|
||||
self.report_overriden_symbol_name(
|
||||
self.report_overridden_symbol_name(
|
||||
cx,
|
||||
attr.span,
|
||||
"declaration of a `no_mangle` static",
|
||||
);
|
||||
}
|
||||
if let Some(attr) = cx.sess().find_by_name(&it.attrs, sym::export_name) {
|
||||
self.report_overriden_symbol_name(
|
||||
self.report_overridden_symbol_name(
|
||||
cx,
|
||||
attr.span,
|
||||
"declaration of a static with `export_name`",
|
||||
@ -419,14 +419,14 @@ impl EarlyLintPass for UnsafeCode {
|
||||
fn check_impl_item(&mut self, cx: &EarlyContext<'_>, it: &ast::AssocItem) {
|
||||
if let ast::AssocItemKind::Fn(..) = it.kind {
|
||||
if let Some(attr) = cx.sess().find_by_name(&it.attrs, sym::no_mangle) {
|
||||
self.report_overriden_symbol_name(
|
||||
self.report_overridden_symbol_name(
|
||||
cx,
|
||||
attr.span,
|
||||
"declaration of a `no_mangle` method",
|
||||
);
|
||||
}
|
||||
if let Some(attr) = cx.sess().find_by_name(&it.attrs, sym::export_name) {
|
||||
self.report_overriden_symbol_name(
|
||||
self.report_overridden_symbol_name(
|
||||
cx,
|
||||
attr.span,
|
||||
"declaration of a method with `export_name`",
|
||||
|
@ -116,7 +116,7 @@ impl<'s> LintLevelsBuilder<'s> {
|
||||
continue
|
||||
};
|
||||
for id in ids {
|
||||
// ForceWarn and Forbid cannot be overriden
|
||||
// ForceWarn and Forbid cannot be overridden
|
||||
if let Some((Level::ForceWarn | Level::Forbid, _)) = self.current_specs().get(&id) {
|
||||
continue;
|
||||
}
|
||||
@ -137,7 +137,7 @@ impl<'s> LintLevelsBuilder<'s> {
|
||||
self.sets.get_lint_level(id.lint, self.cur, Some(self.current_specs()), &self.sess);
|
||||
// Setting to a non-forbid level is an error if the lint previously had
|
||||
// a forbid level. Note that this is not necessarily true even with a
|
||||
// `#[forbid(..)]` attribute present, as that is overriden by `--cap-lints`.
|
||||
// `#[forbid(..)]` attribute present, as that is overridden by `--cap-lints`.
|
||||
//
|
||||
// This means that this only errors if we're truly lowering the lint
|
||||
// level from forbid.
|
||||
|
@ -50,7 +50,7 @@ fn bb_to_graph_node(block: BasicBlock, body: &Body<'_>, dark_mode: bool) -> Node
|
||||
let style = NodeStyle { title_bg: Some(bgcolor.to_owned()), ..Default::default() };
|
||||
let mut stmts: Vec<String> = data.statements.iter().map(|x| format!("{:?}", x)).collect();
|
||||
|
||||
// add the terminator to the stmts, gsgdt can print it out seperately
|
||||
// add the terminator to the stmts, gsgdt can print it out separately
|
||||
let mut terminator_head = String::new();
|
||||
data.terminator().kind.fmt_head(&mut terminator_head).unwrap();
|
||||
stmts.push(terminator_head);
|
||||
|
@ -250,7 +250,7 @@ pub struct BorrowCheckResult<'tcx> {
|
||||
|
||||
/// The result of the `mir_const_qualif` query.
|
||||
///
|
||||
/// Each field (except `error_occured`) corresponds to an implementer of the `Qualif` trait in
|
||||
/// Each field (except `error_occurred`) corresponds to an implementer of the `Qualif` trait in
|
||||
/// `rustc_const_eval/src/transform/check_consts/qualifs.rs`. See that file for more information on each
|
||||
/// `Qualif`.
|
||||
#[derive(Clone, Copy, Debug, Default, TyEncodable, TyDecodable, HashStable)]
|
||||
|
@ -608,7 +608,7 @@ pub fn check_unsafety<'tcx>(tcx: TyCtxt<'tcx>, def: ty::WithOptConstParam<LocalD
|
||||
|
||||
let (thir, expr) = tcx.thir_body(def);
|
||||
let thir = &thir.borrow();
|
||||
// If `thir` is empty, a type error occured, skip this body.
|
||||
// If `thir` is empty, a type error occurred, skip this body.
|
||||
if thir.exprs.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
@ -394,7 +394,7 @@ mod desc {
|
||||
pub const parse_linker_plugin_lto: &str =
|
||||
"either a boolean (`yes`, `no`, `on`, `off`, etc), or the path to the linker plugin";
|
||||
pub const parse_location_detail: &str =
|
||||
"comma seperated list of location details to track: `file`, `line`, or `column`";
|
||||
"comma separated list of location details to track: `file`, `line`, or `column`";
|
||||
pub const parse_switch_with_opt_path: &str =
|
||||
"an optional path to the profiling data output directory";
|
||||
pub const parse_merge_functions: &str = "one of: `disabled`, `trampolines`, or `aliases`";
|
||||
@ -1283,7 +1283,7 @@ options! {
|
||||
llvm_time_trace: bool = (false, parse_bool, [UNTRACKED],
|
||||
"generate JSON tracing data file from LLVM data (default: no)"),
|
||||
location_detail: LocationDetail = (LocationDetail::all(), parse_location_detail, [TRACKED],
|
||||
"comma seperated list of location details to be tracked when using caller_location \
|
||||
"comma separated list of location details to be tracked when using caller_location \
|
||||
valid options are `file`, `line`, and `column` (default: all)"),
|
||||
ls: bool = (false, parse_bool, [UNTRACKED],
|
||||
"list the symbols defined by a library crate (default: no)"),
|
||||
|
@ -69,7 +69,7 @@ pub struct SymbolGallery {
|
||||
|
||||
impl SymbolGallery {
|
||||
/// Insert a symbol and its span into symbol gallery.
|
||||
/// If the symbol has occurred before, ignore the new occurance.
|
||||
/// If the symbol has occurred before, ignore the new occurrance.
|
||||
pub fn insert(&self, symbol: Symbol, span: Span) {
|
||||
self.symbols.lock().entry(symbol).or_insert(span);
|
||||
}
|
||||
|
@ -369,7 +369,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
|
||||
(true, Some(None)) => {
|
||||
Some(format!("{cannot_do_this} in const contexts"))
|
||||
}
|
||||
// overriden post message
|
||||
// overridden post message
|
||||
(true, Some(Some(post_message))) => {
|
||||
Some(format!("{cannot_do_this}{post_message}"))
|
||||
}
|
||||
|
@ -609,7 +609,7 @@ fn assert_send() {
|
||||
|
||||
#[allow(dead_code)]
|
||||
// Check that the member-like functions conditionally provided by #[derive()]
|
||||
// are not overriden by genuine member functions with a different signature.
|
||||
// are not overridden by genuine member functions with a different signature.
|
||||
fn assert_derives() {
|
||||
fn hash<T: Hash, H: Hasher>(v: BTreeSet<T>, state: &mut H) {
|
||||
v.hash(state);
|
||||
|
@ -1795,7 +1795,7 @@ impl Rustflags {
|
||||
}
|
||||
|
||||
/// By default, cargo will pick up on various variables in the environment. However, bootstrap
|
||||
/// reuses those variables to pass additional flags to rustdoc, so by default they get overriden.
|
||||
/// reuses those variables to pass additional flags to rustdoc, so by default they get overridden.
|
||||
/// Explicitly add back any previous value in the environment.
|
||||
///
|
||||
/// `prefix` is usually `RUSTFLAGS` or `RUSTDOCFLAGS`.
|
||||
|
@ -948,7 +948,7 @@ fn resolve_associated_trait_item<'a>(
|
||||
///
|
||||
/// This function returns `None` if no associated item was found in the impl.
|
||||
/// This can occur when the trait associated item has a default value that is
|
||||
/// not overriden in the impl.
|
||||
/// not overridden in the impl.
|
||||
///
|
||||
/// This is just a wrapper around [`TyCtxt::impl_item_implementor_ids()`] and
|
||||
/// [`TyCtxt::associated_item()`] (with some helpful logging added).
|
||||
|
@ -326,7 +326,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
|
||||
om.items.push((item, renamed))
|
||||
}
|
||||
hir::ItemKind::Macro(ref macro_def, _) => {
|
||||
// `#[macro_export] macro_rules!` items are handled seperately in `visit()`,
|
||||
// `#[macro_export] macro_rules!` items are handled separately in `visit()`,
|
||||
// above, since they need to be documented at the module top level. Accordingly,
|
||||
// we only want to handle macros if one of three conditions holds:
|
||||
//
|
||||
|
@ -1,4 +1,4 @@
|
||||
// Test that `--show-output` has an effect and `allow(unused)` can be overriden.
|
||||
// Test that `--show-output` has an effect and `allow(unused)` can be overridden.
|
||||
|
||||
// check-pass
|
||||
// edition:2018
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Tests that subsequent lints specified via the command line override
|
||||
// each other, except for ForceWarn and Forbid, which cannot be overriden.
|
||||
// each other, except for ForceWarn and Forbid, which cannot be overridden.
|
||||
//
|
||||
// revisions: warn_deny forbid_warn force_warn_deny
|
||||
//
|
||||
|
@ -10,7 +10,7 @@ body:
|
||||
attributes:
|
||||
label: Summary
|
||||
description: |
|
||||
If possible, try to provide a minimal verifiable example. You can read ["Rust Bug Minimization Patterns"][mve] for how to create smaller examples. Otherwise, provide the crate where the ICE occured.
|
||||
If possible, try to provide a minimal verifiable example. You can read ["Rust Bug Minimization Patterns"][mve] for how to create smaller examples. Otherwise, provide the crate where the ICE occurred.
|
||||
|
||||
[mve]: http://blog.pnkfx.org/blog/2019/11/18/rust-bug-minimization-patterns/
|
||||
validations:
|
||||
|
@ -114,7 +114,7 @@ impl LateLintPass<'_> for UpperCaseAcronyms {
|
||||
check_ident(cx, &it.ident, self.upper_case_acronyms_aggressive);
|
||||
},
|
||||
ItemKind::Enum(ref enumdef, _) => {
|
||||
// check enum variants seperately because again we only want to lint on private enums and
|
||||
// check enum variants separately because again we only want to lint on private enums and
|
||||
// the fn check_variant does not know about the vis of the enum of its variants
|
||||
enumdef
|
||||
.variants
|
||||
|
Loading…
x
Reference in New Issue
Block a user