Fix rust-lang#1231

jens1o · Jan 11, 2019 · 2ac4ce5 · 2ac4ce5
1 parent ea7a0c3
commit 2ac4ce5
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 214 deletions.
diff --git a/src/actions/mod.rs b/src/actions/mod.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Actions that the RLS can perform: responding to requests, watching files,
 //! etc.
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! The Rust Language Server.
 //!
 //! The RLS provides a server that runs in the background, providing IDEs,

diff --git a/src/lsp_data.rs b/src/lsp_data.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Types, helpers, and conversions to and from LSP and `racer` types.
 
 use std::error::Error;

diff --git a/src/main.rs b/src/main.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! The Rust Language Server.
 //!
 //! The RLS provides a server that runs in the background, providing IDEs,

diff --git a/tests/fixtures/common/src/main.rs b/tests/fixtures/common/src/main.rs
@@ -1,12 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
 struct Bar {
     x: u64,
 }

diff --git a/tests/fixtures/find_all_refs_no_cfg_test/src/main.rs b/tests/fixtures/find_all_refs_no_cfg_test/src/main.rs
@@ -1,12 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
 struct Bar {
     x: u64,
 }

diff --git a/tests/fixtures/workspace_symbol/src/main.rs b/tests/fixtures/workspace_symbol/src/main.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod x {
     pub fn nemo() {}
 }

diff --git a/tests/fixtures/workspace_symbol_duplicates/src/main.rs b/tests/fixtures/workspace_symbol_duplicates/src/main.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[path="shared.rs"]
 mod a;
 #[path="shared.rs"]

diff --git a/tests/fixtures/workspace_symbol_duplicates/src/shared.rs b/tests/fixtures/workspace_symbol_duplicates/src/shared.rs
@@ -1,12 +1,2 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[allow(unused)]
 struct Frobnicator;
diff --git a/tests/support/harness.rs b/tests/support/harness.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![allow(clippy::expect_fun_call)]
 
 use std::collections::HashMap;

diff --git a/tests/support/mod.rs b/tests/support/mod.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use serde_json::{self, json};
 
 use std::env;

diff --git a/tests/support/paths.rs b/tests/support/paths.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![allow(unknown_lints)]
 
 use std::cell::Cell;

diff --git a/tests/tests.rs b/tests/tests.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use serde_json::{self, json};
 
 use std::io::Write;
@@ -307,27 +297,27 @@ fn cmd_changing_workspace_lib_retains_bin_diagnostics() {
     rls.notify(
         "textDocument/didChange",
         Some(json!({
-                "contentChanges": [
-                    {
-                        "range": {
-                            "start": {
-                                "line": 1,
-                                "character": 38,
-                            },
-                            "end": {
-                                "line": 1,
-                                "character": 41,
-                            }
+            "contentChanges": [
+                {
+                    "range": {
+                        "start": {
+                            "line": 1,
+                            "character": 38,
                         },
-                        "rangeLength": 3,
-                        "text": "u64"
-                    }
-                ],
-                "textDocument": {
-                    "uri": format!("file://{}/library/src/lib.rs", root_path.display()),
-                    "version": 0
+                        "end": {
+                            "line": 1,
+                            "character": 41,
+                        }
+                    },
+                    "rangeLength": 3,
+                    "text": "u64"
                 }
-            })),
+            ],
+            "textDocument": {
+                "uri": format!("file://{}/library/src/lib.rs", root_path.display()),
+                "version": 0
+            }
+        })),
     )
     .unwrap();
 
@@ -362,27 +352,27 @@ fn cmd_changing_workspace_lib_retains_bin_diagnostics() {
     rls.notify(
         "textDocument/didChange",
         Some(json!({
-                "contentChanges": [
-                    {
-                        "range": {
-                            "start": {
-                                "line": 1,
-                                "character": 38,
-                            },
-                            "end": {
-                                "line": 1,
-                                "character": 41,
-                            }
+            "contentChanges": [
+                {
+                    "range": {
+                        "start": {
+                            "line": 1,
+                            "character": 38,
                         },
-                        "rangeLength": 3,
-                        "text": "u32"
-                    }
-                ],
-                "textDocument": {
-                    "uri": format!("file://{}/library/src/lib.rs", root_path.display()),
-                    "version": 1
+                        "end": {
+                            "line": 1,
+                            "character": 41,
+                        }
+                    },
+                    "rangeLength": 3,
+                    "text": "u32"
                 }
-            })),
+            ],
+            "textDocument": {
+                "uri": format!("file://{}/library/src/lib.rs", root_path.display()),
+                "version": 1
+            }
+        })),
     )
     .unwrap();
 
@@ -478,27 +468,27 @@ fn cmd_implicit_workspace_pick_up_lib_changes() {
     rls.notify(
         "textDocument/didChange",
         Some(json!({
-                "contentChanges": [
-                    {
-                        "range": {
-                            "start": {
-                                "line": 1,
-                                "character": 23,
-                            },
-                            "end": {
-                                "line": 1,
-                                "character": 26,
-                            }
+            "contentChanges": [
+                {
+                    "range": {
+                        "start": {
+                            "line": 1,
+                            "character": 23,
                         },
-                        "rangeLength": 3,
-                        "text": "bar"
-                    }
-                ],
-                "textDocument": {
-                    "uri": format!("file://{}/inner/src/lib.rs", root_path.display()),
-                    "version": 0
+                        "end": {
+                            "line": 1,
+                            "character": 26,
+                        }
+                    },
+                    "rangeLength": 3,
+                    "text": "bar"
                 }
-            })),
+            ],
+            "textDocument": {
+                "uri": format!("file://{}/inner/src/lib.rs", root_path.display()),
+                "version": 0
+            }
+        })),
     )
     .unwrap();
 
@@ -520,27 +510,27 @@ fn cmd_implicit_workspace_pick_up_lib_changes() {
     rls.notify(
         "textDocument/didChange",
         Some(json!({
-                "contentChanges": [
-                    {
-                        "range": {
-                            "start": {
-                                "line": 1,
-                                "character": 23,
-                            },
-                            "end": {
-                                "line": 1,
-                                "character": 26,
-                            }
+            "contentChanges": [
+                {
+                    "range": {
+                        "start": {
+                            "line": 1,
+                            "character": 23,
                         },
-                        "rangeLength": 3,
-                        "text": "foo"
-                    }
-                ],
-                "textDocument": {
-                    "uri": format!("file://{}/inner/src/lib.rs", root_path.display()),
-                    "version": 1
+                        "end": {
+                            "line": 1,
+                            "character": 26,
+                        }
+                    },
+                    "rangeLength": 3,
+                    "text": "foo"
                 }
-            })),
+            ],
+            "textDocument": {
+                "uri": format!("file://{}/inner/src/lib.rs", root_path.display()),
+                "version": 1
+            }
+        })),
     )
     .unwrap();
 

diff --git a/tests/tests_old.rs b/tests/tests_old.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![allow(clippy::cyclomatic_complexity)]
 
 use rls::actions::{notifications, requests};