Skip to content

Commit b9eaae3

Browse files
BppleManBppleMan
committed
Merge branch 'dev' into debug
2 parents ca9c71d + 4527a8e commit b9eaae3

235 files changed

Lines changed: 14117 additions & 4709 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.convertor/convertor.cli.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/bppleman/Library/Mobile Documents/com~apple~CloudDocs/dotdir/convertor/convertor.cli.toml

‎.convertor/convertor.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/Users/bppleman/.convertor/convertor.toml
1+
/Users/bppleman/Library/Mobile Documents/com~apple~CloudDocs/dotdir/convertor/convertor.toml

‎.idea/convertor.iml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/dictionaries/project.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.run/Run builder.run.xml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run builder" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
3-
<option name="command" value="run --package builder --bin builder"/>
4-
<option name="workingDirectory" value="file://$PROJECT_DIR$"/>
5-
<envs/>
6-
<option name="emulateTerminal" value="true"/>
7-
<option name="channel" value="DEFAULT"/>
8-
<option name="requiredFeatures" value="true"/>
9-
<option name="allFeatures" value="false"/>
10-
<option name="withSudo" value="false"/>
11-
<option name="buildTarget" value="REMOTE"/>
12-
<option name="backtrace" value="SHORT"/>
13-
<option name="isRedirectInput" value="false"/>
14-
<option name="redirectInputPath" value=""/>
15-
<method v="2">
16-
<option name="CARGO.BUILD_TASK_PROVIDER" enabled="true"/>
17-
</method>
18-
</configuration>
19-
</component>
2+
<configuration default="false" name="Run builder" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
3+
<option name="buildProfileId" value="dev" />
4+
<option name="command" value="run --package builder --bin builder" />
5+
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
6+
<envs />
7+
<option name="emulateTerminal" value="true" />
8+
<option name="channel" value="DEFAULT" />
9+
<option name="requiredFeatures" value="true" />
10+
<option name="allFeatures" value="false" />
11+
<option name="withSudo" value="false" />
12+
<option name="buildTarget" value="REMOTE" />
13+
<option name="backtrace" value="SHORT" />
14+
<option name="isRedirectInput" value="false" />
15+
<option name="redirectInputPath" value="" />
16+
<method v="2">
17+
<option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
18+
</method>
19+
</configuration>
20+
</component>

‎.run/Test convertor.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Test convertor" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
33
<option name="buildProfileId" value="test" />
4-
<option name="command" value="test --package convertor --features testkit" />
4+
<option name="command" value="test --package convertor" />
55
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
66
<envs />
77
<option name="emulateTerminal" value="true" />

0 commit comments

Comments
 (0)