From e2a2de95df3ec65970742f25da6546ddea9806b6 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Thu, 29 Oct 2020 23:41:11 +0000 Subject: [PATCH] deploy: 57bb97ced0f7e4d11f3959a84ad13c4b9250cdea --- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- .../game-e352710d4e950423/out/built.rs.html | 2 +- rustdoc/src/widgetry/app_state.rs.html | 20 +++++++++++++------ .../app_state/enum.DrawBaselayer.html | 2 +- .../widgetry/app_state/enum.Transition.html | 2 +- rustdoc/widgetry/app_state/index.html | 2 +- rustdoc/widgetry/app_state/struct.App.html | 2 +- rustdoc/widgetry/app_state/trait.State.html | 2 +- rustdoc/widgetry/enum.DrawBaselayer.html | 2 +- rustdoc/widgetry/enum.Transition.html | 2 +- rustdoc/widgetry/trait.State.html | 2 +- 11 files changed, 24 insertions(+), 16 deletions(-) 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 dedfeb502d..c999d4eb81 100644 --- a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html @@ -1,3 +1,3 @@ game::pregame::built_info::BUILT_TIME_UTC - Rust

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

pub const BUILT_TIME_UTC: &str = "Thu, 29 Oct 2020 23:10:43 +0000";

The built-time in RFC2822, UTC

+ Change settings

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

pub const BUILT_TIME_UTC: &str = "Thu, 29 Oct 2020 23:38:44 +0000";

The built-time in RFC2822, UTC

\ No newline at end of file diff --git a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-e352710d4e950423/out/built.rs.html b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-e352710d4e950423/out/built.rs.html index 777f660aca..3a9c4b7149 100644 --- a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-e352710d4e950423/out/built.rs.html +++ b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-e352710d4e950423/out/built.rs.html @@ -112,7 +112,7 @@ /// The output of `rustdoc -V` pub const RUSTDOC_VERSION: &str = "rustdoc 1.47.0 (18bf6b4f0 2020-10-07)"; /// The built-time in RFC2822, UTC -pub const BUILT_TIME_UTC: &str = "Thu, 29 Oct 2020 23:10:43 +0000"; +pub const BUILT_TIME_UTC: &str = "Thu, 29 Oct 2020 23:38:44 +0000"; /// The target architecture, given by `cfg!(target_arch)`. pub const CFG_TARGET_ARCH: &str = "x86_64"; /// The endianness, given by `cfg!(target_endian)`. diff --git a/rustdoc/src/widgetry/app_state.rs.html b/rustdoc/src/widgetry/app_state.rs.html index 852ca28d51..03f42cdc4a 100644 --- a/rustdoc/src/widgetry/app_state.rs.html +++ b/rustdoc/src/widgetry/app_state.rs.html @@ -191,6 +191,10 @@ 190 191 192 +193 +194 +195 +196 
 //! A widgetry application splits its state into two pieces: global shared state that lasts for the
 //! entire lifetime of the application, and a stack of smaller states, only one of which is active
@@ -269,13 +273,17 @@
             Transition::Keep => false,
             Transition::KeepWithMouseover => true,
             Transition::Pop => {
-                self.states
-                    .pop()
-                    .unwrap()
-                    .on_destroy(ctx, &mut self.shared_app_state);
+                let mut state = self.states.pop().unwrap();
+                state.on_destroy(ctx, &mut self.shared_app_state);
                 if self.states.is_empty() {
-                    self.shared_app_state.before_quit(ctx.canvas);
-                    std::process::exit(0);
+                    if cfg!(target_arch = "wasm32") {
+                        // Just kidding, don't actually leave.
+                        self.states.push(state);
+                    // TODO Once PopupMsg is lifted here, add an explanation
+                    } else {
+                        self.shared_app_state.before_quit(ctx.canvas);
+                        std::process::exit(0);
+                    }
                 }
                 true
             }
diff --git a/rustdoc/widgetry/app_state/enum.DrawBaselayer.html b/rustdoc/widgetry/app_state/enum.DrawBaselayer.html
index 158f1b23c1..c69005a332 100644
--- a/rustdoc/widgetry/app_state/enum.DrawBaselayer.html
+++ b/rustdoc/widgetry/app_state/enum.DrawBaselayer.html
@@ -1,5 +1,5 @@
 widgetry::app_state::DrawBaselayer - Rust
[−][src]Enum widgetry::app_state::DrawBaselayer
pub enum DrawBaselayer {
+                Change settings
[−][src]Enum widgetry::app_state::DrawBaselayer
pub enum DrawBaselayer {
     DefaultDraw,
     Custom,
     PreviousState,
diff --git a/rustdoc/widgetry/app_state/enum.Transition.html b/rustdoc/widgetry/app_state/enum.Transition.html
index 46e7162786..722c578663 100644
--- a/rustdoc/widgetry/app_state/enum.Transition.html
+++ b/rustdoc/widgetry/app_state/enum.Transition.html
@@ -1,5 +1,5 @@
 widgetry::app_state::Transition - Rust
[−][src]Enum widgetry::app_state::Transition
pub enum Transition<A> {
+                Change settings
[−][src]Enum widgetry::app_state::Transition
pub enum Transition<A> {
     Keep,
     KeepWithMouseover,
     Pop,
diff --git a/rustdoc/widgetry/app_state/index.html b/rustdoc/widgetry/app_state/index.html
index 5a24f63669..30bf47e173 100644
--- a/rustdoc/widgetry/app_state/index.html
+++ b/rustdoc/widgetry/app_state/index.html
@@ -1,5 +1,5 @@
 widgetry::app_state - Rust
[−][src]Module widgetry::app_state
A widgetry application splits its state into two pieces: global shared state that lasts for the
+                Change settings
[−][src]Module widgetry::app_state
A widgetry application splits its state into two pieces: global shared state that lasts for the
 entire lifetime of the application, and a stack of smaller states, only one of which is active
 at a time. For example, imagine an application to view a map. The shared state would include
 the map and pre-rendered geometry for it. The individual states might start with a splash
diff --git a/rustdoc/widgetry/app_state/struct.App.html b/rustdoc/widgetry/app_state/struct.App.html
index 6c81623329..0cedba8cc9 100644
--- a/rustdoc/widgetry/app_state/struct.App.html
+++ b/rustdoc/widgetry/app_state/struct.App.html
@@ -4,7 +4,7 @@
     pub(crate) shared_app_state: A,
 }

                        Fields
states: Vec<Box<dyn State<A>>>
A stack of states

-
shared_app_state: A
Implementations
impl<A: SharedAppState> App<A>[src]
pub(crate) fn event(&mut self, ctx: &mut EventCtx<'_>)[src]
pub(crate) fn draw(&self, g: &mut GfxCtx<'_>)[src]
fn execute_transition(
    &mut self, 
    ctx: &mut EventCtx<'_>, 
    transition: Transition<A>
) -> bool[src]
If true, then the top-most state on the stack needs to be "woken up" with a fake mouseover
+
shared_app_state: A
Implementations
impl<A: SharedAppState> App<A>[src]
pub(crate) fn event(&mut self, ctx: &mut EventCtx<'_>)[src]
pub(crate) fn draw(&self, g: &mut GfxCtx<'_>)[src]
fn execute_transition(
    &mut self, 
    ctx: &mut EventCtx<'_>, 
    transition: Transition<A>
) -> bool[src]
If true, then the top-most state on the stack needs to be "woken up" with a fake mouseover
 event.

 
Auto Trait Implementations
impl<A> !RefUnwindSafe for App<A>
impl<A> !Send for App<A>
impl<A> !Sync for App<A>
impl<A> Unpin for App<A> where
    A: Unpin, 
impl<A> !UnwindSafe for App<A>
Blanket Implementations
impl<T> Any for T where
    T: 'static + ?Sized, [src]
impl<T> Borrow<T> for T where
    T: ?Sized, [src]