Skip to content

Commit aa0887b

Browse files
committed
accept integer target-pointer-width in compiletest
1 parent 1f7efab commit aa0887b

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/tools/compiletest/src/common.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::sync::OnceLock;
66
use build_helper::git::GitConfig;
77
use camino::{Utf8Path, Utf8PathBuf};
88
use semver::Version;
9-
use serde::de::{Deserialize, Deserializer, Error as _};
109

1110
use crate::executor::{ColorConfig, OutputFormat};
1211
use crate::fatal;
@@ -1080,7 +1079,7 @@ pub struct TargetCfg {
10801079
pub(crate) abi: String,
10811080
#[serde(rename = "target-family", default)]
10821081
pub(crate) families: Vec<String>,
1083-
#[serde(rename = "target-pointer-width", deserialize_with = "serde_parse_u32")]
1082+
#[serde(rename = "target-pointer-width")]
10841083
pub(crate) pointer_width: u32,
10851084
#[serde(rename = "target-endian", default)]
10861085
endian: Endian,
@@ -1190,11 +1189,6 @@ fn query_rustc_output(config: &Config, args: &[&str], envs: HashMap<String, Stri
11901189
String::from_utf8(output.stdout).unwrap()
11911190
}
11921191

1193-
fn serde_parse_u32<'de, D: Deserializer<'de>>(deserializer: D) -> Result<u32, D::Error> {
1194-
let string = String::deserialize(deserializer)?;
1195-
string.parse().map_err(D::Error::custom)
1196-
}
1197-
11981192
#[derive(Debug, Clone)]
11991193
pub struct TestPaths {
12001194
pub file: Utf8PathBuf, // e.g., compile-test/foo/bar/baz.rs

0 commit comments

Comments
 (0)