Rearranges projections macro calling to improve code resolution in JetBrains tooling

SirCipher · SirCipher · commit 206ac6555270 · 2024-07-18T17:18:49.000+01:00
diff --git a/docs/downlink.md b/docs/downlink.md
@@ -36,8 +36,8 @@ In this section, we will construct a lifecycle for a value downlink that does no
 We will assume an agent with the following definitions:
 
 ```rust
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 struct ExampleAgent {
     received: ValueLane<String>,
 }
diff --git a/docs/event_handler.md b/docs/event_handler.md
@@ -140,8 +140,8 @@ This could be applied to the previous example as follows:
 ```rust
 use swimos::agent::{AgentLaneModel, projections};
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 struct Example {
     name: ValueLane<String>
 }
diff --git a/docs/lifecycle.md b/docs/lifecycle.md
@@ -18,8 +18,8 @@ All further examples in this chapter will use the following agent definition:
 ```rust
 use swimos::agent::{AgentLaneModel, projections};
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 struct ExampleAgent {
     example_command: CommandLane<i32>,
     example_demand: DemandLane<i32>,
diff --git a/example_apps/aggregations/src/area.rs b/example_apps/aggregations/src/area.rs
@@ -99,8 +99,8 @@ pub enum Action {
     Deregister(u64),
 }
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct AreaAgent {
     registrations: CommandLane<Action>,
     cars: JoinValueLane<u64, u64>,
@@ -146,6 +146,7 @@ impl AreaLifecycle {
                 .boxed_local(),
         }
     }
+
     #[on_update(cars)]
     fn cars(
         &self,
diff --git a/example_apps/aggregations/src/car.rs b/example_apps/aggregations/src/car.rs
@@ -27,8 +27,8 @@ use swimos::{
 
 use crate::area::{Action, Area};
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct CarAgent {
     speed: ValueLane<u64>,
     #[item(transient)]
diff --git a/example_apps/aggregations/src/city.rs b/example_apps/aggregations/src/city.rs
@@ -22,8 +22,8 @@ use swimos::{
     agent::{lifecycle, projections},
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct CityAgent {
     aggregated: JoinValueLane<String, f64>,
     average_speed: ValueLane<f64>,
diff --git a/example_apps/command_lane/src/agent.rs b/example_apps/command_lane/src/agent.rs
@@ -21,8 +21,8 @@ use swimos::agent::{
 
 use crate::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
     command: CommandLane<Instruction>,
diff --git a/example_apps/demand_lane/src/agent.rs b/example_apps/demand_lane/src/agent.rs
@@ -21,8 +21,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
     demand: DemandLane<i32>,
diff --git a/example_apps/demand_map_lane/src/agent.rs b/example_apps/demand_map_lane/src/agent.rs
@@ -21,8 +21,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     command: CommandLane<String>,
     demand_map: DemandMapLane<String, i32>,
diff --git a/example_apps/devguide/src/main.rs b/example_apps/devguide/src/main.rs
@@ -46,8 +46,8 @@ pub enum Operation {
     Sub(i32),
 }
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     state: ValueLane<i32>,
     exec: CommandLane<Operation>,
diff --git a/example_apps/event_downlink/src/consumer/agent.rs b/example_apps/event_downlink/src/consumer/agent.rs
@@ -24,8 +24,8 @@ use swimos::agent::{
 
 use super::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ConsumerAgent {
     lane: ValueLane<i32>,
     instruct: CommandLane<Instruction>,
diff --git a/example_apps/event_downlink/src/producer/agent.rs b/example_apps/event_downlink/src/producer/agent.rs
@@ -19,8 +19,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ProducerAgent {
     lane: ValueLane<i32>,
 }
diff --git a/example_apps/http_lane/src/agent.rs b/example_apps/http_lane/src/agent.rs
@@ -22,8 +22,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     value_lane: ValueLane<i32>,
     http_lane: SimpleHttpLane<i32>,
diff --git a/example_apps/join_map/src/agents.rs b/example_apps/join_map/src/agents.rs
@@ -20,8 +20,8 @@ use swimos::{
     agent::{lifecycle, AgentLaneModel},
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct StreetStatisticsAgent {
     state: MapLane<String, u64>,
 }
@@ -32,8 +32,8 @@ pub struct StreetStatisticsLifecycle;
 #[lifecycle(StreetStatisticsAgent)]
 impl StreetStatisticsLifecycle {}
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct AggregatedStatisticsAgent {
     streets: JoinMapLane<String, String, u64>,
 }
diff --git a/example_apps/join_value/src/building.rs b/example_apps/join_value/src/building.rs
@@ -19,8 +19,8 @@ use swimos::agent::lanes::{CommandLane, JoinValueLane};
 use swimos::agent::projections;
 use swimos::agent::{lifecycle, AgentLaneModel};
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct BuildingAgent {
     lights: JoinValueLane<String, bool>,
     register_room: CommandLane<String>,
diff --git a/example_apps/join_value/src/room.rs b/example_apps/join_value/src/room.rs
@@ -18,8 +18,8 @@ use swimos::agent::lanes::ValueLane;
 use swimos::agent::projections;
 use swimos::agent::{lifecycle, AgentLaneModel};
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct RoomAgent {
     lights: ValueLane<bool>,
 }
diff --git a/example_apps/local_downlink/src/consumer/agent.rs b/example_apps/local_downlink/src/consumer/agent.rs
@@ -24,8 +24,8 @@ use swimos::agent::{
 
 use super::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ConsumerAgent {
     lane: ValueLane<i32>,
     instruct: CommandLane<Instruction>,
diff --git a/example_apps/local_downlink/src/producer/agent.rs b/example_apps/local_downlink/src/producer/agent.rs
@@ -19,8 +19,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ProducerAgent {
     lane: ValueLane<i32>,
 }
diff --git a/example_apps/map_downlink/src/consumer/agent.rs b/example_apps/map_downlink/src/consumer/agent.rs
@@ -25,8 +25,8 @@ use swimos::agent::{
 
 use super::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ConsumerAgent {
     lane: ValueLane<i32>,
     instruct: CommandLane<Instruction>,
diff --git a/example_apps/map_downlink/src/producer/agent.rs b/example_apps/map_downlink/src/producer/agent.rs
@@ -21,8 +21,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ProducerAgent {
     lane: MapLane<String, i32>,
 }
diff --git a/example_apps/map_lane/src/agent.rs b/example_apps/map_lane/src/agent.rs
@@ -21,8 +21,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: MapLane<i32, String>,
 }
diff --git a/example_apps/map_lane_persistence/src/agent.rs b/example_apps/map_lane_persistence/src/agent.rs
@@ -20,8 +20,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     map: MapLane<String, i32>,
     #[item(transient)]
diff --git a/example_apps/map_store/src/agent.rs b/example_apps/map_store/src/agent.rs
@@ -23,8 +23,8 @@ use swimos::agent::{
 
 use crate::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
     #[item(transient)]
diff --git a/example_apps/map_store_persistence/src/agent.rs b/example_apps/map_store_persistence/src/agent.rs
@@ -24,8 +24,8 @@ use swimos::agent::{
 
 use crate::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     value: MapStore<String, i32>,
     #[item(transient)]
diff --git a/example_apps/ripple/src/agent.rs b/example_apps/ripple/src/agent.rs
@@ -80,8 +80,8 @@ impl Default for Config {
 }
 
 /// Web Agent for mirroring ripples.
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct MirrorAgent {
     /// The current configuration for the universe.
     mode: ValueLane<Config>,
diff --git a/example_apps/supply_lane/src/agent.rs b/example_apps/supply_lane/src/agent.rs
@@ -20,8 +20,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
     supply: SupplyLane<i32>,
diff --git a/example_apps/time_series/src/count.rs b/example_apps/time_series/src/count.rs
@@ -27,8 +27,8 @@ use swimos::{
     },
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct CountAgent {
     history: MapLane<u64, String>,
     add: CommandLane<String>,
diff --git a/example_apps/time_series/src/time.rs b/example_apps/time_series/src/time.rs
@@ -27,8 +27,8 @@ use swimos::{
     },
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct TimeAgent {
     history: MapLane<u64, String>,
     add: CommandLane<String>,
diff --git a/example_apps/transit/src/agents/agency.rs b/example_apps/transit/src/agents/agency.rs
@@ -38,8 +38,8 @@ use self::statistics::Statistics;
 mod statistics;
 
 /// Agency representing a transit agency (and its current state).
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 #[agent(transient, convention = "camel")]
 pub struct AgencyAgent {
     // Vehicles currently associated with the agency (keys are the IDs used by the service.).
diff --git a/example_apps/transit/src/agents/country.rs b/example_apps/transit/src/agents/country.rs
@@ -30,8 +30,8 @@ use crate::model::{agency::Agency, counts::Count};
 use super::join_value_logging_lifecycle;
 
 /// An agent with country level aggregate information.
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 #[agent(transient, convention = "camel")]
 pub struct CountryAgent {
     // Count of the number of vehicles within the country.
diff --git a/example_apps/transit/src/agents/state.rs b/example_apps/transit/src/agents/state.rs
@@ -27,8 +27,8 @@ use crate::model::{agency::Agency, counts::Count};
 use super::join_value_logging_lifecycle;
 
 /// An agent with state level aggregate information.
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 #[agent(transient, convention = "camel")]
 pub struct StateAgent {
     // Count of the number of vehicles within the state.
diff --git a/example_apps/transit/src/agents/vehicle.rs b/example_apps/transit/src/agents/vehicle.rs
@@ -29,8 +29,8 @@ use tracing::{debug, info};
 use crate::model::vehicle::Vehicle;
 
 /// A agent representing the current state of a vehicle.
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 #[agent(transient, convention = "camel")]
 pub struct VehicleAgent {
     // Description of the vehicle.
diff --git a/example_apps/tutorial_app/src/unit_agent.rs b/example_apps/tutorial_app/src/unit_agent.rs
@@ -26,8 +26,8 @@ use swimos::{
 };
 use tutorial_app_model::{Counter, HistoryItem, Message};
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct UnitAgent {
     publish: CommandLane<Message>,
     history: MapLane<usize, HistoryItem>,
diff --git a/example_apps/value_downlink/src/consumer/agent.rs b/example_apps/value_downlink/src/consumer/agent.rs
@@ -24,8 +24,8 @@ use swimos::agent::{
 
 use super::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ConsumerAgent {
     lane: ValueLane<i32>,
     instruct: CommandLane<Instruction>,
diff --git a/example_apps/value_downlink/src/producer/agent.rs b/example_apps/value_downlink/src/producer/agent.rs
@@ -19,8 +19,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ProducerAgent {
     lane: ValueLane<i32>,
 }
diff --git a/example_apps/value_lane/src/agent.rs b/example_apps/value_lane/src/agent.rs
@@ -19,8 +19,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
 }
diff --git a/example_apps/value_lane_persistence/src/agent.rs b/example_apps/value_lane_persistence/src/agent.rs
@@ -19,8 +19,8 @@ use swimos::agent::{
     lifecycle, projections, AgentLaneModel,
 };
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     value: ValueLane<i32>,
     #[item(transient)]
diff --git a/example_apps/value_store/src/agent.rs b/example_apps/value_store/src/agent.rs
@@ -23,8 +23,8 @@ use swimos::agent::{
 
 use crate::model::Instruction;
 
-#[derive(AgentLaneModel)]
 #[projections]
+#[derive(AgentLaneModel)]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
     #[item(transient)]
diff --git a/example_apps/value_store_persistence/src/agent.rs b/example_apps/value_store_persistence/src/agent.rs
diff --git a/swimos/examples/agentimpl.rs b/swimos/examples/agentimpl.rs

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ In this section, we will construct a lifecycle for a value downlink that does no`
`36`	`36`	`We will assume an agent with the following definitions:`
`37`	`37`
`38`	`38`	```rust
`39`		`-#[derive(AgentLaneModel)]`
`40`	`39`	`#[projections]`
	`40`	`+#[derive(AgentLaneModel)]`
`41`	`41`	`struct ExampleAgent {`
`42`	`42`	`received: ValueLane<String>,`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ This could be applied to the previous example as follows:`
`140`	`140`	```rust
`141`	`141`	`use swimos::agent::{AgentLaneModel, projections};`
`142`	`142`
`143`		`-#[derive(AgentLaneModel)]`
`144`	`143`	`#[projections]`
	`144`	`+#[derive(AgentLaneModel)]`
`145`	`145`	`struct Example {`
`146`	`146`	`name: ValueLane<String>`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ pub enum Action {`
`99`	`99`	`Deregister(u64),`
`100`	`100`	`}`
`101`	`101`
`102`		`-#[derive(AgentLaneModel)]`
`103`	`102`	`#[projections]`
	`103`	`+#[derive(AgentLaneModel)]`
`104`	`104`	`pub struct AreaAgent {`
`105`	`105`	`registrations: CommandLane<Action>,`
`106`	`106`	`cars: JoinValueLane<u64, u64>,`
`@@ -146,6 +146,7 @@ impl AreaLifecycle {`
`146`	`146`	`.boxed_local(),`
`147`	`147`	`}`
`148`	`148`	`}`
	`149`	`+`
`149`	`150`	`#[on_update(cars)]`
`150`	`151`	`fn cars(`
`151`	`152`	`&self,`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ pub enum Operation {`
`46`	`46`	`Sub(i32),`
`47`	`47`	`}`
`48`	`48`
`49`		`-#[derive(AgentLaneModel)]`
`50`	`49`	`#[projections]`
	`50`	`+#[derive(AgentLaneModel)]`
`51`	`51`	`pub struct ExampleAgent {`
`52`	`52`	`state: ValueLane<i32>,`
`53`	`53`	`exec: CommandLane<Operation>,`