-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #87948 - JohnTitor:rollup-efmgyl8, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #85835 (Implement Extend<(A, B)> for (Extend<A>, Extend<B>)) - #87671 (Warn when an escaped newline skips multiple lines) - #87878 (:arrow_up: rust-analyzer) - #87903 (Reduce verbosity of tracing output of RUSTC_LOG) - #87925 (Update books) - #87928 (Update cargo) - #87942 (set the executable bit on pre-commit.sh) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
19 changed files
with
138 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule nomicon
updated
4 files
+1 −18 | src/ffi.md | |
+2 −0 | src/intro.md | |
+10 −8 | src/lifetime-elision.md | |
+1 −5 | src/panic-handler.md |
Submodule reference
updated
3 files
+1 −1 | src/expressions/array-expr.md | |
+3 −0 | src/patterns.md | |
+2 −0 | src/type-coercions.md |
Submodule rustc-dev-guide
updated
5 files
+13 −0 | src/backend/debugging.md | |
+8 −6 | src/building/new-target.md | |
+6 −0 | src/compiler-team.md | |
+1 −1 | src/git.md | |
+2 −2 | src/stability.md |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// check-pass | ||
fn main() { | ||
let s = "\ | ||
"; | ||
//~^^^ WARNING multiple lines skipped by escaped newline | ||
let s = "foo\ | ||
bar | ||
"; | ||
//~^^^ WARNING non-ASCII whitespace symbol '\u{a0}' is not skipped | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
warning: multiple lines skipped by escaped newline | ||
--> $DIR/str-escape.rs:3:14 | ||
| | ||
LL | let s = "\ | ||
| ______________^ | ||
LL | | | ||
LL | | "; | ||
| |_____________^ skipping everything up to and including this point | ||
|
||
warning: non-ASCII whitespace symbol '\u{a0}' is not skipped | ||
--> $DIR/str-escape.rs:7:17 | ||
| | ||
LL | let s = "foo\ | ||
| _________________^ | ||
LL | | bar | ||
| | ^ non-ASCII whitespace symbol '\u{a0}' is not skipped | ||
| |___| | ||
| | ||
|
||
warning: 2 warnings emitted | ||
|
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 |
Submodule rust-analyzer
updated
from ea105f to 5664a2