greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Bustage fix: Build against Rust 1.25.

Browse source
This commit is contained in:
Nick Alexander 2018-06-13 09:45:15 -07:00 committed by Nick Alexander
parent 8cc0e5a64e
commit f041dfe509
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/cli/src/mentat_cli/lib.rs
View file

@ -90,7 +90,7 @@ pub fn run() -> i32 {
match last_arg { match last_arg {
Some("-d") => { Some("-d") => {
last_arg = None; last_arg = None;
if let Some(k) = &key { if let &Some(ref k) = &key {
Some(command_parser::Command::OpenEncrypted(arg.clone(), k.clone())) Some(command_parser::Command::OpenEncrypted(arg.clone(), k.clone()))
} else { } else {
Some(command_parser::Command::Open(arg.clone())) Some(command_parser::Command::Open(arg.clone()))

14
tools/cli/src/mentat_cli/repl.rs
View file

@ -407,22 +407,22 @@ impl Repl {
Ok(()) Ok(())
} }
fn open(&mut self, path: impl Into<String>) -> ::mentat::errors::Result<()> { fn open<T>(&mut self, path: T) -> ::mentat::errors::Result<()> where T: Into<String> {
self.open_common(false, path.into(), None) self.open_common(false, path.into(), None)
} }
fn open_empty(&mut self, path: impl Into<String>) fn open_empty<T>(&mut self, path: T)
-> ::mentat::errors::Result<()> { -> ::mentat::errors::Result<()> where T: Into<String> {
self.open_common(true, path.into(), None) self.open_common(true, path.into(), None)
} }
fn open_with_key(&mut self, path: impl Into<String>, encryption_key: impl AsRef<str>) fn open_with_key<T, U>(&mut self, path: T, encryption_key: U)
-> ::mentat::errors::Result<()> { -> ::mentat::errors::Result<()> where T: Into<String>, U: AsRef<str> {
self.open_common(false, path.into(), Some(encryption_key.as_ref())) self.open_common(false, path.into(), Some(encryption_key.as_ref()))
} }
fn open_empty_with_key(&mut self, path: impl Into<String>, encryption_key: impl AsRef<str>) fn open_empty_with_key<T, U>(&mut self, path: T, encryption_key: U)
-> ::mentat::errors::Result<()> { -> ::mentat::errors::Result<()> where T: Into<String>, U: AsRef<str> {
self.open_common(true, path.into(), Some(encryption_key.as_ref())) self.open_common(true, path.into(), Some(encryption_key.as_ref()))
} }