diff --git a/Cargo.lock b/Cargo.lock index 0a3d221f51..0c73b5398f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,12 +11,6 @@ dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -25,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -61,11 +55,35 @@ dependencies = [ "utf8parse", ] +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 3.0.4", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-lossy" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f45c79b3b9413932fc255f2c19ca0d48eaab72c4ea1913bafaebf289cbc099f2" +dependencies = [ + "anstyle", +] [[package]] name = "anstyle-parse" @@ -85,6 +103,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "anstyle-svg" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962f6d5681926dbe5503b71057202d6723a33abe464c983b1d160bca3095a3bb" +dependencies = [ + "anstream 0.6.15", + "anstyle", + "anstyle-lossy", + "html-escape", + "unicode-width", +] + [[package]] name = "anstyle-wincon" version = "1.0.2" @@ -105,11 +136,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "assert_cmd" @@ -188,7 +229,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -235,9 +276,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata", @@ -296,12 +337,12 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "snapbox", + "snapbox 0.6.17", "subprocess", "tame-index", "termcolor", - "toml", - "toml_edit", + "toml 0.7.6", + "toml_edit 0.19.14", "trycmd", "url", ] @@ -317,14 +358,18 @@ dependencies = [ [[package]] name = "cargo-test-macro" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c6cbe0807294ca78d811d1e4995ddb6516c6c763c7a03493c4ba02b9e09215" [[package]] name = "cargo-test-support" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a816b64664799fb248c06ca28b989ee22ef6d9f83c0495e28954a56d4e9a27ba" dependencies = [ + "anstream 0.6.15", + "anstyle", "anyhow", "cargo-test-macro", "cargo-util", @@ -333,29 +378,31 @@ dependencies = [ "flate2", "git2", "glob", - "itertools", - "lazy_static", + "itertools 0.13.0", "pasetors", + "regex", "serde", "serde_json", - "snapbox", + "snapbox 0.6.17", "tar", - "termcolor", "time", - "toml", + "toml 0.8.19", "url", - "windows-sys 0.48.0", + "walkdir", + "windows-sys 0.52.0", ] [[package]] name = "cargo-util" -version = "0.2.7" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" dependencies = [ "anyhow", "core-foundation", "filetime", "hex", + "ignore", "jobserver", "libc", "miow", @@ -365,7 +412,7 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -384,9 +431,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" dependencies = [ "jobserver", "libc", @@ -489,9 +536,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -499,9 +546,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -514,8 +561,9 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.39.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.40.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f4884a8a380811c8ef088e7caeb68caeb665ffdb91f7276069e3c7828f168a" dependencies = [ "curl", "percent-encoding", @@ -607,24 +655,24 @@ checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.9", - "winapi", + "socket2", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.65+curl-8.2.1" +version = "0.4.75+curl-8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" +checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" dependencies = [ "cc", "libc", @@ -632,7 +680,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -754,30 +802,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -797,25 +834,25 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.48.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -835,9 +872,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -924,11 +961,11 @@ checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "git2" -version = "0.17.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "libc", "libgit2-sys", "log", @@ -945,15 +982,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1063,6 +1100,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + [[package]] name = "http" version = "1.1.0" @@ -1171,7 +1217,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower", "tower-service", @@ -1180,9 +1226,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1190,17 +1236,16 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -1249,10 +1294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.9", - "rustix 0.38.9", + "rustix 0.38.37", "windows-sys 0.48.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -1262,6 +1313,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1270,9 +1330,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1286,12 +1346,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" version = "0.2.158" @@ -1300,9 +1354,9 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -1312,6 +1366,17 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.4.0", + "libc", + "redox_syscall", +] + [[package]] name = "libssh2-sys" version = "0.3.0" @@ -1328,9 +1393,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -1346,9 +1411,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" @@ -1358,9 +1423,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1377,15 +1442,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -1515,9 +1571,9 @@ dependencies = [ [[package]] name = "pasetors" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" +checksum = "6b36d47c66f2230dd1b7143d9afb2b4891879020210eddf2ccb624e529b96dba" dependencies = [ "ct-codecs", "ed25519-compact", @@ -1551,9 +1607,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -1627,7 +1683,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1660,9 +1716,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1679,7 +1735,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.7", + "socket2", "thiserror", "tokio", "tracing", @@ -1710,16 +1766,16 @@ checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", - "socket2 0.5.7", + "socket2", "tracing", "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1778,18 +1834,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -1799,9 +1855,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -1810,9 +1866,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -1914,15 +1970,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", ] [[package]] @@ -2070,18 +2126,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2090,20 +2146,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2122,9 +2179,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2206,22 +2263,38 @@ dependencies = [ ] [[package]] -name = "snapbox-macros" -version = "0.3.5" +name = "snapbox" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" +checksum = "840b73eb3148bc3cbc10ebe00ec9bc6d96033e658d022c4adcbf3f35596fd64a" dependencies = [ - "anstream 0.5.0", + "anstream 0.6.15", + "anstyle", + "anstyle-svg", + "content_inspector", + "dunce", + "filetime", + "libc", + "normalize-line-endings", + "os_pipe", + "regex", + "serde", + "serde_json", + "similar", + "snapbox-macros", + "tempfile", + "wait-timeout", + "walkdir", + "windows-sys 0.59.0", ] [[package]] -name = "socket2" -version = "0.4.9" +name = "snapbox-macros" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "16569f53ca23a41bb6f62e0a5084aa1661f4814a67fa33696a79073e03a664af" dependencies = [ - "libc", - "winapi", + "anstream 0.6.15", ] [[package]] @@ -2280,9 +2353,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.32" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -2336,15 +2409,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", - "rustix 0.38.9", - "windows-sys 0.48.0", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -2374,34 +2447,24 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "time" version = "0.3.36" @@ -2459,7 +2522,7 @@ dependencies = [ "libc", "mio", "pin-project-lite", - "socket2 0.5.7", + "socket2", "windows-sys 0.52.0", ] @@ -2496,7 +2559,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", ] [[package]] @@ -2510,9 +2585,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -2527,7 +2602,20 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.15", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", ] [[package]] @@ -2559,32 +2647,19 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -2607,8 +2682,8 @@ dependencies = [ "rayon", "serde", "shlex", - "snapbox", - "toml_edit", + "snapbox 0.4.12", + "toml_edit 0.19.14", ] [[package]] @@ -2648,6 +2723,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + [[package]] name = "untrusted" version = "0.9.0" @@ -2656,15 +2737,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" version = "0.2.1" @@ -2694,9 +2781,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3020,6 +3107,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/Cargo.toml b/Cargo.toml index 7676b23371..75b53f9900 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,9 +92,9 @@ predicates = { version = "3.0.3", features = ["color"] } assert_cmd = { version = "2.0.12", features = ["color-auto"] } assert_fs = { version = "1.0.13", features = ["color-auto"] } trycmd = "0.14.17" -snapbox = { version = "0.4.12", features = ["cmd", "path"] } -cargo-test-macro.git = "https://github.com/rust-lang/cargo" -cargo-test-support.git = "https://github.com/rust-lang/cargo" +snapbox = { version = "0.6.9", features = ["cmd", "path"] } +cargo-test-macro = "0.3" +cargo-test-support = "0.3" url = "2.4.0" [features] diff --git a/tests/cargo-set-version/downgrade_error/mod.rs b/tests/cargo-set-version/downgrade_error/mod.rs index bf1de96ac0..a71fc90b78 100644 --- a/tests/cargo-set-version/downgrade_error/mod.rs +++ b/tests/cargo-set-version/downgrade_error/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/downgrade_error/stderr.log b/tests/cargo-set-version/downgrade_error/stderr.log deleted file mode 100644 index 1d96187d24..0000000000 --- a/tests/cargo-set-version/downgrade_error/stderr.log +++ /dev/null @@ -1 +0,0 @@ -Error: Cannot downgrade from 0.1.0 to 0.0.1 diff --git a/tests/cargo-set-version/downgrade_error/stderr.term.svg b/tests/cargo-set-version/downgrade_error/stderr.term.svg new file mode 100644 index 0000000000..3921c01580 --- /dev/null +++ b/tests/cargo-set-version/downgrade_error/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Error: Cannot downgrade from 0.1.0 to 0.0.1 + + + + + + diff --git a/tests/cargo-set-version/downgrade_error/stdout.log b/tests/cargo-set-version/downgrade_error/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/downgrade_error/stdout.term.svg b/tests/cargo-set-version/downgrade_error/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/downgrade_error/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/dry_run/mod.rs b/tests/cargo-set-version/dry_run/mod.rs index ed4fe2de26..dd024bac26 100644 --- a/tests/cargo-set-version/dry_run/mod.rs +++ b/tests/cargo-set-version/dry_run/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/dry_run/stderr.log b/tests/cargo-set-version/dry_run/stderr.log deleted file mode 100644 index 6126757f06..0000000000 --- a/tests/cargo-set-version/dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Upgrading sample from 0.1.0 to 2.0.0 -warning: aborting set-version due to dry run diff --git a/tests/cargo-set-version/dry_run/stderr.term.svg b/tests/cargo-set-version/dry_run/stderr.term.svg new file mode 100644 index 0000000000..cf7121a2d1 --- /dev/null +++ b/tests/cargo-set-version/dry_run/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Upgrading sample from 0.1.0 to 2.0.0 + + warning: aborting set-version due to dry run + + + + + + diff --git a/tests/cargo-set-version/dry_run/stdout.log b/tests/cargo-set-version/dry_run/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/dry_run/stdout.term.svg b/tests/cargo-set-version/dry_run/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/dry_run/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/ignore_dependent/mod.rs b/tests/cargo-set-version/ignore_dependent/mod.rs index 3453d990b6..e2797416d2 100644 --- a/tests/cargo-set-version/ignore_dependent/mod.rs +++ b/tests/cargo-set-version/ignore_dependent/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/ignore_dependent/stderr.log b/tests/cargo-set-version/ignore_dependent/stderr.log deleted file mode 100644 index a75c93de09..0000000000 --- a/tests/cargo-set-version/ignore_dependent/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 diff --git a/tests/cargo-set-version/ignore_dependent/stderr.term.svg b/tests/cargo-set-version/ignore_dependent/stderr.term.svg new file mode 100644 index 0000000000..02e89599cd --- /dev/null +++ b/tests/cargo-set-version/ignore_dependent/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/ignore_dependent/stdout.log b/tests/cargo-set-version/ignore_dependent/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/ignore_dependent/stdout.term.svg b/tests/cargo-set-version/ignore_dependent/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/ignore_dependent/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/relative_absolute_conflict/mod.rs b/tests/cargo-set-version/relative_absolute_conflict/mod.rs index 845ff3c331..0b578c2d2e 100644 --- a/tests/cargo-set-version/relative_absolute_conflict/mod.rs +++ b/tests/cargo-set-version/relative_absolute_conflict/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .code(2) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/relative_absolute_conflict/stderr.log b/tests/cargo-set-version/relative_absolute_conflict/stderr.log deleted file mode 100644 index 27e73f33bd..0000000000 --- a/tests/cargo-set-version/relative_absolute_conflict/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ -error: the argument '[TARGET]' cannot be used with '--bump ' - -Usage: cargo set-version - -For more information, try '--help'. diff --git a/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg b/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg new file mode 100644 index 0000000000..adb7c57885 --- /dev/null +++ b/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: the argument '[TARGET]' cannot be used with '--bump <BUMP>' + + + + Usage: cargo set-version <TARGET> + + + + For more information, try '--help'. + + + + + + diff --git a/tests/cargo-set-version/relative_absolute_conflict/stdout.log b/tests/cargo-set-version/relative_absolute_conflict/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg b/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_absolute_version/mod.rs b/tests/cargo-set-version/set_absolute_version/mod.rs index 0f673a9f80..6e64c25cc9 100644 --- a/tests/cargo-set-version/set_absolute_version/mod.rs +++ b/tests/cargo-set-version/set_absolute_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_absolute_version/stderr.log b/tests/cargo-set-version/set_absolute_version/stderr.log deleted file mode 100644 index 4c22dbb990..0000000000 --- a/tests/cargo-set-version/set_absolute_version/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Upgrading sample from 0.1.0 to 2.0.0 diff --git a/tests/cargo-set-version/set_absolute_version/stderr.term.svg b/tests/cargo-set-version/set_absolute_version/stderr.term.svg new file mode 100644 index 0000000000..d0fac02e90 --- /dev/null +++ b/tests/cargo-set-version/set_absolute_version/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Upgrading sample from 0.1.0 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/set_absolute_version/stdout.log b/tests/cargo-set-version/set_absolute_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_absolute_version/stdout.term.svg b/tests/cargo-set-version/set_absolute_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_absolute_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs index 6c7239585e..cde3747daa 100644 --- a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs +++ b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stderr.log b/tests/cargo-set-version/set_absolute_workspace_version/stderr.log deleted file mode 100644 index 71b7edc5c5..0000000000 --- a/tests/cargo-set-version/set_absolute_workspace_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Upgrading workspace version from 0.2.0 to 2.0.0 - Upgrading inherit_ws_version from 0.2.0 to 2.0.0 (inherited from workspace) - Updating workspace's dependency from 0.2 to 2.0 - Updating with_direct_dep's dependency from 0.2 to 2.0 diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg b/tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg new file mode 100644 index 0000000000..221cce039d --- /dev/null +++ b/tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Upgrading workspace version from 0.2.0 to 2.0.0 + + Upgrading inherit_ws_version from 0.2.0 to 2.0.0 (inherited from workspace) + + Updating workspace's dependency from 0.2 to 2.0 + + Updating with_direct_dep's dependency from 0.2 to 2.0 + + + + + + diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stdout.log b/tests/cargo-set-version/set_absolute_workspace_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg b/tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_relative_version/mod.rs b/tests/cargo-set-version/set_relative_version/mod.rs index 2bcb3b7b40..0d3fc42049 100644 --- a/tests/cargo-set-version/set_relative_version/mod.rs +++ b/tests/cargo-set-version/set_relative_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_relative_version/stderr.log b/tests/cargo-set-version/set_relative_version/stderr.log deleted file mode 100644 index e8b389684c..0000000000 --- a/tests/cargo-set-version/set_relative_version/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Upgrading sample from 0.1.0 to 1.0.0 diff --git a/tests/cargo-set-version/set_relative_version/stderr.term.svg b/tests/cargo-set-version/set_relative_version/stderr.term.svg new file mode 100644 index 0000000000..49b2f071d9 --- /dev/null +++ b/tests/cargo-set-version/set_relative_version/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Upgrading sample from 0.1.0 to 1.0.0 + + + + + + diff --git a/tests/cargo-set-version/set_relative_version/stdout.log b/tests/cargo-set-version/set_relative_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_relative_version/stdout.term.svg b/tests/cargo-set-version/set_relative_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_relative_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_relative_workspace_version/mod.rs b/tests/cargo-set-version/set_relative_workspace_version/mod.rs index cb8191f619..c10d36da01 100644 --- a/tests/cargo-set-version/set_relative_workspace_version/mod.rs +++ b/tests/cargo-set-version/set_relative_workspace_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_relative_workspace_version/stderr.log b/tests/cargo-set-version/set_relative_workspace_version/stderr.log deleted file mode 100644 index 4367101cd5..0000000000 --- a/tests/cargo-set-version/set_relative_workspace_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Upgrading workspace version from 0.2.0 to 1.0.0 - Upgrading inherit_ws_version from 0.2.0 to 1.0.0 (inherited from workspace) - Updating workspace's dependency from 0.2 to 1.0 - Updating with_direct_dep's dependency from 0.2 to 1.0 diff --git a/tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg b/tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg new file mode 100644 index 0000000000..e3b4a2b518 --- /dev/null +++ b/tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Upgrading workspace version from 0.2.0 to 1.0.0 + + Upgrading inherit_ws_version from 0.2.0 to 1.0.0 (inherited from workspace) + + Updating workspace's dependency from 0.2 to 1.0 + + Updating with_direct_dep's dependency from 0.2 to 1.0 + + + + + + diff --git a/tests/cargo-set-version/set_relative_workspace_version/stdout.log b/tests/cargo-set-version/set_relative_workspace_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg b/tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs index ac5297c8b2..b0b9bd28b1 100644 --- a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs +++ b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stderr.log b/tests/cargo-set-version/upgrade_compatible_dependency/stderr.log deleted file mode 100644 index f07cdf82da..0000000000 --- a/tests/cargo-set-version/upgrade_compatible_dependency/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 0.4.5 - Updating cargo-list-test-fixture's dependency from 0.4.3 to 0.4.5 diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg b/tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg new file mode 100644 index 0000000000..a737b21d0e --- /dev/null +++ b/tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 0.4.5 + + Updating cargo-list-test-fixture's dependency from 0.4.3 to 0.4.5 + + + + + + diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stdout.log b/tests/cargo-set-version/upgrade_compatible_dependency/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg b/tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs index cd92f521ac..7f069b160a 100644 --- a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log b/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log deleted file mode 100644 index ce6ea0b334..0000000000 --- a/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg b/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg new file mode 100644 index 0000000000..91621df7b5 --- /dev/null +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.log b/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg b/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/upgrade_workspace/mod.rs b/tests/cargo-set-version/upgrade_workspace/mod.rs index 6ccc8cb47e..44ac893875 100644 --- a/tests/cargo-set-version/upgrade_workspace/mod.rs +++ b/tests/cargo-set-version/upgrade_workspace/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/upgrade_workspace/stderr.log b/tests/cargo-set-version/upgrade_workspace/stderr.log deleted file mode 100644 index 97683ef4a1..0000000000 --- a/tests/cargo-set-version/upgrade_workspace/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/upgrade_workspace/stderr.term.svg b/tests/cargo-set-version/upgrade_workspace/stderr.term.svg new file mode 100644 index 0000000000..6f81698384 --- /dev/null +++ b/tests/cargo-set-version/upgrade_workspace/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/upgrade_workspace/stdout.log b/tests/cargo-set-version/upgrade_workspace/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/upgrade_workspace/stdout.term.svg b/tests/cargo-set-version/upgrade_workspace/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/upgrade_workspace/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/virtual_workspace_deps/mod.rs b/tests/cargo-set-version/virtual_workspace_deps/mod.rs index 6ccc8cb47e..44ac893875 100644 --- a/tests/cargo-set-version/virtual_workspace_deps/mod.rs +++ b/tests/cargo-set-version/virtual_workspace_deps/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/virtual_workspace_deps/stderr.log b/tests/cargo-set-version/virtual_workspace_deps/stderr.log deleted file mode 100644 index 64f3edb2ba..0000000000 --- a/tests/cargo-set-version/virtual_workspace_deps/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating workspace's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg b/tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg new file mode 100644 index 0000000000..43085d9509 --- /dev/null +++ b/tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating workspace's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/virtual_workspace_deps/stdout.log b/tests/cargo-set-version/virtual_workspace_deps/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg b/tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/workspace_deps/mod.rs b/tests/cargo-set-version/workspace_deps/mod.rs index 6ccc8cb47e..44ac893875 100644 --- a/tests/cargo-set-version/workspace_deps/mod.rs +++ b/tests/cargo-set-version/workspace_deps/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/workspace_deps/stderr.log b/tests/cargo-set-version/workspace_deps/stderr.log deleted file mode 100644 index 64f3edb2ba..0000000000 --- a/tests/cargo-set-version/workspace_deps/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating workspace's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/workspace_deps/stderr.term.svg b/tests/cargo-set-version/workspace_deps/stderr.term.svg new file mode 100644 index 0000000000..43085d9509 --- /dev/null +++ b/tests/cargo-set-version/workspace_deps/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating workspace's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/workspace_deps/stdout.log b/tests/cargo-set-version/workspace_deps/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/workspace_deps/stdout.term.svg b/tests/cargo-set-version/workspace_deps/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/workspace_deps/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/workspace_version_exclude/mod.rs b/tests/cargo-set-version/workspace_version_exclude/mod.rs index 43043024a4..308b2252b3 100644 --- a/tests/cargo-set-version/workspace_version_exclude/mod.rs +++ b/tests/cargo-set-version/workspace_version_exclude/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/workspace_version_exclude/stderr.log b/tests/cargo-set-version/workspace_version_exclude/stderr.log deleted file mode 100644 index 9551c0ea00..0000000000 --- a/tests/cargo-set-version/workspace_version_exclude/stderr.log +++ /dev/null @@ -1 +0,0 @@ -Error: Cannot exclude root package(s) when inherits-version package(s) modify `workspace.package.version` diff --git a/tests/cargo-set-version/workspace_version_exclude/stderr.term.svg b/tests/cargo-set-version/workspace_version_exclude/stderr.term.svg new file mode 100644 index 0000000000..780d474a6e --- /dev/null +++ b/tests/cargo-set-version/workspace_version_exclude/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Error: Cannot exclude root package(s) when inherits-version package(s) modify `workspace.package.version` + + + + + + diff --git a/tests/cargo-set-version/workspace_version_exclude/stdout.log b/tests/cargo-set-version/workspace_version_exclude/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/workspace_version_exclude/stdout.term.svg b/tests/cargo-set-version/workspace_version_exclude/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/workspace_version_exclude/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/workspace_version_subset/mod.rs b/tests/cargo-set-version/workspace_version_subset/mod.rs index 797c161ada..e6b7d714e6 100644 --- a/tests/cargo-set-version/workspace_version_subset/mod.rs +++ b/tests/cargo-set-version/workspace_version_subset/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/workspace_version_subset/stderr.log b/tests/cargo-set-version/workspace_version_subset/stderr.log deleted file mode 100644 index bbc19a21f9..0000000000 --- a/tests/cargo-set-version/workspace_version_subset/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Upgrading workspace version from 0.1.0 to 2.0.0 - Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace) - Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace) - Updating workspace's dependency from 0.1.0 to 2.0.0 diff --git a/tests/cargo-set-version/workspace_version_subset/stderr.term.svg b/tests/cargo-set-version/workspace_version_subset/stderr.term.svg new file mode 100644 index 0000000000..f2e118423c --- /dev/null +++ b/tests/cargo-set-version/workspace_version_subset/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Upgrading workspace version from 0.1.0 to 2.0.0 + + Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace) + + Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace) + + Updating workspace's dependency from 0.1.0 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/workspace_version_subset/stdout.log b/tests/cargo-set-version/workspace_version_subset/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/workspace_version_subset/stdout.term.svg b/tests/cargo-set-version/workspace_version_subset/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/workspace_version_subset/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/alt_registry/mod.rs b/tests/cargo-upgrade/alt_registry/mod.rs index 939d2c8970..af7f62ad58 100644 --- a/tests/cargo-upgrade/alt_registry/mod.rs +++ b/tests/cargo-upgrade/alt_registry/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_alt_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_alt_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log deleted file mode 100644 index b04a31f535..0000000000 --- a/tests/cargo-upgrade/alt_registry/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking none's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/alt_registry/stderr.term.svg b/tests/cargo-upgrade/alt_registry/stderr.term.svg new file mode 100644 index 0000000000..379b3f1e74 --- /dev/null +++ b/tests/cargo-upgrade/alt_registry/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking none's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/alt_registry/stdout.log b/tests/cargo-upgrade/alt_registry/stdout.log deleted file mode 100644 index 816d92908e..0000000000 --- a/tests/cargo-upgrade/alt_registry/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package1 0.1.1 0.1.1 99999.0.0 99999.0.0 -my-package2 0.2 0.2.3 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/alt_registry/stdout.term.svg b/tests/cargo-upgrade/alt_registry/stdout.term.svg new file mode 100644 index 0000000000..2b53d3b924 --- /dev/null +++ b/tests/cargo-upgrade/alt_registry/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package1 0.1.1 0.1.1 99999.0.0 99999.0.0 + + my-package2 0.2 0.2.3 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/cli_rust_version/mod.rs b/tests/cargo-upgrade/cli_rust_version/mod.rs index 81dd4f42c7..ae9871afd3 100644 --- a/tests/cargo-upgrade/cli_rust_version/mod.rs +++ b/tests/cargo-upgrade/cli_rust_version/mod.rs @@ -1,8 +1,9 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { @@ -22,7 +23,7 @@ fn case() { .rust_version("1.72.0") .publish(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -38,8 +39,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.log b/tests/cargo-upgrade/cli_rust_version/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/cli_rust_version/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.term.svg b/tests/cargo-upgrade/cli_rust_version/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/cli_rust_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/cli_rust_version/stdout.log b/tests/cargo-upgrade/cli_rust_version/stdout.log deleted file mode 100644 index 4ce02868d7..0000000000 --- a/tests/cargo-upgrade/cli_rust_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.3 0.2.0 0.2.0 diff --git a/tests/cargo-upgrade/cli_rust_version/stdout.term.svg b/tests/cargo-upgrade/cli_rust_version/stdout.term.svg new file mode 100644 index 0000000000..698dc8cb3a --- /dev/null +++ b/tests/cargo-upgrade/cli_rust_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.3 0.2.0 0.2.0 + + + + + + diff --git a/tests/cargo-upgrade/dry_run/mod.rs b/tests/cargo-upgrade/dry_run/mod.rs index 8e6c8cf0de..b2b1b6a11c 100644 --- a/tests/cargo-upgrade/dry_run/mod.rs +++ b/tests/cargo-upgrade/dry_run/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/dry_run/stderr.log b/tests/cargo-upgrade/dry_run/stderr.log deleted file mode 100644 index 1a63e3418e..0000000000 --- a/tests/cargo-upgrade/dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -warning: aborting upgrade due to dry run diff --git a/tests/cargo-upgrade/dry_run/stderr.term.svg b/tests/cargo-upgrade/dry_run/stderr.term.svg new file mode 100644 index 0000000000..6ab1405cd4 --- /dev/null +++ b/tests/cargo-upgrade/dry_run/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + warning: aborting upgrade due to dry run + + + + + + diff --git a/tests/cargo-upgrade/dry_run/stdout.log b/tests/cargo-upgrade/dry_run/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/dry_run/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/dry_run/stdout.term.svg b/tests/cargo-upgrade/dry_run/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/dry_run/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/exclude_dep/mod.rs b/tests/cargo-upgrade/exclude_dep/mod.rs index 34f411061c..21b5f3a0bc 100644 --- a/tests/cargo-upgrade/exclude_dep/mod.rs +++ b/tests/cargo-upgrade/exclude_dep/mod.rs @@ -1,15 +1,16 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); crate::add_git_registry_packages(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -26,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log deleted file mode 100644 index 774ad6740f..0000000000 --- a/tests/cargo-upgrade/exclude_dep/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking None's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/exclude_dep/stderr.term.svg b/tests/cargo-upgrade/exclude_dep/stderr.term.svg new file mode 100644 index 0000000000..0239411b36 --- /dev/null +++ b/tests/cargo-upgrade/exclude_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking None's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/exclude_dep/stdout.log b/tests/cargo-upgrade/exclude_dep/stdout.log deleted file mode 100644 index fb894c05e4..0000000000 --- a/tests/cargo-upgrade/exclude_dep/stdout.log +++ /dev/null @@ -1,18 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -docopt 0.4 0.4.1 99999.0.0 0.4 excluded -pad 0.1 0.1.1 99999.0.0 99999.0 -serde_json 20.0 20.0.0 99999.0.0 99999.0 -syn 0.1.1 0.1.1 99999.0.0 99999.0.0 -tar 0.4 0.4.1 99999.0.0 99999.0 -ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 -toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 -semver 0.2 0.2.3 99999.0.0 99999.0 -renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 -assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 -tempdir 0.1 0.1.1 99999.0.0 99999.0 -serde 1.0 - - 1.0 -openssl 0.4 0.4.1 99999.0.0 99999.0 -rget 0.4.0 0.4.1 99999.0.0 99999.0.0 -geo 0.2.0 0.2.3 99999.0.0 99999.0.0 -ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/exclude_dep/stdout.term.svg b/tests/cargo-upgrade/exclude_dep/stdout.term.svg new file mode 100644 index 0000000000..31d97d277b --- /dev/null +++ b/tests/cargo-upgrade/exclude_dep/stdout.term.svg @@ -0,0 +1,59 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + docopt 0.4 0.4.1 99999.0.0 0.4 excluded + + pad 0.1 0.1.1 99999.0.0 99999.0 + + serde_json 20.0 20.0.0 99999.0.0 99999.0 + + syn 0.1.1 0.1.1 99999.0.0 99999.0.0 + + tar 0.4 0.4.1 99999.0.0 99999.0 + + ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 + + toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + semver 0.2 0.2.3 99999.0.0 99999.0 + + renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 + + assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 + + tempdir 0.1 0.1.1 99999.0.0 99999.0 + + serde 1.0 - - 1.0 + + openssl 0.4 0.4.1 99999.0.0 99999.0 + + rget 0.4.0 0.4.1 99999.0.0 99999.0.0 + + geo 0.2.0 0.2.3 99999.0.0 99999.0.0 + + ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/exclude_renamed/mod.rs b/tests/cargo-upgrade/exclude_renamed/mod.rs index a1ae27fe56..f895187ea8 100644 --- a/tests/cargo-upgrade/exclude_renamed/mod.rs +++ b/tests/cargo-upgrade/exclude_renamed/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -24,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/exclude_renamed/stderr.log b/tests/cargo-upgrade/exclude_renamed/stderr.log deleted file mode 100644 index 8055d9fa2a..0000000000 --- a/tests/cargo-upgrade/exclude_renamed/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/exclude_renamed/stderr.term.svg b/tests/cargo-upgrade/exclude_renamed/stderr.term.svg new file mode 100644 index 0000000000..541295ddd6 --- /dev/null +++ b/tests/cargo-upgrade/exclude_renamed/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + note: Re-run with `--pinned` to upgrade pinned version requirements + + + + + + diff --git a/tests/cargo-upgrade/exclude_renamed/stdout.log b/tests/cargo-upgrade/exclude_renamed/stdout.log deleted file mode 100644 index 55b53ea787..0000000000 --- a/tests/cargo-upgrade/exclude_renamed/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -toml_edit (te) 0.1.5 - 99999.0.0 0.1.5 pinned -regex (rx) 0.2 - - 0.2 excluded diff --git a/tests/cargo-upgrade/exclude_renamed/stdout.term.svg b/tests/cargo-upgrade/exclude_renamed/stdout.term.svg new file mode 100644 index 0000000000..ac3cd8b16a --- /dev/null +++ b/tests/cargo-upgrade/exclude_renamed/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + toml_edit (te) 0.1.5 - 99999.0.0 0.1.5 pinned + + regex (rx) 0.2 - - 0.2 excluded + + + + + + diff --git a/tests/cargo-upgrade/ignore_rust_version/mod.rs b/tests/cargo-upgrade/ignore_rust_version/mod.rs index f88bd553b8..d293c9a7ac 100644 --- a/tests/cargo-upgrade/ignore_rust_version/mod.rs +++ b/tests/cargo-upgrade/ignore_rust_version/mod.rs @@ -1,8 +1,9 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { @@ -19,7 +20,7 @@ fn case() { .rust_version("1.68.0") .publish(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -35,8 +36,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.log b/tests/cargo-upgrade/ignore_rust_version/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/ignore_rust_version/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.term.svg b/tests/cargo-upgrade/ignore_rust_version/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/ignore_rust_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/ignore_rust_version/stdout.log b/tests/cargo-upgrade/ignore_rust_version/stdout.log deleted file mode 100644 index 4ce02868d7..0000000000 --- a/tests/cargo-upgrade/ignore_rust_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.3 0.2.0 0.2.0 diff --git a/tests/cargo-upgrade/ignore_rust_version/stdout.term.svg b/tests/cargo-upgrade/ignore_rust_version/stdout.term.svg new file mode 100644 index 0000000000..698dc8cb3a --- /dev/null +++ b/tests/cargo-upgrade/ignore_rust_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.3 0.2.0 0.2.0 + + + + + + diff --git a/tests/cargo-upgrade/implicit_prerelease/mod.rs b/tests/cargo-upgrade/implicit_prerelease/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/implicit_prerelease/mod.rs +++ b/tests/cargo-upgrade/implicit_prerelease/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/implicit_prerelease/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.term.svg b/tests/cargo-upgrade/implicit_prerelease/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/implicit_prerelease/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/implicit_prerelease/stdout.log b/tests/cargo-upgrade/implicit_prerelease/stdout.log deleted file mode 100644 index 394e2bbb50..0000000000 --- a/tests/cargo-upgrade/implicit_prerelease/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -unrelated-crate 1.0 - 99999.0.0 99999.0 -my-package 0.1.1-alpha.1 0.1.1 99999.1.0-alpha.1 99999.1.0-alpha.1 diff --git a/tests/cargo-upgrade/implicit_prerelease/stdout.term.svg b/tests/cargo-upgrade/implicit_prerelease/stdout.term.svg new file mode 100644 index 0000000000..58b087e8e5 --- /dev/null +++ b/tests/cargo-upgrade/implicit_prerelease/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + unrelated-crate 1.0 - 99999.0.0 99999.0 + + my-package 0.1.1-alpha.1 0.1.1 99999.1.0-alpha.1 99999.1.0-alpha.1 + + + + + + diff --git a/tests/cargo-upgrade/invalid_dep/mod.rs b/tests/cargo-upgrade/invalid_dep/mod.rs index 06d6f4eacb..e08f268a28 100644 --- a/tests/cargo-upgrade/invalid_dep/mod.rs +++ b/tests/cargo-upgrade/invalid_dep/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_dep/stderr.log b/tests/cargo-upgrade/invalid_dep/stderr.log deleted file mode 100644 index cdbc04aff8..0000000000 --- a/tests/cargo-upgrade/invalid_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -Error: dependency failure doesn't exist diff --git a/tests/cargo-upgrade/invalid_dep/stderr.term.svg b/tests/cargo-upgrade/invalid_dep/stderr.term.svg new file mode 100644 index 0000000000..6ccfc60b90 --- /dev/null +++ b/tests/cargo-upgrade/invalid_dep/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Error: dependency failure doesn't exist + + + + + + diff --git a/tests/cargo-upgrade/invalid_dep/stdout.log b/tests/cargo-upgrade/invalid_dep/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_dep/stdout.term.svg b/tests/cargo-upgrade/invalid_dep/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_dep/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_flag/mod.rs b/tests/cargo-upgrade/invalid_flag/mod.rs index 64c0ff2abc..be19844876 100644 --- a/tests/cargo-upgrade/invalid_flag/mod.rs +++ b/tests/cargo-upgrade/invalid_flag/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .code(2) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_flag/stderr.log b/tests/cargo-upgrade/invalid_flag/stderr.log deleted file mode 100644 index a0c54c468c..0000000000 --- a/tests/cargo-upgrade/invalid_flag/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ -error: unexpected argument '--flag' found - -Usage: cargo upgrade [OPTIONS] - -For more information, try '--help'. diff --git a/tests/cargo-upgrade/invalid_flag/stderr.term.svg b/tests/cargo-upgrade/invalid_flag/stderr.term.svg new file mode 100644 index 0000000000..259e8e7641 --- /dev/null +++ b/tests/cargo-upgrade/invalid_flag/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: unexpected argument '--flag' found + + + + Usage: cargo upgrade [OPTIONS] + + + + For more information, try '--help'. + + + + + + diff --git a/tests/cargo-upgrade/invalid_flag/stdout.log b/tests/cargo-upgrade/invalid_flag/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_flag/stdout.term.svg b/tests/cargo-upgrade/invalid_flag/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_flag/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_manifest/mod.rs b/tests/cargo-upgrade/invalid_manifest/mod.rs index be8d17d394..b221a9ccf3 100644 --- a/tests/cargo-upgrade/invalid_manifest/mod.rs +++ b/tests/cargo-upgrade/invalid_manifest/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -17,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.log b/tests/cargo-upgrade/invalid_manifest/stderr.log deleted file mode 100644 index cc5355e613..0000000000 --- a/tests/cargo-upgrade/invalid_manifest/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ -Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` -error: expected `.`, `=` - --> Cargo.toml:1:6 - | -1 | This is clearly not a valid Cargo.toml. - | ^ - | - diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.term.svg b/tests/cargo-upgrade/invalid_manifest/stderr.term.svg new file mode 100644 index 0000000000..e3a09ca380 --- /dev/null +++ b/tests/cargo-upgrade/invalid_manifest/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Error: `cargo metadata` exited with an error: error: expected `.`, `=` + + --> Cargo.toml:1:6 + + | + + 1 | This is clearly not a valid Cargo.toml. + + | ^ + + | + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_manifest/stdout.log b/tests/cargo-upgrade/invalid_manifest/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_manifest/stdout.term.svg b/tests/cargo-upgrade/invalid_manifest/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_manifest/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs index be8d17d394..b221a9ccf3 100644 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -17,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log deleted file mode 100644 index 3e8f34ec56..0000000000 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -... diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg new file mode 100644 index 0000000000..e3a09ca380 --- /dev/null +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Error: `cargo metadata` exited with an error: error: expected `.`, `=` + + --> Cargo.toml:1:6 + + | + + 1 | This is clearly not a valid Cargo.toml. + + | ^ + + | + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg b/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/locked/mod.rs b/tests/cargo-upgrade/locked/mod.rs index 3907b034f1..9a65f9a2e7 100644 --- a/tests/cargo-upgrade/locked/mod.rs +++ b/tests/cargo-upgrade/locked/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/locked/stderr.log b/tests/cargo-upgrade/locked/stderr.log deleted file mode 100644 index aecfc3d339..0000000000 --- a/tests/cargo-upgrade/locked/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/locked/stderr.term.svg b/tests/cargo-upgrade/locked/stderr.term.svg new file mode 100644 index 0000000000..77b53e2e0d --- /dev/null +++ b/tests/cargo-upgrade/locked/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Error: cannot upgrade due to `--locked` + + + + + + diff --git a/tests/cargo-upgrade/locked/stdout.log b/tests/cargo-upgrade/locked/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/locked/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/locked/stdout.term.svg b/tests/cargo-upgrade/locked/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/locked/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/locked_dry_run/mod.rs b/tests/cargo-upgrade/locked_dry_run/mod.rs index 61b4d20875..d2c472b6c8 100644 --- a/tests/cargo-upgrade/locked_dry_run/mod.rs +++ b/tests/cargo-upgrade/locked_dry_run/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/locked_dry_run/stderr.log b/tests/cargo-upgrade/locked_dry_run/stderr.log deleted file mode 100644 index aecfc3d339..0000000000 --- a/tests/cargo-upgrade/locked_dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/locked_dry_run/stderr.term.svg b/tests/cargo-upgrade/locked_dry_run/stderr.term.svg new file mode 100644 index 0000000000..77b53e2e0d --- /dev/null +++ b/tests/cargo-upgrade/locked_dry_run/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Error: cannot upgrade due to `--locked` + + + + + + diff --git a/tests/cargo-upgrade/locked_dry_run/stdout.log b/tests/cargo-upgrade/locked_dry_run/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/locked_dry_run/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/locked_dry_run/stdout.term.svg b/tests/cargo-upgrade/locked_dry_run/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/locked_dry_run/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/lockfile/mod.rs b/tests/cargo-upgrade/lockfile/mod.rs index 48a32ada0a..b45a3ebcc6 100644 --- a/tests/cargo-upgrade/lockfile/mod.rs +++ b/tests/cargo-upgrade/lockfile/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/lockfile/out/Cargo.lock b/tests/cargo-upgrade/lockfile/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/lockfile/out/Cargo.lock +++ b/tests/cargo-upgrade/lockfile/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/lockfile/stderr.log b/tests/cargo-upgrade/lockfile/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/lockfile/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/lockfile/stderr.term.svg b/tests/cargo-upgrade/lockfile/stderr.term.svg new file mode 100644 index 0000000000..6e00b2f0f1 --- /dev/null +++ b/tests/cargo-upgrade/lockfile/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Checking four's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/lockfile/stdout.log b/tests/cargo-upgrade/lockfile/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/lockfile/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/lockfile/stdout.term.svg b/tests/cargo-upgrade/lockfile/stdout.term.svg new file mode 100644 index 0000000000..ed532bd65c --- /dev/null +++ b/tests/cargo-upgrade/lockfile/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/optional_dep/mod.rs b/tests/cargo-upgrade/optional_dep/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/optional_dep/mod.rs +++ b/tests/cargo-upgrade/optional_dep/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/optional_dep/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/optional_dep/stderr.term.svg b/tests/cargo-upgrade/optional_dep/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/optional_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/optional_dep/stdout.log b/tests/cargo-upgrade/optional_dep/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/optional_dep/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/optional_dep/stdout.term.svg b/tests/cargo-upgrade/optional_dep/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/optional_dep/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/package_rust_version/mod.rs b/tests/cargo-upgrade/package_rust_version/mod.rs index bea60c0f11..f44ebaa0a4 100644 --- a/tests/cargo-upgrade/package_rust_version/mod.rs +++ b/tests/cargo-upgrade/package_rust_version/mod.rs @@ -1,8 +1,9 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { @@ -19,7 +20,7 @@ fn case() { .rust_version("1.68.0") .publish(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -29,8 +30,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/package_rust_version/stderr.log b/tests/cargo-upgrade/package_rust_version/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/package_rust_version/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/package_rust_version/stderr.term.svg b/tests/cargo-upgrade/package_rust_version/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/package_rust_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/package_rust_version/stdout.log b/tests/cargo-upgrade/package_rust_version/stdout.log deleted file mode 100644 index 622ed9e9c6..0000000000 --- a/tests/cargo-upgrade/package_rust_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.2 0.1.2 0.1.2 diff --git a/tests/cargo-upgrade/package_rust_version/stdout.term.svg b/tests/cargo-upgrade/package_rust_version/stdout.term.svg new file mode 100644 index 0000000000..4a95014486 --- /dev/null +++ b/tests/cargo-upgrade/package_rust_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.2 0.1.2 0.1.2 + + + + + + diff --git a/tests/cargo-upgrade/pinned/mod.rs b/tests/cargo-upgrade/pinned/mod.rs index 5f5a18b53a..9c50c9aa84 100644 --- a/tests/cargo-upgrade/pinned/mod.rs +++ b/tests/cargo-upgrade/pinned/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_op_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log deleted file mode 100644 index 8e6e2dcce0..0000000000 --- a/tests/cargo-upgrade/pinned/stderr.log +++ /dev/null @@ -1,6 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/pinned/stderr.term.svg b/tests/cargo-upgrade/pinned/stderr.term.svg new file mode 100644 index 0000000000..e2827e8550 --- /dev/null +++ b/tests/cargo-upgrade/pinned/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--pinned` to upgrade pinned version requirements + + + + + + diff --git a/tests/cargo-upgrade/pinned/stdout.log b/tests/cargo-upgrade/pinned/stdout.log deleted file mode 100644 index 6a51fc04eb..0000000000 --- a/tests/cargo-upgrade/pinned/stdout.log +++ /dev/null @@ -1,11 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -default 0.2 0.2.3 99999.0.0 99999.0 -exact =0.2 0.2.3 99999.0.0 =0.2 pinned -lessthan <0.2 0.1.1 99999.0.0 <0.2 pinned -lessorequal <=0.2 0.2.3 99999.0.0 <=0.2 pinned -caret ^0.2 0.2.3 99999.0.0 ^99999.0 -tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 -greaterthan >0.2 99999.0.0 99999.0.0 >0.2 -greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 -wildcard 0.2.* 0.2.3 99999.0.0 0.2.* pinned diff --git a/tests/cargo-upgrade/pinned/stdout.term.svg b/tests/cargo-upgrade/pinned/stdout.term.svg new file mode 100644 index 0000000000..5a45e362a8 --- /dev/null +++ b/tests/cargo-upgrade/pinned/stdout.term.svg @@ -0,0 +1,45 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + default 0.2 0.2.3 99999.0.0 99999.0 + + exact =0.2 0.2.3 99999.0.0 =0.2 pinned + + lessthan <0.2 0.1.1 99999.0.0 <0.2 pinned + + lessorequal <=0.2 0.2.3 99999.0.0 <=0.2 pinned + + caret ^0.2 0.2.3 99999.0.0 ^99999.0 + + tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 + + greaterthan >0.2 99999.0.0 99999.0.0 >0.2 + + greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 + + wildcard 0.2.* 0.2.3 99999.0.0 0.2.* pinned + + + + + + diff --git a/tests/cargo-upgrade/preserve_op/mod.rs b/tests/cargo-upgrade/preserve_op/mod.rs index 4e69cc58be..e5c519340c 100644 --- a/tests/cargo-upgrade/preserve_op/mod.rs +++ b/tests/cargo-upgrade/preserve_op/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_op_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_op/stderr.log b/tests/cargo-upgrade/preserve_op/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_op/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_op/stderr.term.svg b/tests/cargo-upgrade/preserve_op/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_op/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_op/stdout.log b/tests/cargo-upgrade/preserve_op/stdout.log deleted file mode 100644 index 5b4a077b66..0000000000 --- a/tests/cargo-upgrade/preserve_op/stdout.log +++ /dev/null @@ -1,11 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -default 0.2 0.2.3 99999.0.0 99999.0 -exact =0.2 0.2.3 99999.0.0 =99999.0 -lessthan <0.2 0.1.1 99999.0.0 99999.0.0 -lessorequal <=0.2 0.2.3 99999.0.0 99999.0.0 -caret ^0.2 0.2.3 99999.0.0 ^99999.0 -tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 -greaterthan >0.2 99999.0.0 99999.0.0 >0.2 -greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 -wildcard 0.2.* 0.2.3 99999.0.0 99999.0.* diff --git a/tests/cargo-upgrade/preserve_op/stdout.term.svg b/tests/cargo-upgrade/preserve_op/stdout.term.svg new file mode 100644 index 0000000000..d18c8ddbdb --- /dev/null +++ b/tests/cargo-upgrade/preserve_op/stdout.term.svg @@ -0,0 +1,45 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + default 0.2 0.2.3 99999.0.0 99999.0 + + exact =0.2 0.2.3 99999.0.0 =99999.0 + + lessthan <0.2 0.1.1 99999.0.0 99999.0.0 + + lessorequal <=0.2 0.2.3 99999.0.0 99999.0.0 + + caret ^0.2 0.2.3 99999.0.0 ^99999.0 + + tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 + + greaterthan >0.2 99999.0.0 99999.0.0 >0.2 + + greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 + + wildcard 0.2.* 0.2.3 99999.0.0 99999.0.* + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_major/mod.rs b/tests/cargo-upgrade/preserve_precision_major/mod.rs index a4a73a011f..28d7791c13 100644 --- a/tests/cargo-upgrade/preserve_precision_major/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_major/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_precision_major/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.term.svg b/tests/cargo-upgrade/preserve_precision_major/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_major/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_major/stdout.log b/tests/cargo-upgrade/preserve_precision_major/stdout.log deleted file mode 100644 index 04d1b6cc49..0000000000 --- a/tests/cargo-upgrade/preserve_precision_major/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0 0.4.1 99999.0.0 99999 diff --git a/tests/cargo-upgrade/preserve_precision_major/stdout.term.svg b/tests/cargo-upgrade/preserve_precision_major/stdout.term.svg new file mode 100644 index 0000000000..47c7edb700 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_major/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0 0.4.1 99999.0.0 99999 + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_minor/mod.rs b/tests/cargo-upgrade/preserve_precision_minor/mod.rs index a4a73a011f..28d7791c13 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_minor/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg b/tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_minor/stdout.log b/tests/cargo-upgrade/preserve_precision_minor/stdout.log deleted file mode 100644 index ba6eab01f9..0000000000 --- a/tests/cargo-upgrade/preserve_precision_minor/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1 0.1.1 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg b/tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg new file mode 100644 index 0000000000..6a44d13ca7 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1 0.1.1 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_patch/mod.rs b/tests/cargo-upgrade/preserve_precision_patch/mod.rs index a4a73a011f..28d7791c13 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_patch/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg b/tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_patch/stdout.log b/tests/cargo-upgrade/preserve_precision_patch/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/preserve_precision_patch/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg b/tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/preserves_inline_table/mod.rs b/tests/cargo-upgrade/preserves_inline_table/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/preserves_inline_table/mod.rs +++ b/tests/cargo-upgrade/preserves_inline_table/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserves_inline_table/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.term.svg b/tests/cargo-upgrade/preserves_inline_table/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserves_inline_table/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserves_inline_table/stdout.log b/tests/cargo-upgrade/preserves_inline_table/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/preserves_inline_table/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserves_inline_table/stdout.term.svg b/tests/cargo-upgrade/preserves_inline_table/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/preserves_inline_table/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/preserves_std_table/mod.rs b/tests/cargo-upgrade/preserves_std_table/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/preserves_std_table/mod.rs +++ b/tests/cargo-upgrade/preserves_std_table/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserves_std_table/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.term.svg b/tests/cargo-upgrade/preserves_std_table/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserves_std_table/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserves_std_table/stdout.log b/tests/cargo-upgrade/preserves_std_table/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/preserves_std_table/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserves_std_table/stdout.term.svg b/tests/cargo-upgrade/preserves_std_table/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/preserves_std_table/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/single_dep/mod.rs b/tests/cargo-upgrade/single_dep/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/single_dep/mod.rs +++ b/tests/cargo-upgrade/single_dep/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/single_dep/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/single_dep/stderr.term.svg b/tests/cargo-upgrade/single_dep/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/single_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/single_dep/stdout.log b/tests/cargo-upgrade/single_dep/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/single_dep/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/single_dep/stdout.term.svg b/tests/cargo-upgrade/single_dep/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/single_dep/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/skip_compatible/mod.rs b/tests/cargo-upgrade/skip_compatible/mod.rs index a401fff131..70155b2e1c 100644 --- a/tests/cargo-upgrade/skip_compatible/mod.rs +++ b/tests/cargo-upgrade/skip_compatible/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_breaking_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/skip_compatible/stderr.log b/tests/cargo-upgrade/skip_compatible/stderr.log deleted file mode 100644 index 68e70d213d..0000000000 --- a/tests/cargo-upgrade/skip_compatible/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -note: Re-run with `--incompatible` to upgrade incompatible version requirements diff --git a/tests/cargo-upgrade/skip_compatible/stderr.term.svg b/tests/cargo-upgrade/skip_compatible/stderr.term.svg new file mode 100644 index 0000000000..4fcbd29aea --- /dev/null +++ b/tests/cargo-upgrade/skip_compatible/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + note: Re-run with `--incompatible` to upgrade incompatible version requirements + + + + + + diff --git a/tests/cargo-upgrade/skip_compatible/stdout.log b/tests/cargo-upgrade/skip_compatible/stdout.log deleted file mode 100644 index ee0fe9c5b8..0000000000 --- a/tests/cargo-upgrade/skip_compatible/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -test_breaking 0.1 - 0.2.0 0.1 incompatible -test_nonbreaking 0.1.0 0.1.2 0.1.2 0.1.2 diff --git a/tests/cargo-upgrade/skip_compatible/stdout.term.svg b/tests/cargo-upgrade/skip_compatible/stdout.term.svg new file mode 100644 index 0000000000..1950c2e8c6 --- /dev/null +++ b/tests/cargo-upgrade/skip_compatible/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + test_breaking 0.1 - 0.2.0 0.1 incompatible + + test_nonbreaking 0.1.0 0.1.2 0.1.2 0.1.2 + + + + + + diff --git a/tests/cargo-upgrade/specified/mod.rs b/tests/cargo-upgrade/specified/mod.rs index afc9beeb47..347d0f67e6 100644 --- a/tests/cargo-upgrade/specified/mod.rs +++ b/tests/cargo-upgrade/specified/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log deleted file mode 100644 index ce9696ae2f..0000000000 --- a/tests/cargo-upgrade/specified/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - excluded: my-package2 diff --git a/tests/cargo-upgrade/specified/stderr.term.svg b/tests/cargo-upgrade/specified/stderr.term.svg new file mode 100644 index 0000000000..c8910ce42f --- /dev/null +++ b/tests/cargo-upgrade/specified/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + excluded: my-package2 + + + + + + diff --git a/tests/cargo-upgrade/specified/stdout.log b/tests/cargo-upgrade/specified/stdout.log deleted file mode 100644 index 2c55b48ce3..0000000000 --- a/tests/cargo-upgrade/specified/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package1 0.1 0.1.1 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/specified/stdout.term.svg b/tests/cargo-upgrade/specified/stdout.term.svg new file mode 100644 index 0000000000..fb465a0b71 --- /dev/null +++ b/tests/cargo-upgrade/specified/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package1 0.1 0.1.1 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/to_version/mod.rs b/tests/cargo-upgrade/to_version/mod.rs index 22e5d384ed..8bcf5a10f0 100644 --- a/tests/cargo-upgrade/to_version/mod.rs +++ b/tests/cargo-upgrade/to_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -25,8 +26,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/to_version/stderr.log b/tests/cargo-upgrade/to_version/stderr.log deleted file mode 100644 index b4cda1e371..0000000000 --- a/tests/cargo-upgrade/to_version/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Checking cargo-list-test-fixture's dependencies diff --git a/tests/cargo-upgrade/to_version/stderr.term.svg b/tests/cargo-upgrade/to_version/stderr.term.svg new file mode 100644 index 0000000000..77d1d45e49 --- /dev/null +++ b/tests/cargo-upgrade/to_version/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + + + + + diff --git a/tests/cargo-upgrade/to_version/stdout.log b/tests/cargo-upgrade/to_version/stdout.log deleted file mode 100644 index e5073213ee..0000000000 --- a/tests/cargo-upgrade/to_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -docopt 0.4.0 0.4.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/to_version/stdout.term.svg b/tests/cargo-upgrade/to_version/stdout.term.svg new file mode 100644 index 0000000000..278797847a --- /dev/null +++ b/tests/cargo-upgrade/to_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + docopt 0.4.0 0.4.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_all/mod.rs b/tests/cargo-upgrade/upgrade_all/mod.rs index 48a32ada0a..b45a3ebcc6 100644 --- a/tests/cargo-upgrade/upgrade_all/mod.rs +++ b/tests/cargo-upgrade/upgrade_all/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_all/out/Cargo.lock b/tests/cargo-upgrade/upgrade_all/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/upgrade_all/out/Cargo.lock +++ b/tests/cargo-upgrade/upgrade_all/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/upgrade_all/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_all/stderr.term.svg b/tests/cargo-upgrade/upgrade_all/stderr.term.svg new file mode 100644 index 0000000000..9d3ea9de87 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_all/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_all/stdout.log b/tests/cargo-upgrade/upgrade_all/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/upgrade_all/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_all/stdout.term.svg b/tests/cargo-upgrade/upgrade_all/stdout.term.svg new file mode 100644 index 0000000000..d600778bd0 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_all/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_everything/mod.rs b/tests/cargo-upgrade/upgrade_everything/mod.rs index 1bbb8514c7..6647ab6d38 100644 --- a/tests/cargo-upgrade/upgrade_everything/mod.rs +++ b/tests/cargo-upgrade/upgrade_everything/mod.rs @@ -1,15 +1,16 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); crate::add_git_registry_packages(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -19,8 +20,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log deleted file mode 100644 index 796318abdf..0000000000 --- a/tests/cargo-upgrade/upgrade_everything/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Checking None's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - latest: serde diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.term.svg b/tests/cargo-upgrade/upgrade_everything/stderr.term.svg new file mode 100644 index 0000000000..4da5e7c4f2 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_everything/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Checking None's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + latest: serde + + + + + + diff --git a/tests/cargo-upgrade/upgrade_everything/stdout.log b/tests/cargo-upgrade/upgrade_everything/stdout.log deleted file mode 100644 index 493c5ec850..0000000000 --- a/tests/cargo-upgrade/upgrade_everything/stdout.log +++ /dev/null @@ -1,17 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -docopt 0.4 0.4.1 99999.0.0 99999.0 -pad 0.1 0.1.1 99999.0.0 99999.0 -serde_json 20.0 20.0.0 99999.0.0 99999.0 -syn 0.1.1 0.1.1 99999.0.0 99999.0.0 -tar 0.4 0.4.1 99999.0.0 99999.0 -ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 -toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 -semver 0.2 0.2.3 99999.0.0 99999.0 -renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 -assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 -tempdir 0.1 0.1.1 99999.0.0 99999.0 -openssl 0.4 0.4.1 99999.0.0 99999.0 -rget 0.4.0 0.4.1 99999.0.0 99999.0.0 -geo 0.2.0 0.2.3 99999.0.0 99999.0.0 -ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_everything/stdout.term.svg b/tests/cargo-upgrade/upgrade_everything/stdout.term.svg new file mode 100644 index 0000000000..d12dd233aa --- /dev/null +++ b/tests/cargo-upgrade/upgrade_everything/stdout.term.svg @@ -0,0 +1,57 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + docopt 0.4 0.4.1 99999.0.0 99999.0 + + pad 0.1 0.1.1 99999.0.0 99999.0 + + serde_json 20.0 20.0.0 99999.0.0 99999.0 + + syn 0.1.1 0.1.1 99999.0.0 99999.0.0 + + tar 0.4 0.4.1 99999.0.0 99999.0 + + ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 + + toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + semver 0.2 0.2.3 99999.0.0 99999.0 + + renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 + + assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 + + tempdir 0.1 0.1.1 99999.0.0 99999.0 + + openssl 0.4 0.4.1 99999.0.0 99999.0 + + rget 0.4.0 0.4.1 99999.0.0 99999.0.0 + + geo 0.2.0 0.2.3 99999.0.0 99999.0.0 + + ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_renamed/mod.rs b/tests/cargo-upgrade/upgrade_renamed/mod.rs index ed610c1432..0b3677c508 100644 --- a/tests/cargo-upgrade/upgrade_renamed/mod.rs +++ b/tests/cargo-upgrade/upgrade_renamed/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/upgrade_renamed/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.term.svg b/tests/cargo-upgrade/upgrade_renamed/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_renamed/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_renamed/stdout.log b/tests/cargo-upgrade/upgrade_renamed/stdout.log deleted file mode 100644 index ea805e1576..0000000000 --- a/tests/cargo-upgrade/upgrade_renamed/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package1 (m1) 0.1.1 0.1.1 99999.0.0 99999.0.0 -my-package2 (m2) 0.2 0.2.3 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/upgrade_renamed/stdout.term.svg b/tests/cargo-upgrade/upgrade_renamed/stdout.term.svg new file mode 100644 index 0000000000..08b457ac07 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_renamed/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package1 (m1) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + my-package2 (m2) 0.2 0.2.3 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_verbose/mod.rs b/tests/cargo-upgrade/upgrade_verbose/mod.rs index 04a9c70fc7..c4f09d994f 100644 --- a/tests/cargo-upgrade/upgrade_verbose/mod.rs +++ b/tests/cargo-upgrade/upgrade_verbose/mod.rs @@ -1,15 +1,16 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); crate::add_git_registry_packages(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -19,8 +20,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.log b/tests/cargo-upgrade/upgrade_verbose/stderr.log deleted file mode 100644 index 774ad6740f..0000000000 --- a/tests/cargo-upgrade/upgrade_verbose/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking None's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.term.svg b/tests/cargo-upgrade/upgrade_verbose/stderr.term.svg new file mode 100644 index 0000000000..0239411b36 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_verbose/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking None's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_verbose/stdout.log b/tests/cargo-upgrade/upgrade_verbose/stdout.log deleted file mode 100644 index 324448b777..0000000000 --- a/tests/cargo-upgrade/upgrade_verbose/stdout.log +++ /dev/null @@ -1,18 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -docopt 0.4 0.4.1 99999.0.0 99999.0 -pad 0.1 0.1.1 99999.0.0 99999.0 -serde_json 20.0 20.0.0 99999.0.0 99999.0 -syn 0.1.1 0.1.1 99999.0.0 99999.0.0 -tar 0.4 0.4.1 99999.0.0 99999.0 -ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 -toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 -semver 0.2 0.2.3 99999.0.0 99999.0 -renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 -assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 -tempdir 0.1 0.1.1 99999.0.0 99999.0 -serde 1.0 - - 1.0 -openssl 0.4 0.4.1 99999.0.0 99999.0 -rget 0.4.0 0.4.1 99999.0.0 99999.0.0 -geo 0.2.0 0.2.3 99999.0.0 99999.0.0 -ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_verbose/stdout.term.svg b/tests/cargo-upgrade/upgrade_verbose/stdout.term.svg new file mode 100644 index 0000000000..67791d9a76 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_verbose/stdout.term.svg @@ -0,0 +1,59 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + docopt 0.4 0.4.1 99999.0.0 99999.0 + + pad 0.1 0.1.1 99999.0.0 99999.0 + + serde_json 20.0 20.0.0 99999.0.0 99999.0 + + syn 0.1.1 0.1.1 99999.0.0 99999.0.0 + + tar 0.4 0.4.1 99999.0.0 99999.0 + + ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 + + toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + semver 0.2 0.2.3 99999.0.0 99999.0 + + renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 + + assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 + + tempdir 0.1 0.1.1 99999.0.0 99999.0 + + serde 1.0 - - 1.0 + + openssl 0.4 0.4.1 99999.0.0 99999.0 + + rget 0.4.0 0.4.1 99999.0.0 99999.0.0 + + geo 0.2.0 0.2.3 99999.0.0 99999.0.0 + + ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_workspace/mod.rs b/tests/cargo-upgrade/upgrade_workspace/mod.rs index 01b7001035..9bb2a22dd3 100644 --- a/tests/cargo-upgrade/upgrade_workspace/mod.rs +++ b/tests/cargo-upgrade/upgrade_workspace/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock b/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock +++ b/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/upgrade_workspace/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.term.svg b/tests/cargo-upgrade/upgrade_workspace/stderr.term.svg new file mode 100644 index 0000000000..9d3ea9de87 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_workspace/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_workspace/stdout.log b/tests/cargo-upgrade/upgrade_workspace/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/upgrade_workspace/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_workspace/stdout.term.svg b/tests/cargo-upgrade/upgrade_workspace/stdout.term.svg new file mode 100644 index 0000000000..d600778bd0 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_workspace/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/virtual_manifest/mod.rs b/tests/cargo-upgrade/virtual_manifest/mod.rs index dbdf0ba095..7122af4889 100644 --- a/tests/cargo-upgrade/virtual_manifest/mod.rs +++ b/tests/cargo-upgrade/virtual_manifest/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -24,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock b/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock +++ b/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/virtual_manifest/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.term.svg b/tests/cargo-upgrade/virtual_manifest/stderr.term.svg new file mode 100644 index 0000000000..9d3ea9de87 --- /dev/null +++ b/tests/cargo-upgrade/virtual_manifest/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/virtual_manifest/stdout.log b/tests/cargo-upgrade/virtual_manifest/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/virtual_manifest/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/virtual_manifest/stdout.term.svg b/tests/cargo-upgrade/virtual_manifest/stdout.term.svg new file mode 100644 index 0000000000..d600778bd0 --- /dev/null +++ b/tests/cargo-upgrade/virtual_manifest/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/workspace_inheritance/mod.rs b/tests/cargo-upgrade/workspace_inheritance/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/workspace_inheritance/mod.rs +++ b/tests/cargo-upgrade/workspace_inheritance/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock b/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock index cd11e50ad0..2b59bda009 100644 --- a/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock +++ b/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.log b/tests/cargo-upgrade/workspace_inheritance/stderr.log deleted file mode 100644 index 03abc410c3..0000000000 --- a/tests/cargo-upgrade/workspace_inheritance/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - local: three diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.term.svg b/tests/cargo-upgrade/workspace_inheritance/stderr.term.svg new file mode 100644 index 0000000000..e6b582bb17 --- /dev/null +++ b/tests/cargo-upgrade/workspace_inheritance/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + local: three + + + + + + diff --git a/tests/cargo-upgrade/workspace_inheritance/stdout.log b/tests/cargo-upgrade/workspace_inheritance/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/workspace_inheritance/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_inheritance/stdout.term.svg b/tests/cargo-upgrade/workspace_inheritance/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/workspace_inheritance/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_cwd/mod.rs b/tests/cargo-upgrade/workspace_member_cwd/mod.rs index a4fe4e0e43..e8cbb1f9e6 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/mod.rs +++ b/tests/cargo-upgrade/workspace_member_cwd/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("one"); @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock b/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock index cd11e50ad0..2b59bda009 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock +++ b/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log deleted file mode 100644 index 829a5b3842..0000000000 --- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - excluded: three diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg b/tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg new file mode 100644 index 0000000000..bace652a43 --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + excluded: three + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_cwd/stdout.log b/tests/cargo-upgrade/workspace_member_cwd/stdout.log deleted file mode 100644 index 2972c562ff..0000000000 --- a/tests/cargo-upgrade/workspace_member_cwd/stdout.log +++ /dev/null @@ -1,12 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg b/tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg new file mode 100644 index 0000000000..5e46dde1ca --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg @@ -0,0 +1,47 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs index da5588f09a..dc75cab38a 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs +++ b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("one"); @@ -24,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log deleted file mode 100644 index 829a5b3842..0000000000 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - excluded: three diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg new file mode 100644 index 0000000000..bace652a43 --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + excluded: three + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stdout.log b/tests/cargo-upgrade/workspace_member_manifest_path/stdout.log deleted file mode 100644 index fed12bf6af..0000000000 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stdout.log +++ /dev/null @@ -1,12 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg b/tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg new file mode 100644 index 0000000000..a516c67145 --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg @@ -0,0 +1,47 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + +