Merge pull request #77 from jonathandturner/master

Fix up some warnings and move integration tests to correct dir
This commit is contained in:
Jonathan Turner 2019-06-03 15:49:36 +12:00 committed by GitHub
commit 5e6b62a02c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions

View File

@ -35,7 +35,7 @@ impl<T> MaybeOwned<'a, T> {
} }
} }
pub async fn cli() -> Result<(), Box<Error>> { pub async fn cli() -> Result<(), Box<dyn Error>> {
let mut context = Context::basic()?; let mut context = Context::basic()?;
{ {

View File

@ -12,7 +12,7 @@ pub struct Context {
} }
impl Context { impl Context {
crate fn basic() -> Result<Context, Box<Error>> { crate fn basic() -> Result<Context, Box<dyn Error>> {
Ok(Context { Ok(Context {
commands: indexmap::IndexMap::new(), commands: indexmap::IndexMap::new(),
host: Arc::new(Mutex::new(crate::env::host::BasicHost)), host: Arc::new(Mutex::new(crate::env::host::BasicHost)),

View File

@ -17,13 +17,12 @@ mod parser;
mod prelude; mod prelude;
mod shell; mod shell;
mod stream; mod stream;
mod tests;
use clap::{App, Arg}; use clap::{App, Arg};
use log::LevelFilter; use log::LevelFilter;
use std::error::Error; use std::error::Error;
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<dyn Error>> {
let matches = App::new("nu shell") let matches = App::new("nu shell")
.version("0.5") .version("0.5")
.arg( .arg(