7 files changed, 42 insertions, 53 deletions

diff --git a/Cargo.lock b/Cargo.lock
index b73fb909c..1101770e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,9 +26,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
+checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
 
 [[package]]
 name = "anymap"
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.65"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
 [[package]]
 name = "cfg"
@@ -232,15 +232,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
 name = "cmake"
 version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -388,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "expect-test"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceb96f3eaa0d4e8769c52dacfd4eb60183b817ed2f176171b3c691d5022b0f2e"
+checksum = "eab78d4c727fa879de40951ffc01ed781a231b28786b19d6bfbdc0d1ec92eb3e"
 dependencies = [
  "difference",
  "once_cell",
@@ -796,9 +787,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "libloading"
@@ -1088,12 +1079,11 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
+checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0"
 dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
+ "cfg-if 1.0.0",
  "instant",
  "libc",
  "redox_syscall",
@@ -1536,18 +1526,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1594,9 +1584,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85"
+checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
 
 [[package]]
 name = "smol_str"
@@ -1627,9 +1617,9 @@ version = "0.0.0"
 
 [[package]]
 name = "syn"
-version = "1.0.53"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8833e20724c24de12bbaba5ad230ea61c3eafb05b881c7c9d3cfe8638b187e68"
+checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/ide/src/folding_ranges.rs b/crates/ide/src/folding_ranges.rs
index 7523aec55..45170dd29 100644
--- a/crates/ide/src/folding_ranges.rs
+++ b/crates/ide/src/folding_ranges.rs
@@ -83,7 +83,6 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
 fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
     match kind {
         COMMENT => Some(FoldKind::Comment),
-        USE => Some(FoldKind::Imports),
         ARG_LIST | PARAM_LIST => Some(FoldKind::ArgList),
         ASSOC_ITEM_LIST
         | RECORD_FIELD_LIST
@@ -258,11 +257,11 @@ fn main() <fold block>{
     fn test_fold_imports() {
         check(
             r#"
-<fold imports>use std::<fold block>{
+use std::<fold block>{
     str,
     vec,
     io as iop
-}</fold>;</fold>
+}</fold>;
 
 fn main() <fold block>{
 }</fold>"#,
@@ -306,9 +305,9 @@ use std::io as iop;</fold>
 <fold imports>use std::mem;
 use std::f64;</fold>
 
-use std::collections::HashMap;
+<fold imports>use std::collections::HashMap;
 // Some random comment
-use std::collections::VecDeque;
+use std::collections::VecDeque;</fold>
 
 fn main() <fold block>{
 }</fold>"#,
@@ -326,10 +325,10 @@ use std::io as iop;</fold>
 <fold imports>use std::mem;
 use std::f64;</fold>
 
-<fold imports>use std::collections::<fold block>{
+use std::collections::<fold block>{
     HashMap,
     VecDeque,
-}</fold>;</fold>
+}</fold>;
 // Some random comment
 
 fn main() <fold block>{
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index b70b840b8..aa3a4b606 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -477,3 +477,4 @@ impl ast::DocCommentsOwner for ast::Const {}
 impl ast::DocCommentsOwner for ast::TypeAlias {}
 impl ast::DocCommentsOwner for ast::Impl {}
 impl ast::DocCommentsOwner for ast::MacroCall {}
+impl ast::DocCommentsOwner for ast::Use {}
diff --git a/crates/syntax/src/parsing/text_tree_sink.rs b/crates/syntax/src/parsing/text_tree_sink.rs
index 997bc5d28..49842177a 100644
--- a/crates/syntax/src/parsing/text_tree_sink.rs
+++ b/crates/syntax/src/parsing/text_tree_sink.rs
@@ -148,7 +148,7 @@ fn n_attached_trivias<'a>(
 ) -> usize {
     match kind {
         MACRO_CALL | CONST | TYPE_ALIAS | STRUCT | ENUM | VARIANT | FN | TRAIT | MODULE
-        | RECORD_FIELD | STATIC => {
+        | RECORD_FIELD | STATIC | USE => {
             let mut res = 0;
             let mut trivias = trivias.enumerate().peekable();
 
diff --git a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index 1e80dd7e2..b1fb75ed1 100644
--- a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -49,9 +49,9 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  COMMENT@59..97 "// Rust 2018 (with a  ..."
-  WHITESPACE@97..98 "\n"
-  USE@98..121
+  USE@59..121
+    COMMENT@59..97 "// Rust 2018 (with a  ..."
+    WHITESPACE@97..98 "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -75,9 +75,9 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  COMMENT@122..134 "// Rust 2015"
-  WHITESPACE@134..135 "\n"
-  USE@135..166
+  US[email protected]66
+    COMMENT@122..134 "// Rust 2015"
+    WHITESPACE@134..135 "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -102,9 +102,9 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  COMMENT@167..179 "// Rust 2015"
-  WHITESPACE@179..180 "\n"
-  USE@180..205
+  US[email protected]
+    COMMENT@167..179 "// Rust 2015"
+    WHITESPACE@179..180 "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast
index 82028096f..c9fad5f8c 100644
--- a/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast
@@ -10,9 +10,9 @@ [email protected]
             [email protected] "crate_name"
     [email protected] ";"
   [email protected] " "
-  COMMENT@18..45 "// Rust 2018 - All fl ..."
-  WHITESPACE@45..46 "\n"
-  USE@46..61
+  USE@18..61
+    COMMENT@18..45 "// Rust 2018 - All fl ..."
+    WHITESPACE@45..46 "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -22,9 +22,9 @@ [email protected]
             [email protected] "crate_name"
     [email protected] ";"
   [email protected] " "
-  COMMENT@62..91 "// Rust 2018 - Anchor ..."
-  WHITESPACE@91..92 "\n"
-  USE@92..124
+  US[email protected]4
+    COMMENT@62..91 "// Rust 2018 - Anchor ..."
+    WHITESPACE@91..92 "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index 4c58aed59..6bfa922e6 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -161,7 +161,6 @@ Apache-2.0 OR BSL-1.0
 Apache-2.0 OR MIT
 Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
 Apache-2.0/MIT
-BSD-2-Clause
 BSD-3-Clause
 CC0-1.0
 ISC