Skip to content

Commit cec97cb

Browse files
committed
Auto merge of #732 - workingjubilee:exclude-flakes-found-in-beta-1.81, r=Mark-Simulacrum
Exclude flakes found in beta 1.81 Details found in rust-lang/rust#128899
2 parents f2a10b4 + 8b56ef5 commit cec97cb

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Cargo.lock

+12-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.toml

+4
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,14 @@ fe_session = { skip-tests = true } # flaky test
6464
feed = { skip-tests = true } # flaky test
6565
fftw = { slow = true } # build time close to 2 minutes
6666
fine_grained = { skip-tests = true } # flaky tests
67+
gaffer = { skip-tests = true } # flaky tests (timing-dependent)
6768
gcc = { skip-tests = true } # flaky test
6869
gear = { skip = true } # flaky build
6970
geocode = { skip-tests = true } # depends on network
7071
glib = { slow = true } # tests slow to run
7172
guerrilla = { skip-tests = true } # flaky tests
7273
hashconsing = { skip-tests = true } # flaky test
74+
hopscotch = { skip-tests = true } # flaky tests (quickcheck + inconsistent ords)
7375
hyperdav = { skip-tests = true } # relies on an external service
7476
idx = { skip-tests = true } # depends on filesystem
7577
image-stream = { skip-tests = true } # depends on network
@@ -117,6 +119,7 @@ treeflection = { skip-tests = true } # flaky test
117119
update_rate = { skip-tests = true } # flaky tests
118120
urdf-viz = { skip = true } # flaky build
119121
vidar = { skip-tests = true } # flaky test
122+
workpool = { skip-tests = true } # flaky tests (timing + thread::sleep in pool::collect_into_vec tests)
120123
carboxyl_time = { skip-tests = true } # flaky test (timing)
121124
cobalt = { skip-tests = true } # flaky test (timing)
122125
conduit-hyper = { skip-tests = true } # flaky test (timing)
@@ -165,6 +168,7 @@ rustc_get_version = { skip = true } # does not build on beta
165168
"fromheten/plato" = { skip-tests = true } # flaky tests
166169
"jafow/pals" = { skip-tests = true } # flaky tests
167170
"johnedmonds/chance" = { skip-tests = true } # flaky tests
171+
"lht102/coding-problems-practice" = { skip-tests = true } # version-dependent tests (sort_unstable_by ordering)
168172
"LukeMathWalker/tracing-bunyan-formatter" = { skip-tests = true } # flaky tests
169173
"nilsmartel/act" = { skip-tests = true } # flaky tests
170174
"nt-ca-aqe/kitchen-kata-async-rust" = { skip-tests = true } # flaky tests

src/utils/disk_usage.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn current_mount() -> Fallible<Filesystem> {
3838
let system = System::new();
3939

4040
let mut found = None;
41-
let mut found_pos = std::usize::MAX;
41+
let mut found_pos = usize::MAX;
4242
for mount in system.mounts()?.into_iter() {
4343
let path = Path::new(&mount.fs_mounted_on);
4444
for (i, ancestor) in current_dir.ancestors().enumerate() {

0 commit comments

Comments
 (0)