Skip to content

Commit

Permalink
Rollup merge of rust-lang#104915 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history
Update cargo

5 commits in ba607b23db8398723d659249d9abf5536bc322e5..e027c4b5d25af2119b1956fac42863b9b3242744 2022-11-22 20:52:39 +0000 to 2022-11-25 19:44:46 +0000

- fix: Move off atty to resolve soundness issue (rust-lang/cargo#11420)
- add newline char to `cargo install .` error message for easier reading. (rust-lang/cargo#11401)
- chore: Upgrade to env_logger (rust-lang/cargo#11417)
- Change rustdoc-scrape-examples to be a target-level configuration (rust-lang/cargo#10343)
- temporarily disable test `lto::test_profile` (rust-lang/cargo#11419)

r+ `@ghost`
  • Loading branch information
matthiaskrgr authored Nov 26, 2022
2 parents 3e01b53 + 083d6eb commit 854ef22
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 3 deletions.
80 changes: 78 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ name = "cargo"
version = "0.68.0"
dependencies = [
"anyhow",
"atty",
"bytesize",
"cargo-platform 0.1.2",
"cargo-test-macro",
Expand All @@ -298,7 +297,7 @@ dependencies = [
"crates-io",
"curl",
"curl-sys",
"env_logger 0.9.0",
"env_logger 0.10.0",
"filetime",
"flate2",
"fwdansi",
Expand All @@ -312,6 +311,7 @@ dependencies = [
"ignore",
"im-rc",
"indexmap",
"is-terminal",
"itertools",
"jobserver",
"lazy_static",
Expand Down Expand Up @@ -1213,6 +1213,40 @@ dependencies = [
"termcolor",
]

[[package]]
name = "env_logger"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
"humantime 2.0.1",
"is-terminal",
"log",
"regex",
"termcolor",
]

[[package]]
name = "errno"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
dependencies = [
"errno-dragonfly",
"libc",
"winapi",
]

[[package]]
name = "errno-dragonfly"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
"cc",
"libc",
]

[[package]]
name = "error_index_generator"
version = "0.0.0"
Expand Down Expand Up @@ -1907,6 +1941,28 @@ dependencies = [
"unic-langid",
]

[[package]]
name = "io-lifetimes"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656"
dependencies = [
"libc",
"windows-sys",
]

[[package]]
name = "is-terminal"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d"
dependencies = [
"hermit-abi 0.2.6",
"io-lifetimes",
"rustix",
"windows-sys",
]

[[package]]
name = "itertools"
version = "0.10.5"
Expand Down Expand Up @@ -2116,6 +2172,12 @@ dependencies = [
"walkdir",
]

[[package]]
name = "linux-raw-sys"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"

[[package]]
name = "litemap"
version = "0.6.0"
Expand Down Expand Up @@ -4508,6 +4570,20 @@ dependencies = [
"unicode_categories",
]

[[package]]
name = "rustix"
version = "0.36.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
"windows-sys",
]

[[package]]
name = "rustversion"
version = "1.0.5"
Expand Down

0 comments on commit 854ef22

Please sign in to comment.