suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from pickfire/fix-panic 

Fix panic opening rust file
pull/70/head
Corey Powell 2021-06-02 13:14:19 -05:00 committed by GitHub
parent 2719a35123 eab6e53511
commit 83031564db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helix-term/src/main.rs
View File

@ -51,7 +51,8 @@ pub struct Args {
files: Vec<PathBuf>, files: Vec<PathBuf>,
} }
fn main() -> Result<()> { #[tokio::main]
async fn main() -> Result<()> {
let help = format!( let help = format!(
"\ "\
{} {} {} {}
@ -113,13 +114,9 @@ FLAGS:
let config = toml::from_slice(toml).context("Could not parse languages.toml")?; let config = toml::from_slice(toml).context("Could not parse languages.toml")?;
LOADER.get_or_init(|| Loader::new(config)); LOADER.get_or_init(|| Loader::new(config));
let runtime = tokio::runtime::Runtime::new().context("unable to start tokio runtime")?;
// TODO: use the thread local executor to spawn the application task separately from the work pool // TODO: use the thread local executor to spawn the application task separately from the work pool
let mut app = Application::new(args).context("unable to create new appliction")?; let mut app = Application::new(args).context("unable to create new appliction")?;
runtime.block_on(async move { app.run().await;
app.run().await;
});
Ok(()) Ok(())
} }