Auto merge of #5990 - dwijnand:no-crates.io-index-url, r=alexcrichton

Don't print crates.io-index URL when Updating

Following the lead from PackageId's Display, only display the registry's
URL if it's not the default registry (aka crates.io).

Before:

    $ cargo install lazy_static
        Updating registry `https://github.com/rust-lang/crates.io-index`

After:

    $ dcargo install lazy_static
        Updating crates.io index

Fixes #4208

Author: bors

src/cargo/core/source/source_id.rs

@@ -210,7 +210,11 @@ impl SourceId {
     }
 
     pub fn display_registry(&self) -> String {
-        format!("registry `{}`", self.url())
+        if self.is_default_registry() {
+            "crates.io index".to_string()
+        } else {
+            format!("`{}` index", self.url())
+        }
     }
 
     /// Is this source from a filesystem path

src/doc/src/guide/dependencies.md

@@ -46,7 +46,7 @@ their dependencies, compile them all, and update the `Cargo.lock`:
 
 ```console
 $ cargo build
-      Updating registry `https://github.com/rust-lang/crates.io-index`
+      Updating crates.io index
    Downloading memchr v0.1.5
    Downloading libc v0.1.10
    Downloading regex-syntax v0.2.1

tests/testsuite/alt_registry.rs

@@ -56,7 +56,7 @@ fn depend_on_alt_registry() {
         .masquerade_as_nightly_cargo()
         .with_stderr(&format!(
             "\
-[UPDATING] registry `{reg}`
+[UPDATING] `{reg}` index
 [DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
 [COMPILING] bar v0.0.1 (registry `file://[..]`)
 [COMPILING] foo v0.0.1 (CWD)
@@ -109,7 +109,7 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() {
         .masquerade_as_nightly_cargo()
         .with_stderr(&format!(
             "\
-[UPDATING] registry `{reg}`
+[UPDATING] `{reg}` index
 [DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
 [DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
 [COMPILING] baz v0.0.1 (registry `file://[..]`)
@@ -151,7 +151,7 @@ fn depend_on_alt_registry_depends_on_same_registry() {
         .masquerade_as_nightly_cargo()
         .with_stderr(&format!(
             "\
-[UPDATING] registry `{reg}`
+[UPDATING] `{reg}` index
 [DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
 [DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
 [COMPILING] baz v0.0.1 (registry `file://[..]`)
@@ -193,8 +193,8 @@ fn depend_on_alt_registry_depends_on_crates_io() {
         .masquerade_as_nightly_cargo()
         .with_stderr(&format!(
             "\
-[UPDATING] registry `{alt_reg}`
-[UPDATING] registry `{reg}`
+[UPDATING] `{alt_reg}` index
+[UPDATING] `{reg}` index
 [DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
 [DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
 [COMPILING] baz v0.0.1 (registry `file://[..]`)
@@ -358,9 +358,9 @@ fn alt_registry_and_crates_io_deps() {
     p.cargo("build")
         .masquerade_as_nightly_cargo()
         .with_stderr_contains(format!(
-            "[UPDATING] registry `{}`",
+            "[UPDATING] `{}` index",
             registry::alt_registry()
-        )).with_stderr_contains(&format!("[UPDATING] registry `{}`", registry::registry()))
+        )).with_stderr_contains(&format!("[UPDATING] `{}` index", registry::registry()))
         .with_stderr_contains("[DOWNLOADING] crates_io_dep v0.0.1 (registry `file://[..]`)")
         .with_stderr_contains("[DOWNLOADING] alt_reg_dep v0.1.0 (registry `file://[..]`)")
         .with_stderr_contains("[COMPILING] alt_reg_dep v0.1.0 (registry `file://[..]`)")

tests/testsuite/build.rs

@@ -3551,7 +3551,7 @@ fn build_all_member_dependency_same_name() {
 
     p.cargo("build --all")
         .with_stderr(
-            "[..] Updating registry `[..]`\n\
+            "[..] Updating `[..]` index\n\
              [..] Downloading a v0.1.0 ([..])\n\
              [..] Compiling a v0.1.0\n\
              [..] Compiling a v0.1.0 ([..])\n\

tests/testsuite/build_script.rs

@@ -2706,7 +2706,7 @@ fn warnings_hidden_for_upstream() {
     p.cargo("build -v")
         .with_stderr(
             "\
-[UPDATING] registry `[..]`
+[UPDATING] `[..]` index
 [DOWNLOADING] bar v0.1.0 ([..])
 [COMPILING] bar v0.1.0
 [RUNNING] `rustc [..]`
@@ -2760,7 +2760,7 @@ fn warnings_printed_on_vv() {
     p.cargo("build -vv")
         .with_stderr(
             "\
-[UPDATING] registry `[..]`
+[UPDATING] `[..]` index
 [DOWNLOADING] bar v0.1.0 ([..])
 [COMPILING] bar v0.1.0
 [RUNNING] `rustc [..]`

tests/testsuite/cfg.rs

@@ -222,7 +222,7 @@ fn works_through_the_registry() {
     p.cargo("build")
         .with_stderr(
             "\
-[UPDATING] registry [..]
+[UPDATING] [..] index
 [DOWNLOADING] [..]
 [DOWNLOADING] [..]
 [COMPILING] baz v0.1.0
@@ -266,7 +266,7 @@ fn ignore_version_from_other_platform() {
     p.cargo("build")
         .with_stderr(
             "\
-[UPDATING] registry [..]
+[UPDATING] [..] index
 [DOWNLOADING] [..]
 [COMPILING] bar v0.1.0
 [COMPILING] foo v0.0.1 ([..])

tests/testsuite/cross_publish.rs

@@ -104,7 +104,7 @@ fn publish_with_target() {
         .arg("--target")
         .arg(&target)
         .with_stderr(&format!(
-            "    Updating registry `{registry}`
+            "    Updating `{registry}` index
    Packaging foo v0.0.0 (CWD)
    Verifying foo v0.0.0 (CWD)
    Compiling foo v0.0.0 (CWD/target/package/foo-0.0.0)

tests/testsuite/directory.rs

@@ -330,7 +330,7 @@ fn crates_io_then_directory() {
     p.cargo("build")
         .with_stderr(
             "\
-[UPDATING] registry `[..]`
+[UPDATING] `[..]` index
 [DOWNLOADING] bar v0.1.0 ([..])
 [COMPILING] bar v0.1.0
 [COMPILING] foo v0.1.0 (CWD)

tests/testsuite/doc.rs

@@ -967,7 +967,7 @@ fn doc_all_member_dependency_same_name() {
     Package::new("bar", "0.1.0").publish();
 
     p.cargo("doc --all")
-        .with_stderr_contains("[..] Updating registry `[..]`")
+        .with_stderr_contains("[..] Updating `[..]` index")
         .with_stderr_contains("[..] Documenting bar v0.1.0 ([..])")
         .run();
 }

tests/testsuite/generate_lockfile.rs

@@ -82,7 +82,7 @@ fn no_index_update() {
         .build();
 
     p.cargo("generate-lockfile")
-        .with_stderr("[UPDATING] registry `[..]`")
+        .with_stderr("[UPDATING] `[..]` index")
         .run();
 
     p.cargo("generate-lockfile -Zno-index-update")