diff --git a/Cargo.toml b/Cargo.toml index 604df2968ee..8a9d9b7602d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ strip-ansi-escapes = "0.1.0" tar = { version = "0.4.18", default-features = false } tempfile = "3.0" termcolor = "1.0" -toml = "0.5.0" +toml = "0.5.3" url = { version = "2.0", features = ['serde'] } walkdir = "2.2" clap = "2.31.2" diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs index e6dd6610ece..ccc318e969e 100644 --- a/tests/testsuite/bad_config.rs +++ b/tests/testsuite/bad_config.rs @@ -222,7 +222,7 @@ Caused by: could not parse input as TOML Caused by: - expected an equals, found eof at line 1 + expected an equals, found eof at line 1 column 2 ", ) .run(); @@ -465,7 +465,7 @@ Caused by: could not parse input as TOML Caused by: - expected a table key, found a newline at line 8 + expected a table key, found a newline at line 8 column 23 ", ) .run(); diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index c80e528dfae..b351c2cf102 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -188,7 +188,7 @@ Caused by: could not parse input as TOML Caused by: - invalid number at line 3 + invalid number at line 3 column 19 ", ) .run(); @@ -208,7 +208,7 @@ Caused by: could not parse input as TOML Caused by: - invalid number at line 1 + invalid number at line 1 column 5 ", ) .run(); @@ -2274,7 +2274,7 @@ Caused by: could not parse input as TOML Caused by: - expected an equals, found an identifier at line 1 + expected an equals, found an identifier at line 1 column 6 ", ) .run(); diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs index 01f79271a92..5f3cd76c38b 100644 --- a/tests/testsuite/config.rs +++ b/tests/testsuite/config.rs @@ -439,7 +439,7 @@ Caused by: Caused by: could not parse input as TOML Caused by: - expected an equals, found eof at line 1", + expected an equals, found eof at line 1 column 5", ); } @@ -517,7 +517,7 @@ expected a list, but found a integer for `l3` in [..]/.cargo/config", assert_error( config.get::("bad-env").unwrap_err(), "error in environment variable `CARGO_BAD_ENV`: \ - could not parse TOML list: invalid number at line 1", + could not parse TOML list: invalid number at line 1 column 10", ); // Try some other sequence-like types. diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 9762ea9c95c..1e62ef0dfb2 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -2439,7 +2439,7 @@ fn invalid_git_dependency_manifest() { could not parse input as TOML\n\ \n\ Caused by:\n \ - duplicate key: `categories` for key `project`", + duplicate key: `categories` for key `project` at line 10 column 17", path2url(&git_root), path2url(&git_root), )) diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs index 35ec7a52e75..3722fa12b87 100644 --- a/tests/testsuite/workspaces.rs +++ b/tests/testsuite/workspaces.rs @@ -1001,7 +1001,7 @@ failed to parse manifest at `[..]foo/Cargo.toml` Caused by: could not parse input as TOML Caused by: - expected an equals, found eof at line 1 + expected an equals, found eof at line 1 column 5 Created binary (application) `bar` package ", )