Skip to content
Open
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 command/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ fn pfmerge(parser: &ParsedCommand, db: &mut Database, dbindex: usize) -> Respons
let (val, r) = {
let mut val = Value::Nil;
if let Some(v) = db.get(dbindex, &key) {
try_validate!(val.set(try_validate!(v.get(), "ERR")), "ERR"); // FIXME unnecesary clone
try_validate!(val.set(try_validate!(v.get(), "ERR")), "ERR"); // FIXME unnecessary clone
}
let mut values = Vec::with_capacity(parser.argv.len() - 2);
for i in 2..parser.argv.len() {
Expand Down
2 changes: 1 addition & 1 deletion database/rdbutil/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl From<EncodeError> for io::Error {
// But... I don't know how can it be specified that a generic can be compared
// with hardcoded numbers (e.g.: -(1 << 7)) or what would happen with unsigned
// numbers.
// For now, the caller will have to explicitely cast or implement a wrapper function
// For now, the caller will have to explicitly cast or implement a wrapper function
pub fn encode_i64<W: io::Write>(value: i64, enc: &mut W) -> Result<(), EncodeError> {
Ok(if value >= -(1 << 7) && value < 1 << 7 {
enc.write_all(&[(ENCVAL << 6) | ENC_INT8, (value & 0xFF) as u8])
Expand Down
2 changes: 1 addition & 1 deletion parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ impl<'a> fmt::Debug for ParsedCommand<'a> {
}
}

/// Parses the length of the paramenter in the slice
/// Parses the length of the parameter in the slice
/// Upon success, it returns a tuple with the length of the argument and the
/// length of the parsed length.
fn parse_int(input: &[u8], len: usize, name: &str) -> Result<(Option<usize>, usize), ParseError> {
Expand Down