3 files changed, 20 insertions, 1 deletions

diff --git a/crates/ra_cargo_watch/src/conv/test.rs b/crates/ra_cargo_watch/src/conv/test.rs
index f77ef1b4d..6b86525b8 100644
--- a/crates/ra_cargo_watch/src/conv/test.rs
+++ b/crates/ra_cargo_watch/src/conv/test.rs
@@ -1,7 +1,9 @@
 //! This module contains the large and verbose snapshot tests for the
 //! conversions between `cargo check` json and LSP diagnostics.
+#[cfg(not(windows))]
 use crate::*;
 
+#[cfg(not(windows))]
 fn parse_diagnostic(val: &str) -> cargo_metadata::diagnostic::Diagnostic {
     serde_json::from_str::<cargo_metadata::diagnostic::Diagnostic>(val).unwrap()
 }
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index af3db2e1d..2c2ecee9c 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -331,7 +331,7 @@ pub(super) fn substs_from_path_segment(
     if let Some(generic_args) = &segment.args_and_bindings {
         // if args are provided, it should be all of them, but we can't rely on that
         let self_param_correction = if add_self_param { 1 } else { 0 };
-        let child_len = child_len + self_param_correction;
+        let child_len = child_len - self_param_correction;
         for arg in generic_args.args.iter().take(child_len) {
             match arg {
                 GenericArg::Type(type_ref) => {
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs
index 8b3aa8564..13c5f62e4 100644
--- a/crates/ra_hir_ty/src/tests/regression.rs
+++ b/crates/ra_hir_ty/src/tests/regression.rs
@@ -365,3 +365,20 @@ fn issue_2669() {
     "###
     )
 }
+
+#[test]
+fn issue_2705() {
+    assert_snapshot!(
+        infer(r#"
+trait Trait {}
+fn test() {
+    <Trait<u32>>::foo()
+}
+"#),
+        @r###"
+    [26; 53) '{     ...oo() }': ()
+    [32; 49) '<Trait...>::foo': {unknown}
+    [32; 51) '<Trait...:foo()': ()
+    "###
+    );
+}