Skip to content

Commit 6caa8ff

Browse files
committed
accept integer target-pointer-width in compiletest
1 parent be42f3f commit 6caa8ff

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;
@@ -1077,7 +1076,7 @@ pub struct TargetCfg {
10771076
pub(crate) abi: String,
10781077
#[serde(rename = "target-family", default)]
10791078
pub(crate) families: Vec<String>,
1080-
#[serde(rename = "target-pointer-width", deserialize_with = "serde_parse_u32")]
1079+
#[serde(rename = "target-pointer-width")]
10811080
pub(crate) pointer_width: u32,
10821081
#[serde(rename = "target-endian", default)]
10831082
endian: Endian,
@@ -1187,11 +1186,6 @@ fn query_rustc_output(config: &Config, args: &[&str], envs: HashMap<String, Stri
11871186
String::from_utf8(output.stdout).unwrap()
11881187
}
11891188

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

0 commit comments

Comments
 (0)