Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 782b796

Browse files
authored
Merge pull request #1653 from Xanewok/remove-unused-crates
Remove unused sysroot rust crates
2 parents 4a587b5 + 3d82037 commit 782b796

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

rls-rustc/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#![feature(rustc_private)]
22

33
extern crate env_logger;
4-
extern crate rustc_session;
54
extern crate rustc_driver;
65
extern crate rustc_interface;
76
extern crate rustc_save_analysis;
7+
extern crate rustc_session;
88
extern crate rustc_span;
99

10-
use rustc_session::config::ErrorOutputType;
11-
use rustc_session::early_error;
1210
#[cfg(feature = "ipc")]
1311
use rustc_driver::Compilation;
1412
use rustc_driver::{run_compiler, Callbacks};
1513
use rustc_interface::interface;
1614
#[cfg(feature = "ipc")]
1715
use rustc_interface::Queries;
16+
use rustc_session::config::ErrorOutputType;
17+
use rustc_session::early_error;
1818

1919
use std::env;
2020
#[allow(unused_imports)]

rls/src/build/rustc.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
// FIXME: switch to something more ergonomic here, once available.
22
// (Currently, there is no way to opt into sysroot crates without `extern crate`.)
33
#[allow(unused_extern_crates)]
4-
extern crate getopts;
5-
#[allow(unused_extern_crates)]
6-
extern crate rustc_session;
7-
#[allow(unused_extern_crates)]
8-
extern crate rustc_codegen_utils;
9-
#[allow(unused_extern_crates)]
104
extern crate rustc_driver;
115
#[allow(unused_extern_crates)]
12-
extern crate rustc_errors;
13-
#[allow(unused_extern_crates)]
146
extern crate rustc_interface;
157
#[allow(unused_extern_crates)]
16-
extern crate rustc_metadata;
17-
#[allow(unused_extern_crates)]
18-
extern crate rustc_resolve;
19-
#[allow(unused_extern_crates)]
208
extern crate rustc_save_analysis;
219
#[allow(unused_extern_crates)]
10+
extern crate rustc_session;
11+
#[allow(unused_extern_crates)]
2212
extern crate rustc_span;
2313

2414
use std::collections::{BTreeMap, HashMap, HashSet};
@@ -34,13 +24,13 @@ use log::trace;
3424
use rls_data::Analysis;
3525
use rls_vfs::Vfs;
3626

37-
use self::rustc_session::config::Input;
38-
use self::rustc_session::Session;
3927
use self::rustc_driver::{run_compiler, Compilation};
4028
use self::rustc_interface::interface;
4129
use self::rustc_interface::Queries;
4230
use self::rustc_save_analysis as save;
4331
use self::rustc_save_analysis::CallbackHandler;
32+
use self::rustc_session::config::Input;
33+
use self::rustc_session::Session;
4434
use self::rustc_span::edition::Edition as RustcEdition;
4535
use self::rustc_span::source_map::{FileLoader, RealFileLoader};
4636
use crate::build::environment::{Environment, EnvironmentLockFacade};

0 commit comments

Comments
 (0)