From c4970c617ed5f03dadce2a284b66539bf0ce3054 Mon Sep 17 00:00:00 2001
From: Dmitry Sharshakov <d3dx12.xx@gmail.com>
Date: Fri, 20 Aug 2021 16:48:59 +0300
Subject: [PATCH] make CI green
---
helix-dap/examples/dap-dlv.rs | 2 +-
helix-dap/examples/dap-lldb.rs | 2 +-
helix-syntax/languages/tree-sitter-protobuf | 2 +-
helix-term/src/application.rs | 5 ++---
helix-term/src/commands.rs | 2 +-
helix-term/src/ui/editor.rs | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/helix-dap/examples/dap-dlv.rs b/helix-dap/examples/dap-dlv.rs
index bffca676..bb5b1963 100644
--- a/helix-dap/examples/dap-dlv.rs
+++ b/helix-dap/examples/dap-dlv.rs
@@ -56,7 +56,7 @@ pub async fn main() -> Result<()> {
"breakpoints: {:#?}",
client
.set_breakpoints(
- "/tmp/godebug/main.go".to_owned(),
+ "/tmp/godebug/main.go".into(),
vec![SourceBreakpoint {
line: 8,
column: Some(2),
diff --git a/helix-dap/examples/dap-lldb.rs b/helix-dap/examples/dap-lldb.rs
index c9a99548..5823b8bf 100644
--- a/helix-dap/examples/dap-lldb.rs
+++ b/helix-dap/examples/dap-lldb.rs
@@ -56,7 +56,7 @@ pub async fn main() -> Result<()> {
"breakpoints: {:#?}",
client
.set_breakpoints(
- "/tmp/cdebug/main.c".to_owned(),
+ "/tmp/cdebug/main.c".into(),
vec![SourceBreakpoint {
line: 6,
column: Some(2),
diff --git a/helix-syntax/languages/tree-sitter-protobuf b/helix-syntax/languages/tree-sitter-protobuf
index 3eb3da67..19c211a0 160000
--- a/helix-syntax/languages/tree-sitter-protobuf
+++ b/helix-syntax/languages/tree-sitter-protobuf
@@ -1 +1 @@
-Subproject commit 3eb3da67280d8fc32d644c484d05a6ae7f7e4b8f
+Subproject commit 19c211a01434d9f03efff99f85e19f967591b175
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 42b9bcde..011dafee 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -245,9 +245,8 @@ impl Application {
}
}
- pub async fn handle_debugger_message(&mut self, call: ()) {
-
- //
+ pub async fn handle_debugger_message(&mut self, _call: ()) {
+ // TODO
}
pub async fn handle_language_server_message(
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 012e0c7d..74b272c6 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1908,7 +1908,7 @@ mod cmd {
) -> anyhow::Result<()> {
use helix_dap::Client;
use helix_lsp::block_on;
- let (_, doc) = current!(cx.editor);
+ let (_, _doc) = current!(cx.editor);
// look up config for filetype
// if multiple available, open picker
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 074f322e..20f6fdc7 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -465,7 +465,7 @@ impl EditorView {
let selected = cursors.contains(&line);
- if let Some(breakpoint) = breakpoints.and_then(|breakpoints| {
+ if let Some(_breakpoint) = breakpoints.and_then(|breakpoints| {
breakpoints
.iter()
.find(|breakpoint| breakpoint.line == line)