chore: resolve merge conflicts

Author: calebcartwright

.travis.yml

@@ -47,9 +47,7 @@ matrix:
 script:
   - |
     if [ -z ${INTEGRATION} ]; then
-      cargo build
-      cargo test
-      cargo test -- --ignored
+      cargo build && cargo test && cargo test -- --ignored
     else
       ./ci/integration.sh
     fi

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "1.4.9"
+version = "1.4.10"
 authors = ["Nicholas Cameron <[email protected]>", "The Rustfmt developers"]
 description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang/rustfmt"
@@ -56,6 +56,8 @@ ignore = "0.4.6"
 annotate-snippets = { version = "0.6", features = ["ansi_term"] }
 structopt = "0.3"
 rustfmt-config_proc_macro = { version = "0.2", path = "config_proc_macro" }
+lazy_static = "1.0.0"
+ansi_term = "0.12"
 
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
@@ -74,5 +76,3 @@ version = "610.0.0"
 package = "rustc-ap-syntax_pos"
 version = "610.0.0"
 
-[dev-dependencies]
-lazy_static = "1.0.0"

Cargo.toml

@@ -1968,7 +1968,7 @@ specific version of rustfmt is used in your CI, use this option.
 - **Possible values**: any published version (e.g. `"0.3.8"`)
 - **Stable**: No (tracking issue: #3386)
 
-## `skip_children`
+## `skip_children` (DEPRECATED #3587)
 
 Don't reformat out of line modules
 

Configurations.md

@@ -15,7 +15,7 @@ set -ex
 # it again.
 #
 #which cargo-fmt || cargo install --force
-cargo install --path . --force 
+cargo install --path . --force --locked
 
 echo "Integration tests for: ${INTEGRATION}"
 cargo fmt -- --version

ci/integration.sh

@@ -11,6 +11,8 @@ use std::io::{self, stdout, Read, Write};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
+use ansi_term::Colour::Red;
+
 use getopts::{Matches, Options};
 
 use crate::rustfmt::{
@@ -73,6 +75,14 @@ pub enum OperationError {
     /// An io error during reading or writing.
     #[fail(display = "io error: {}", _0)]
     IoError(IoError),
+    /// Attempt to use --check with stdin, which isn't currently
+    /// supported.
+    #[fail(display = "The `--check` option is not supported with standard input.")]
+    CheckWithStdin,
+    /// Attempt to use --emit=json with stdin, which isn't currently
+    /// supported.
+    #[fail(display = "Using `--emit` other than stdout is not supported with standard input.")]
+    EmitWithStdin,
 }
 
 impl From<IoError> for OperationError {
@@ -242,6 +252,14 @@ fn format_string(input: String, options: GetOptsOptions) -> Result<i32, FailureE
     // try to read config from local directory
     let (mut config, _) = load_config(Some(Path::new(".")), Some(options.clone()))?;
 
+    if options.check {
+        return Err(OperationError::CheckWithStdin.into());
+    }
+    if let Some(emit_mode) = options.emit_mode {
+        if emit_mode != EmitMode::Stdout {
+            return Err(OperationError::EmitWithStdin.into());
+        }
+    }
     // emit mode is always Stdout for Stdin.
     config.set().emit_mode(EmitMode::Stdout);
     config.set().verbose(Verbosity::Quiet);
@@ -486,7 +504,7 @@ struct GetOptsOptions {
     verbose: bool,
     config_path: Option<PathBuf>,
     inline_config: HashMap<String, String>,
-    emit_mode: EmitMode,
+    emit_mode: Option<EmitMode>,
     backup: bool,
     check: bool,
     edition: Option<Edition>,
@@ -497,6 +515,12 @@ struct GetOptsOptions {
     print_misformatted_file_names: bool,
 }
 
+fn deprecate_skip_children() {
+    let msg = "Option --skip-children is deprecated since it is now the default to not format \
+               submodules of given files (#3587)";
+    eprintln!("{}: {}", Red.bold().paint("Deprecation"), msg);
+}
+
 impl GetOptsOptions {
     pub fn from_matches(matches: &Matches) -> Result<GetOptsOptions, FailureError> {
         let mut options = GetOptsOptions::default();
@@ -513,6 +537,7 @@ impl GetOptsOptions {
 
             if options.unstable_features {
                 if matches.opt_present("skip-children") {
+                    deprecate_skip_children();
                     options.skip_children = Some(true);
                 }
                 if matches.opt_present("error-on-unformatted") {
@@ -524,6 +549,7 @@ impl GetOptsOptions {
             } else {
                 let mut unstable_options = vec![];
                 if matches.opt_present("skip-children") {
+                    deprecate_skip_children();
                     unstable_options.push("`--skip-children`");
                 }
                 if matches.opt_present("error-on-unformatted") {
@@ -574,7 +600,7 @@ impl GetOptsOptions {
                 return Err(format_err!("Invalid to use `--emit` and `--check`"));
             }
 
-            options.emit_mode = emit_mode_from_emit_str(emit_str)?;
+            options.emit_mode = Some(emit_mode_from_emit_str(emit_str)?);
         }
 
         if let Some(ref edition_str) = matches.opt_str("edition") {
@@ -590,11 +616,13 @@ impl GetOptsOptions {
         }
 
         if !rust_nightly {
-            if !STABLE_EMIT_MODES.contains(&options.emit_mode) {
-                return Err(format_err!(
-                    "Invalid value for `--emit` - using an unstable \
-                     value without `--unstable-features`",
-                ));
+            if let Some(ref emit_mode) = options.emit_mode {
+                if !STABLE_EMIT_MODES.contains(emit_mode) {
+                    return Err(format_err!(
+                        "Invalid value for `--emit` - using an unstable \
+                         value without `--unstable-features`",
+                    ));
+                }
             }
         }
 
@@ -643,8 +671,8 @@ impl CliOptions for GetOptsOptions {
         }
         if self.check {
             config.set().emit_mode(EmitMode::Diff);
-        } else {
-            config.set().emit_mode(self.emit_mode);
+        } else if let Some(emit_mode) = self.emit_mode {
+            config.set().emit_mode(emit_mode);
         }
         if self.backup {
             config.set().make_backup(true);