Skip to content

Rollup of 7 pull requests #87948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 22 commits into from
Aug 12, 2021
Merged

Rollup of 7 pull requests #87948

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5056844
Implement Extend<(A, B)> for (impl Extend<A>, impl Extend<B>)
Seppel3210 May 30, 2021
b5e9275
Rewrite Iterator::unzip in terms of (A, B)::extend
Seppel3210 May 30, 2021
c8f5d6d
Merge branch 'master' of https://github.com/rust-lang/rust
Seppel3210 Jun 12, 2021
96b7d07
Mention nested unzip in its documentation
Seppel3210 Jun 14, 2021
7b90759
Add documentation/example to Extend impl
Seppel3210 Jun 20, 2021
3d0c5d0
Update library/core/src/iter/traits/collect.rs
yaahc Aug 3, 2021
d323063
:arrow_up: rust-analyzer
lnicola Aug 9, 2021
62b8a5e
Reduce verbosity of RUSTC_LOG
jackh726 Aug 10, 2021
107ed0a
Update books
ehuss Aug 10, 2021
e62cd40
Update cargo
ehuss Aug 10, 2021
a03fbfe
Warn when an escaped newline skips multiple lines
jesyspa Jul 31, 2021
2dff700
Update format string tests to explicitly escape multiple newlines
jesyspa Jul 31, 2021
efe069c
Add UI tests for string escape warnings.
jesyspa Aug 11, 2021
07aacf5
Renamed variable str -> tail for clarity
jesyspa Aug 11, 2021
a0103e5
set the executable bit on pre-commit.sh
oconnor663 Aug 11, 2021
688094b
Rollup merge of #85835 - Seppel3210:master, r=yaahc
JohnTitor Aug 12, 2021
53a66ac
Rollup merge of #87671 - jesyspa:issue-87319-multiple-newlines, r=est…
JohnTitor Aug 12, 2021
8fe868d
Rollup merge of #87878 - lnicola:rust-analyzer-2021-08-09, r=lnicola
JohnTitor Aug 12, 2021
4c632d9
Rollup merge of #87903 - jackh726:logging-cleanup, r=oli-obk
JohnTitor Aug 12, 2021
9775e88
Rollup merge of #87925 - ehuss:update-books, r=ehuss
JohnTitor Aug 12, 2021
12117e3
Rollup merge of #87928 - ehuss:update-cargo, r=ehuss
JohnTitor Aug 12, 2021
334f09b
Rollup merge of #87942 - oconnor663:pre_commit_exec, r=jyn514
JohnTitor Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update cargo
  • Loading branch information
@ehuss
ehuss committed Aug 10, 2021
commit e62cd4040eb97f7fa9b3b094a82ce0e18f41832a
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ dependencies = [

[[package]]
name = "cargo-platform"
version = "0.1.1"
version = "0.1.2"
dependencies = [
"serde",
]
Expand Down Expand Up @@ -1723,9 +1723,9 @@ checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"

[[package]]
name = "jobserver"
version = "0.1.22"
version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
checksum = "f5ca711fd837261e14ec9e674f092cbb931d3fa1482b017ae59328ddc6f3212b"
dependencies = [
"libc",
]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 21 files
+2 −2 Cargo.toml
+1 −1 crates/cargo-platform/Cargo.toml
+45 −11 crates/cargo-test-support/src/lib.rs
+6 −3 src/bin/cargo/cli.rs
+35 −31 src/bin/cargo/main.rs
+6 −6 src/cargo/core/compiler/context/mod.rs
+5 −0 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/output_depinfo.rs
+3 −0 src/cargo/core/features.rs
+8 −0 src/cargo/core/profiles.rs
+5 −7 src/cargo/ops/cargo_config.rs
+11 −13 src/cargo/ops/cargo_install.rs
+7 −9 src/cargo/sources/registry/index.rs
+6 −13 src/cargo/util/command_prelude.rs
+5 −7 src/cargo/util/config/target.rs
+32 −4 src/cargo/util/toml/mod.rs
+1 −1 src/doc/src/reference/pkgid-spec.md
+1 −1 src/doc/src/reference/semver.md
+18 −0 src/doc/src/reference/unstable.md
+47 −69 tests/testsuite/cargo_command.rs
+124 −118 tests/testsuite/unit_graph.rs