tutorials/rust-book
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing dereference

Browse Source
This commit is contained in:
Timothy Warren 2019-01-30 14:56:09 -05:00
parent 3ba5ffd976
commit 96207be067
2 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.idea/workspace.xml generated
View File

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c8f42924-1cd2-4b1c-bcff-602a3368bb16" name="Default Changelist" comment=""> <list default="true" id="c8f42924-1cd2-4b1c-bcff-602a3368bb16" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -15,12 +13,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/enums/src/main.rs"> <entry file="file://$PROJECT_DIR$/enums/src/main.rs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="440">
<caret column="15" selection-start-column="15" selection-end-column="15" /> <caret line="30" column="7" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
<folding>
<element signature="e#1331#1332#0" expanded="true" />
<element signature="e#1364#1365#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -94,7 +88,7 @@
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="JavaScriptWeakerCompletionTypeGuess" value="true" /> <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548877775987" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548878099464" />
<property name="javascript.nodejs.core.library.configured.version" value="7.1.0" /> <property name="javascript.nodejs.core.library.configured.version" value="7.1.0" />
<property name="js.eslint.eslintPackage" value="$USER_HOME$/.yarn-config/global/node_modules/.bin/eslint" /> <property name="js.eslint.eslintPackage" value="$USER_HOME$/.yarn-config/global/node_modules/.bin/eslint" />
<property name="js.eslint.nodeInterpreter" value="project" /> <property name="js.eslint.nodeInterpreter" value="project" />
@ -122,7 +116,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Cargo Command.Run rectangles"> <component name="RunManager" selected="Cargo Command.Run enums">
<configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false"> <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
<option name="MAIN_CLASS_NAME" /> <option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" value="-ea" /> <option name="VM_PARAMETERS" value="-ea" />
@ -141,6 +135,16 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="Run enums" type="CargoCommandRunConfiguration" factoryName="Cargo Command" temporary="true">
<option name="channel" value="DEFAULT" />
<option name="command" value="run --package enums --bin enums" />
<option name="allFeatures" value="false" />
<option name="nocapture" value="false" />
<option name="backtrace" value="SHORT" />
<option name="workingDirectory" value="file://$PROJECT_DIR$/enums" />
<envs />
<method v="2" />
</configuration>
<configuration name="Run rectangles" type="CargoCommandRunConfiguration" factoryName="Cargo Command" temporary="true"> <configuration name="Run rectangles" type="CargoCommandRunConfiguration" factoryName="Cargo Command" temporary="true">
<option name="channel" value="DEFAULT" /> <option name="channel" value="DEFAULT" />
<option name="command" value="run --package rectangles --bin rectangles" /> <option name="command" value="run --package rectangles --bin rectangles" />
@ -161,16 +165,6 @@
<envs /> <envs />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Run scope" type="CargoCommandRunConfiguration" factoryName="Cargo Command" temporary="true">
<option name="channel" value="DEFAULT" />
<option name="command" value="run --package scope --bin scope" />
<option name="allFeatures" value="false" />
<option name="nocapture" value="false" />
<option name="backtrace" value="SHORT" />
<option name="workingDirectory" value="file://$PROJECT_DIR$/scope" />
<envs />
<method v="2" />
</configuration>
<configuration name="Run slices" type="CargoCommandRunConfiguration" factoryName="Cargo Command" temporary="true"> <configuration name="Run slices" type="CargoCommandRunConfiguration" factoryName="Cargo Command" temporary="true">
<option name="channel" value="DEFAULT" /> <option name="channel" value="DEFAULT" />
<option name="command" value="run --package slices --bin slices" /> <option name="command" value="run --package slices --bin slices" />
@ -200,11 +194,11 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Cargo Command.Run enums" />
<item itemvalue="Cargo Command.Run rectangles" /> <item itemvalue="Cargo Command.Run rectangles" />
<item itemvalue="Cargo Command.Run structs" /> <item itemvalue="Cargo Command.Run structs" />
<item itemvalue="Cargo Command.Run slices" /> <item itemvalue="Cargo Command.Run slices" />
<item itemvalue="Cargo Command.Run references" /> <item itemvalue="Cargo Command.Run references" />
<item itemvalue="Cargo Command.Run scope" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -212,8 +206,8 @@
<frame x="1920" y="-438" width="1080" height="1897" extended-state="0" /> <frame x="1920" y="-438" width="1080" height="1897" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49748462" visible="true" weight="0.2540132" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4970809" visible="true" weight="0.2540132" />
<window_info id="Structure" order="1" sideWeight="0.5025154" side_tool="true" visible="true" weight="0.2540132" /> <window_info id="Structure" order="1" sideWeight="0.5029191" side_tool="true" visible="true" weight="0.2540132" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
<window_info id="Capture Tool" order="4" /> <window_info id="Capture Tool" order="4" />
@ -221,7 +215,7 @@
<window_info id="Cargo" order="6" sideWeight="0.49791494" weight="0.3286119" /> <window_info id="Cargo" order="6" sideWeight="0.49791494" weight="0.3286119" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32979318" /> <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32979318" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@ -352,12 +346,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/enums/src/main.rs"> <entry file="file://$PROJECT_DIR$/enums/src/main.rs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="440">
<caret column="15" selection-start-column="15" selection-end-column="15" /> <caret line="30" column="7" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
<folding>
<element signature="e#1331#1332#0" expanded="true" />
<element signature="e#1364#1365#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

24
enums/src/main.rs
View File

@ -28,26 +28,26 @@ enum UsState {
Montana, Montana,
Nebraska, Nebraska,
Nevada, Nevada,
New_Hampshire, NewHampshire,
New_Jersey, NewJersey,
New_Mexico, NewMexico,
New_York, NewYork,
North_Carolina, NorthCarolina,
North_Dakota, NorthDakota,
Ohio, Ohio,
Oklahoma, Oklahoma,
Oregon, Oregon,
Pennsylvania, Pennsylvania,
Rhode_Island, RhodeIsland,
South_Carolina, SouthCarolina,
South_Dakota, SouthDakota,
Tennessee, Tennessee,
Texas, Texas,
Utah, Utah,
Vermont, Vermont,
Virginia, Virginia,
Washington, Washington,
West_Virginia, WestVirginia,
Wisconsin, Wisconsin,
Wyoming, Wyoming,
} }
@ -79,7 +79,7 @@ fn count_non_quarters(count: &mut u32, coin: Coin) {
if let Coin::Quarter(state) = coin { if let Coin::Quarter(state) = coin {
println!("State quarter from {:?}!", state); println!("State quarter from {:?}!", state);
} else { } else {
count += 1; *count += 1;
} }
} }
@ -92,4 +92,6 @@ fn plus_one(x: Option<i32>) -> Option<i32> {
fn main() { fn main() {
println!("Hello, world!"); println!("Hello, world!");
println!("{}", value_in_cents(Coin::Quarter(UsState::Michigan)));
} }