Merge pull request #763 from BORN2LOSE/field_names

Changing field names

Author: nrc

src/build/mod.rs

@@ -399,11 +399,8 @@ impl BuildQueue {
  .spawn(move || {
  // window/progress notification that we are about to build
  notifier.notify_begin_progress();
- loop {
- match progress_receiver.recv() {
- Ok(progress) => notifier.notify_progress(progress),
- Err(_) => break, // error means the sender was Dropped at build end
- }
+ while let Ok(progress) = progress_receiver.recv() {
+ notifier.notify_progress(progress);
  }
  notifier.notify_end_progress();
  })

src/build/rustc.rs

@@ -135,7 +135,7 @@ impl RlsRustcCalls {
  fn new(analysis: Arc<Mutex<Option<Analysis>>>) -> RlsRustcCalls {
  RlsRustcCalls {
  default_calls: RustcDefaultCalls,
- analysis: analysis,
+ analysis,
  }
  }
 }
@@ -279,7 +279,7 @@ struct ReplacedFileLoader {
 impl ReplacedFileLoader {
  fn new(replacements: HashMap<PathBuf, String>) -> ReplacedFileLoader {
  ReplacedFileLoader {
- replacements: replacements,
+ replacements,
  real_file_loader: RealFileLoader,
  }
  }

src/lsp_data.rs

@@ -359,7 +359,7 @@ impl notification::Notification for Progress {
  * to indicate progress.
  */
 #[allow(non_upper_case_globals)]
-pub const NOTIFICATION__Progress: &'static str = "window/progress";
+pub const NOTIFICATION__Progress: &str = "window/progress";
 
 #[derive(Debug, PartialEq, Deserialize, Serialize, Clone)]
 pub struct ProgressParams {

src/server/io.rs

@@ -116,7 +116,7 @@ pub trait Output: Sync + Send + Clone + 'static {
  /// Notify the client of a failure with the given diagnostic message.
  fn failure_message<M: Into<String>>(&self, id: usize, code: jsonrpc::ErrorCode, msg: M) {
  let error = jsonrpc::Error {
- code: code,
+ code,
  message: msg.into(),
  data: None,
  };

src/server/mod.rs

@@ -131,7 +131,7 @@ impl<O: Output> LsService<O> {
 
  LsService {
  msg_reader: reader,
- output: output,
+ output,
  ctx: ActionContext::new(analysis, vfs, config),
  dispatcher,
  }