Skip to content

Commit 0afec14

Browse files
committed
Fix compile failures
1 parent f57785d commit 0afec14

File tree

7 files changed

+25
-12
lines changed

7 files changed

+25
-12
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- 1.67.1
77
- rust-1.69.0
88
- rust-1.70.0
9+
- rust-1.71.0
910
pull_request:
1011
branches:
1112
- 1.67.1
1213
- rust-1.69.0
1314
- rust-1.70.0
15+
- rust-1.71.0
1416

1517
jobs:
1618
test_x86_84:
@@ -112,7 +114,7 @@ jobs:
112114
export RUSTUP_HOME="$HOME/.rustup"
113115
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
114116
source "$HOME/.cargo/env"
115-
rustup toolchain install 1.70.0
117+
rustup toolchain install 1.71.0
116118
cargo --version
117119
118120
- name: Print env

library/std/src/sys/postgres/fs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ pub struct FileTimes();
3131
impl FileTimes {
3232
pub fn set_accessed(&mut self, _t: SystemTime) {}
3333
pub fn set_modified(&mut self, _t: SystemTime) {}
34+
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))]
35+
pub fn set_created(&mut self, t: SystemTime) {}
3436
}
3537

3638
pub struct ReadDir(!);

library/std/src/sys/postgres/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ pub mod thread;
2424
#[cfg(target_thread_local)]
2525
pub mod thread_local_dtor;
2626
pub mod thread_local_key;
27+
#[path = "../unix/thread_parking/mod.rs"]
28+
pub mod thread_parking;
2729
pub mod time;
2830

2931
mod common;

library/std/src/sys/postgres/time.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ use crate::prelude::rust_2021::*;
44
use crate::sys::cvt_unsup;
55
use crate::time::Duration;
66

7+
#[allow(dead_code)]
8+
pub const TIMESPEC_MAX: libc::timespec =
9+
libc::timespec { tv_sec: <libc::time_t>::MAX, tv_nsec: 1_000_000_000 - 1 };
10+
711
const NSEC_PER_SEC: u64 = 1_000_000_000;
812

913
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]

library/std/src/sys/unix/thread_parking/mod.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
//! Thread parking on systems without futex support.
22
3-
#![cfg(not(any(
4-
target_os = "linux",
5-
target_os = "android",
6-
all(target_os = "emscripten", target_feature = "atomics"),
7-
target_os = "freebsd",
8-
target_os = "openbsd",
9-
target_os = "dragonfly",
10-
target_os = "fuchsia",
11-
)))]
3+
#![cfg(any(
4+
target_family = "postgres",
5+
not(any(
6+
target_os = "linux",
7+
target_os = "android",
8+
all(target_os = "emscripten", target_feature = "atomics"),
9+
target_os = "freebsd",
10+
target_os = "openbsd",
11+
target_os = "dragonfly",
12+
target_os = "fuchsia",
13+
))
14+
))]
1215

1316
cfg_if::cfg_if! {
1417
if #[cfg(all(

run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ run_build() {
9292
-Zbinary-dep-depinfo \
9393
--release \
9494
--features "compiler-builtins-mem" \
95-
--manifest-path "library/test/Cargo.toml"
95+
--manifest-path "library/sysroot/Cargo.toml"
9696
done
9797
}
9898

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "1.70.0"
2+
channel = "1.71.0"
33
components = [ "rustfmt" ]
44
targets = [ ]
55
profile = "minimal"

0 commit comments

Comments
 (0)