greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove now-unnecessary borrow checker appeasement (#511)

Browse Source 
Borrow errors produced by an older version of rust forced us to create
copies of errors in the recipe resolver. The borrow checker appears to
have evolved to the point where these copies are unnecessary, so this
diff removes them.
This commit is contained in:
Casey Rodarmor 2019-11-07 11:24:08 -08:00 committed by GitHub
parent b2285ce0e0
commit 36aca2bf7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/recipe_resolver.rs
View File

@ -2,16 +2,6 @@ use crate::common::*;
use CompilationErrorKind::*; use CompilationErrorKind::*;
// There are borrow issues here that seems too difficult to solve.
// The errors derived from the variable token has too short a lifetime,
// so we create a new error from its contents, which do live long
// enough.
//
// I suspect the solution here is to give recipes, pieces, and expressions
// two lifetime parameters instead of one, with one being the lifetime
// of the struct, and the second being the lifetime of the tokens
// that it contains.
pub(crate) struct RecipeResolver<'a: 'b, 'b> { pub(crate) struct RecipeResolver<'a: 'b, 'b> {
stack: Vec<&'a str>, stack: Vec<&'a str>,
seen: BTreeSet<&'a str>, seen: BTreeSet<&'a str>,
@ -68,16 +58,7 @@ impl<'a, 'b> RecipeResolver<'a, 'b> {
} }
fn resolve_function(&self, function: Token<'a>, argc: usize) -> CompilationResult<'a, ()> { fn resolve_function(&self, function: Token<'a>, argc: usize) -> CompilationResult<'a, ()> {
Function::resolve(&function, argc).map_err(|error| CompilationError { Function::resolve(&function, argc)
offset: error.offset,
line: error.line,
column: error.column,
width: error.width,
kind: UnknownFunction {
function: &function.src[error.offset..error.offset + error.width],
},
src: function.src,
})
} }
fn resolve_variable( fn resolve_variable(
@ -88,18 +69,9 @@ impl<'a, 'b> RecipeResolver<'a, 'b> {
let name = variable.lexeme(); let name = variable.lexeme();
let undefined = let undefined =
!self.assignments.contains_key(name) && !parameters.iter().any(|p| p.name.lexeme() == name); !self.assignments.contains_key(name) && !parameters.iter().any(|p| p.name.lexeme() == name);
if undefined { if undefined {
let error = variable.error(UndefinedVariable { variable: name }); return Err(variable.error(UndefinedVariable { variable: name }));
return Err(CompilationError {
offset: error.offset,
line: error.line,
column: error.column,
width: error.width,
kind: UndefinedVariable {
variable: &variable.src[error.offset..error.offset + error.width],
},
src: variable.src,
});
} }
Ok(()) Ok(())