mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #15812 - cuishuang:master, r=lnicola

Browse Source 
Fix some typos
This commit is contained in:
bors 2023-10-30 06:48:55 +00:00
commit 16f3398ff4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/hir-ty/src/mir/eval.rs
View File

@ -162,7 +162,7 @@ pub struct Evaluator<'a> {
not_special_fn_cache: RefCell<FxHashSet<FunctionId>>, not_special_fn_cache: RefCell<FxHashSet<FunctionId>>,
mir_or_dyn_index_cache: RefCell<FxHashMap<(FunctionId, Substitution), MirOrDynIndex>>, mir_or_dyn_index_cache: RefCell<FxHashMap<(FunctionId, Substitution), MirOrDynIndex>>,
/// Constantly dropping and creating `Locals` is very costly. We store /// Constantly dropping and creating `Locals` is very costly. We store
/// old locals that we normaly want to drop here, to reuse their allocations /// old locals that we normally want to drop here, to reuse their allocations
/// later. /// later.
unused_locals_store: RefCell<FxHashMap<DefWithBodyId, Vec<Locals>>>, unused_locals_store: RefCell<FxHashMap<DefWithBodyId, Vec<Locals>>>,
cached_ptr_size: usize, cached_ptr_size: usize,
@ -2299,7 +2299,7 @@ fn exec_fn_with_args(
match self.get_mir_or_dyn_index(def, generic_args.clone(), locals, span)? { match self.get_mir_or_dyn_index(def, generic_args.clone(), locals, span)? {
MirOrDynIndex::Dyn(self_ty_idx) => { MirOrDynIndex::Dyn(self_ty_idx) => {
// In the layout of current possible receiver, which at the moment of writing this code is one of // In the layout of current possible receiver, which at the moment of writing this code is one of
// `&T`, `&mut T`, `Box<T>`, `Rc<T>`, `Arc<T>`, and `Pin<P>` where `P` is one of possible recievers, // `&T`, `&mut T`, `Box<T>`, `Rc<T>`, `Arc<T>`, and `Pin<P>` where `P` is one of possible receivers,
// the vtable is exactly in the `[ptr_size..2*ptr_size]` bytes. So we can use it without branching on // the vtable is exactly in the `[ptr_size..2*ptr_size]` bytes. So we can use it without branching on
// the type. // the type.
let first_arg = arg_bytes.clone().next().unwrap(); let first_arg = arg_bytes.clone().next().unwrap();

2
crates/rust-analyzer/src/handlers/request.rs
View File

@ -2000,7 +2000,7 @@ fn run_rustfmt(
let workspace = CargoTargetSpec::for_file(&snap, file_id)?; let workspace = CargoTargetSpec::for_file(&snap, file_id)?;
let mut cmd = match workspace { let mut cmd = match workspace {
Some(spec) => { Some(spec) => {
// approach: if the command name contains a path seperator, join it with the workspace root. // approach: if the command name contains a path separator, join it with the workspace root.
// however, if the path is absolute, joining will result in the absolute path being preserved. // however, if the path is absolute, joining will result in the absolute path being preserved.
// as a fallback, rely on $PATH-based discovery. // as a fallback, rely on $PATH-based discovery.
let cmd_path = let cmd_path =

4
crates/syntax/src/tests/sourcegen_ast.rs
View File

@ -623,7 +623,7 @@ fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {
} }
fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, rule: &Rule) { fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, rule: &Rule) {
if lower_seperated_list(acc, grammar, label, rule) { if lower_separated_list(acc, grammar, label, rule) {
return; return;
} }
@ -689,7 +689,7 @@ fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, r
} }
// (T (',' T)* ','?) // (T (',' T)* ','?)
fn lower_seperated_list( fn lower_separated_list(
acc: &mut Vec<Field>, acc: &mut Vec<Field>,
grammar: &Grammar, grammar: &Grammar,
label: Option<&String>, label: Option<&String>,