From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 20:31:44 +0200 Subject: Merging upstream version 1.74.1+dfsg1. Signed-off-by: Daniel Baumann --- src/tools/cargo/tests/testsuite/config.rs | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'src/tools/cargo/tests/testsuite/config.rs') diff --git a/src/tools/cargo/tests/testsuite/config.rs b/src/tools/cargo/tests/testsuite/config.rs index 5d4163818..7078fc445 100644 --- a/src/tools/cargo/tests/testsuite/config.rs +++ b/src/tools/cargo/tests/testsuite/config.rs @@ -541,18 +541,18 @@ expected boolean, but found array", config.get::("b").unwrap(), VSOB::VecString(vec![ "b".to_string(), - "clib".to_string(), "env1".to_string(), - "env2".to_string() + "env2".to_string(), + "clib".to_string(), ]) ); assert_eq!( config.get::("c").unwrap(), VSOB::VecString(vec![ "c".to_string(), - "clic".to_string(), "e1".to_string(), - "e2".to_string() + "e2".to_string(), + "clic".to_string(), ]) ); } @@ -721,9 +721,6 @@ could not load Cargo configuration Caused by: could not parse TOML configuration in `[..]/.cargo/config` -Caused by: - could not parse input as TOML - Caused by: TOML parse error at line 1, column 5 | @@ -1090,9 +1087,6 @@ could not load Cargo configuration Caused by: could not parse TOML configuration in `[..]/.cargo/config` -Caused by: - could not parse input as TOML - Caused by: TOML parse error at line 3, column 1 | @@ -1582,12 +1576,12 @@ known-hosts = [ .as_ref() .unwrap(); assert_eq!(kh.len(), 4); - assert_eq!(kh[0].val, "example.org ..."); - assert_eq!(kh[0].definition, Definition::Path(foo_path.clone())); - assert_eq!(kh[1].val, "example.com ..."); + assert_eq!(kh[0].val, "example.com ..."); + assert_eq!(kh[0].definition, Definition::Path(root_path.clone())); + assert_eq!(kh[1].val, "example.net ..."); assert_eq!(kh[1].definition, Definition::Path(root_path.clone())); - assert_eq!(kh[2].val, "example.net ..."); - assert_eq!(kh[2].definition, Definition::Path(root_path.clone())); + assert_eq!(kh[2].val, "example.org ..."); + assert_eq!(kh[2].definition, Definition::Path(foo_path.clone())); assert_eq!(kh[3].val, "env-example"); assert_eq!( kh[3].definition, -- cgit v1.2.3