Auto merge of #13393 - weihanglo:beta-backport, r=ehuss

[beta-1.77.0] Fix panic on empty spans when parsing Cargo.toml

Beta backports:

- <#13375>
- <#13376>

In order to make CI pass, the following PRs are also cherry-picked:

- <#13362>

Author: bors

Cargo.lock

@@ -96,8 +96,8 @@ tar = { version = "0.4.40", default-features = false }
 tempfile = "3.9.0"
 thiserror = "1.0.56"
 time = { version = "0.3", features = ["parsing", "formatting", "serde"] }
-toml = "0.8.8"
-toml_edit = { version = "0.21.0", features = ["serde"] }
+toml = "0.8.9"
+toml_edit = { version = "0.21.1", features = ["serde"] }
 tracing = "0.1.37" # be compatible with rustc_log: https://github.com/rust-lang/rust/blob/e51e98dde6a/compiler/rustc_log/Cargo.toml#L9
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 unicase = "2.7.0"

Cargo.toml

@@ -121,7 +121,7 @@ fn read_manifest_from_str(
                 .rfind('\n')
                 .map(|s| s + 1)
                 .unwrap_or(0);
-            let source_end = contents[span.end - 1..]
+            let source_end = contents[span.end.saturating_sub(1)..]
                 .find('\n')
                 .map(|s| s + span.end)
                 .unwrap_or(contents.len());

src/cargo/util/toml/mod.rs

@@ -155,7 +155,7 @@ fn cross_custom() {
             r#"
             {
                 "llvm-target": "x86_64-unknown-none-gnu",
-                "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+                "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
                 "arch": "x86_64",
                 "target-endian": "little",
                 "target-pointer-width": "64",
@@ -196,7 +196,7 @@ fn custom_test_framework() {
             r#"
             {
                 "llvm-target": "x86_64-unknown-none-gnu",
-                "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+                "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
                 "arch": "x86_64",
                 "target-endian": "little",
                 "target-pointer-width": "64",

tests/build-std/main.rs

@@ -22,7 +22,7 @@ pub trait Copy {
 const SIMPLE_SPEC: &str = r#"
 {
     "llvm-target": "x86_64-unknown-none-gnu",
-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
     "arch": "x86_64",
     "target-endian": "little",
     "target-pointer-width": "64",

tests/testsuite/custom_target.rs

@@ -0,0 +1,32 @@
+use cargo_test_support::project;
+
+#[cargo_test]
+fn dont_panic_on_render() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+[package]
+name = "foo"
+version = "0.1.0"
+edition = "2021"
+[[bench.foo]]
+"#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("check")
+        .with_status(101)
+        .with_stderr(
+            "\
+error: invalid type: map, expected a sequence
+ --> Cargo.toml:6:3
+  |
+6 | [[bench.foo]]
+  |   ^^^^^
+  |
+",
+        )
+        .run();
+}

tests/testsuite/diagnostics.rs

@@ -79,6 +79,7 @@ mod cross_publish;
 mod custom_target;
 mod death;
 mod dep_info;
+mod diagnostics;
 mod direct_minimal_versions;
 mod directory;
 mod doc;