From 2f95a45d70d4b65626e1b0fb8b6ccdb133eca570 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Tue, 8 Sep 2020 15:42:27 +0000 Subject: [PATCH] deploy: c5bf1fcb748e9efe09064125b06202f2cf49ada6 --- rustdoc/abstutil/fn.path_all_edits.html | 2 +- rustdoc/abstutil/fn.path_all_raw_maps.html | 2 +- rustdoc/abstutil/fn.path_all_saves.html | 2 +- rustdoc/abstutil/fn.path_all_scenarios.html | 2 +- .../abstutil/fn.path_all_synthetic_maps.html | 2 +- rustdoc/abstutil/fn.path_camera_state.html | 2 +- rustdoc/abstutil/fn.path_edits.html | 2 +- rustdoc/abstutil/fn.path_popdat.html | 2 +- rustdoc/abstutil/fn.path_raw_map.html | 2 +- rustdoc/abstutil/fn.path_save.html | 2 +- rustdoc/abstutil/fn.path_scenario.html | 2 +- rustdoc/abstutil/fn.path_synthetic_map.html | 2 +- rustdoc/abstutil/index.html | 2 +- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- rustdoc/src/abstutil/lib.rs.html | 24 +++++++++++++------ .../game-3c7487281029702d/out/built.rs.html | 2 +- 16 files changed, 32 insertions(+), 22 deletions(-) diff --git a/rustdoc/abstutil/fn.path_all_edits.html b/rustdoc/abstutil/fn.path_all_edits.html index b10439e7be..6a14d5ed21 100644 --- a/rustdoc/abstutil/fn.path_all_edits.html +++ b/rustdoc/abstutil/fn.path_all_edits.html @@ -1 +1 @@ -abstutil::path_all_edits - Rust

[−][src]Function abstutil::path_all_edits

pub fn path_all_edits(map_name: &str) -> String
\ No newline at end of file +abstutil::path_all_edits - Rust

[−][src]Function abstutil::path_all_edits

pub fn path_all_edits(map_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_all_raw_maps.html b/rustdoc/abstutil/fn.path_all_raw_maps.html index acfe07bd58..34f1ff9fe4 100644 --- a/rustdoc/abstutil/fn.path_all_raw_maps.html +++ b/rustdoc/abstutil/fn.path_all_raw_maps.html @@ -1 +1 @@ -abstutil::path_all_raw_maps - Rust

[−][src]Function abstutil::path_all_raw_maps

pub fn path_all_raw_maps() -> String
\ No newline at end of file +abstutil::path_all_raw_maps - Rust

[−][src]Function abstutil::path_all_raw_maps

pub fn path_all_raw_maps() -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_all_saves.html b/rustdoc/abstutil/fn.path_all_saves.html index df87ef84c3..6cb0f07b9b 100644 --- a/rustdoc/abstutil/fn.path_all_saves.html +++ b/rustdoc/abstutil/fn.path_all_saves.html @@ -1 +1 @@ -abstutil::path_all_saves - Rust

[−][src]Function abstutil::path_all_saves

pub fn path_all_saves(
    map_name: &str, 
    edits_name: &str, 
    run_name: &str
) -> String
\ No newline at end of file +abstutil::path_all_saves - Rust

[−][src]Function abstutil::path_all_saves

pub fn path_all_saves(
    map_name: &str, 
    edits_name: &str, 
    run_name: &str
) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_all_scenarios.html b/rustdoc/abstutil/fn.path_all_scenarios.html index a23a83b3cd..8261b75f69 100644 --- a/rustdoc/abstutil/fn.path_all_scenarios.html +++ b/rustdoc/abstutil/fn.path_all_scenarios.html @@ -1 +1 @@ -abstutil::path_all_scenarios - Rust

[−][src]Function abstutil::path_all_scenarios

pub fn path_all_scenarios(map_name: &str) -> String
\ No newline at end of file +abstutil::path_all_scenarios - Rust

[−][src]Function abstutil::path_all_scenarios

pub fn path_all_scenarios(map_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_all_synthetic_maps.html b/rustdoc/abstutil/fn.path_all_synthetic_maps.html index 2755441caf..800683b2f1 100644 --- a/rustdoc/abstutil/fn.path_all_synthetic_maps.html +++ b/rustdoc/abstutil/fn.path_all_synthetic_maps.html @@ -1 +1 @@ -abstutil::path_all_synthetic_maps - Rust

[−][src]Function abstutil::path_all_synthetic_maps

pub fn path_all_synthetic_maps() -> String
\ No newline at end of file +abstutil::path_all_synthetic_maps - Rust

[−][src]Function abstutil::path_all_synthetic_maps

pub fn path_all_synthetic_maps() -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_camera_state.html b/rustdoc/abstutil/fn.path_camera_state.html index 5334f9ed8b..6677ffd8a5 100644 --- a/rustdoc/abstutil/fn.path_camera_state.html +++ b/rustdoc/abstutil/fn.path_camera_state.html @@ -1 +1 @@ -abstutil::path_camera_state - Rust

[−][src]Function abstutil::path_camera_state

pub fn path_camera_state(map_name: &str) -> String
\ No newline at end of file +abstutil::path_camera_state - Rust

[−][src]Function abstutil::path_camera_state

pub fn path_camera_state(map_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_edits.html b/rustdoc/abstutil/fn.path_edits.html index 5f3d6b4c7b..cd913747b5 100644 --- a/rustdoc/abstutil/fn.path_edits.html +++ b/rustdoc/abstutil/fn.path_edits.html @@ -1 +1 @@ -abstutil::path_edits - Rust

[−][src]Function abstutil::path_edits

pub fn path_edits(map_name: &str, edits_name: &str) -> String
\ No newline at end of file +abstutil::path_edits - Rust

[−][src]Function abstutil::path_edits

pub fn path_edits(map_name: &str, edits_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_popdat.html b/rustdoc/abstutil/fn.path_popdat.html index e761cf2d35..1447cd49a3 100644 --- a/rustdoc/abstutil/fn.path_popdat.html +++ b/rustdoc/abstutil/fn.path_popdat.html @@ -1 +1 @@ -abstutil::path_popdat - Rust

[−][src]Function abstutil::path_popdat

pub fn path_popdat() -> String
\ No newline at end of file +abstutil::path_popdat - Rust

[−][src]Function abstutil::path_popdat

pub fn path_popdat() -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_raw_map.html b/rustdoc/abstutil/fn.path_raw_map.html index 3414f52e11..d61227f672 100644 --- a/rustdoc/abstutil/fn.path_raw_map.html +++ b/rustdoc/abstutil/fn.path_raw_map.html @@ -1 +1 @@ -abstutil::path_raw_map - Rust

[−][src]Function abstutil::path_raw_map

pub fn path_raw_map(map_name: &str) -> String
\ No newline at end of file +abstutil::path_raw_map - Rust

[−][src]Function abstutil::path_raw_map

pub fn path_raw_map(map_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_save.html b/rustdoc/abstutil/fn.path_save.html index 4aeda10e0e..7147a94376 100644 --- a/rustdoc/abstutil/fn.path_save.html +++ b/rustdoc/abstutil/fn.path_save.html @@ -1 +1 @@ -abstutil::path_save - Rust

[−][src]Function abstutil::path_save

pub fn path_save(
    map_name: &str, 
    edits_name: &str, 
    run_name: &str, 
    time: String
) -> String
\ No newline at end of file +abstutil::path_save - Rust

[−][src]Function abstutil::path_save

pub fn path_save(
    map_name: &str, 
    edits_name: &str, 
    run_name: &str, 
    time: String
) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_scenario.html b/rustdoc/abstutil/fn.path_scenario.html index 4140bfc0e5..829d61aaff 100644 --- a/rustdoc/abstutil/fn.path_scenario.html +++ b/rustdoc/abstutil/fn.path_scenario.html @@ -1 +1 @@ -abstutil::path_scenario - Rust

[−][src]Function abstutil::path_scenario

pub fn path_scenario(map_name: &str, scenario_name: &str) -> String
\ No newline at end of file +abstutil::path_scenario - Rust

[−][src]Function abstutil::path_scenario

pub fn path_scenario(map_name: &str, scenario_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/fn.path_synthetic_map.html b/rustdoc/abstutil/fn.path_synthetic_map.html index a1c17f25bb..c6d5520c8b 100644 --- a/rustdoc/abstutil/fn.path_synthetic_map.html +++ b/rustdoc/abstutil/fn.path_synthetic_map.html @@ -1 +1 @@ -abstutil::path_synthetic_map - Rust

[−][src]Function abstutil::path_synthetic_map

pub fn path_synthetic_map(map_name: &str) -> String
\ No newline at end of file +abstutil::path_synthetic_map - Rust

[−][src]Function abstutil::path_synthetic_map

pub fn path_synthetic_map(map_name: &str) -> String
\ No newline at end of file diff --git a/rustdoc/abstutil/index.html b/rustdoc/abstutil/index.html index 6c7e2cc550..31654bc121 100644 --- a/rustdoc/abstutil/index.html +++ b/rustdoc/abstutil/index.html @@ -1,4 +1,4 @@ -abstutil - Rust

[−][src]Crate abstutil

Modules

+abstutil - Rust

[−][src]Crate abstutil

Modules

cli
collections
io
random
time

Structs

CmdArgs
Counter
FileWithProgress
MultiMap
Profiler
ROOT_DIR
ROOT_PLAYER_DIR
Tags
Timer
VecMap
WeightedUsizeChoice

Enums

Parallelism

Constants

diff --git a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html index fd20d57c27..b161ebfcc3 100644 --- a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html @@ -1,2 +1,2 @@ -game::pregame::built_info::BUILT_TIME_UTC - Rust

[−][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Mon, 07 Sep 2020 18:07:14 +0000";

The built-time in RFC2822, UTC

+game::pregame::built_info::BUILT_TIME_UTC - Rust

[−][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Tue, 08 Sep 2020 15:40:14 +0000";

The built-time in RFC2822, UTC

\ No newline at end of file diff --git a/rustdoc/src/abstutil/lib.rs.html b/rustdoc/src/abstutil/lib.rs.html index a8a7691881..0423504282 100644 --- a/rustdoc/src/abstutil/lib.rs.html +++ b/rustdoc/src/abstutil/lib.rs.html @@ -181,6 +181,11 @@ 181 182 183 +184 +185 +186 +187 +188 
 mod cli;
 mod collections;
@@ -303,18 +308,23 @@
 }
 
 pub fn path_scenario(map_name: &str, scenario_name: &str) -> String {
-    // TODO Getting complicated. Looks for .bin, then .json.
-    let p = path(format!(
+    // TODO Getting complicated. Sometimes we're trying to load, so we should look for .bin, then
+    // .json. But when we're writing a custom scenario, we actually want to write a .bin.
+    let bin = path(format!(
         "system/scenarios/{}/{}.bin",
         map_name, scenario_name
     ));
-    if file_exists(&p) {
-        return p;
-    }
-    path(format!(
+    let json = path(format!(
         "system/scenarios/{}/{}.json",
         map_name, scenario_name
-    ))
+    ));
+    if file_exists(&bin) {
+        return bin;
+    }
+    if file_exists(&json) {
+        return json;
+    }
+    bin
 }
 pub fn path_all_scenarios(map_name: &str) -> String {
     path(format!("system/scenarios/{}", map_name))
diff --git a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html
index 339a2dfde6..f4cde4f064 100644
--- a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html
+++ b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html
@@ -111,7 +111,7 @@
 /// The output of `rustdoc -V`
 pub const RUSTDOC_VERSION: &str = "rustdoc 1.46.0 (04488afe3 2020-08-24)";
 /// The built-time in RFC2822, UTC
-pub const BUILT_TIME_UTC: &str = "Mon, 07 Sep 2020 18:07:14 +0000";
+pub const BUILT_TIME_UTC: &str = "Tue, 08 Sep 2020 15:40:14 +0000";
 /// The target architecture, given by `cfg!(target_arch)`.
 pub const CFG_TARGET_ARCH: &str = "x86_64";
 /// The endianness, given by `cfg!(target_endian)`.