Make compatible with latest cargo deps

2022-01-30 17:47:57 +00:00
parent dfe2c60646
commit 417fe35e91
14 changed files with 196 additions and 74 deletions
--- a/tests/meson.build
+++ b/tests/meson.build
@ -107,15 +107,8 @@ foreach layout : [
        extra += ['allow_missing_return']
    endif
    
-    # Older Cargo seens to be sensitive to something
-    # about the RUST_FLAGS env var, and rebuilds all tests when it's set,
-    # increasing test time by 2 orders of magnitude.
-    # Let it have its way.
-    if get_option('legacy') == true
-        timeout = 300
-    else
-        timeout = 30
-    endif
+    timeout = 30
+
    test(
        'test_layout_' + layout,
        cargo_script,