diff options
| author | Waffle Lapkin <waffle.lapkin@gmail.com> | 2025-07-25 11:28:37 +0200 |
|---|---|---|
| committer | Waffle Lapkin <waffle.lapkin@gmail.com> | 2025-08-27 23:44:49 +0200 |
| commit | 1f7efabdc6204b3a1cc9bfe612136f848f643949 (patch) | |
| tree | 84dac97570792c7670b33ff6e19d3b092912b564 /compiler/rustc_target/src | |
| parent | c7e1885075b3ac9c3f3c0553dbf813f0d44d18e7 (diff) | |
| download | rust-1f7efabdc6204b3a1cc9bfe612136f848f643949.tar.gz rust-1f7efabdc6204b3a1cc9bfe612136f848f643949.zip | |
turn pointer width into an integer in target.json
Diffstat (limited to 'compiler/rustc_target/src')
| -rw-r--r-- | compiler/rustc_target/src/spec/json.rs | 7 | ||||
| -rw-r--r-- | compiler/rustc_target/src/spec/mod.rs | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs index 2ea7c4df881..e9ae5734d5b 100644 --- a/compiler/rustc_target/src/spec/json.rs +++ b/compiler/rustc_target/src/spec/json.rs @@ -25,10 +25,7 @@ impl Target { let mut base = Target { llvm_target: json.llvm_target, metadata: Default::default(), - pointer_width: json - .target_pointer_width - .parse() - .map_err(|err| format!("invalid target-pointer-width: {err}"))?, + pointer_width: json.target_pointer_width, data_layout: json.data_layout, arch: json.arch, options: Default::default(), @@ -461,7 +458,7 @@ struct TargetSpecJsonMetadata { #[serde(deny_unknown_fields)] struct TargetSpecJson { llvm_target: StaticCow<str>, - target_pointer_width: String, + target_pointer_width: u16, data_layout: StaticCow<str>, arch: StaticCow<str>, diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index c53d92bee9d..7873f03eb29 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -2327,7 +2327,7 @@ pub struct Target { /// Used for generating target documentation. pub metadata: TargetMetadata, /// Number of bits in a pointer. Influences the `target_pointer_width` `cfg` variable. - pub pointer_width: u32, + pub pointer_width: u16, /// Architecture to use for ABI considerations. Valid options include: "x86", /// "x86_64", "arm", "aarch64", "mips", "powerpc", "powerpc64", and others. pub arch: StaticCow<str>, |