Skip to content

Commit b3c90cd

Browse files
committed
chore: Reformat miscellaneous files
Remove trailing whitespace and ensure files end with newlines.
1 parent 8189c84 commit b3c90cd

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
*.swf binary
1515
*.swc binary
1616

17-
# Fix GH saying Ruffle is written in ActionScript
17+
# Fix GH saying Ruffle is written in ActionScript
1818
tests/tests/swfs/** linguist-vendored

desktop/assets/Assets.xcassets/RuffleBlue.colorset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
}
1919
}
2020
]
21-
}
21+
}

desktop/assets/Assets.xcassets/RuffleOrange.colorset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
}
1919
}
2020
]
21-
}
21+
}

desktop/assets/OpenH264-license.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
About The Cisco-Provided Binary of OpenH264 Video Codec
33
-------------------------------------------------------
44

5-
Cisco provides this program under the terms of the BSD license.
5+
Cisco provides this program under the terms of the BSD license.
66

7-
Additionally, this binary is licensed under Cisco’s AVC/H.264 Patent Portfolio License from MPEG LA, at no cost to you, provided that the requirements and conditions shown below in the AVC/H.264 Patent Portfolio sections are met.
7+
Additionally, this binary is licensed under Cisco’s AVC/H.264 Patent Portfolio License from MPEG LA, at no cost to you, provided that the requirements and conditions shown below in the AVC/H.264 Patent Portfolio sections are met.
88

9-
As with all AVC/H.264 codecs, you may also obtain your own patent license from MPEG LA or from the individual patent owners, or proceed at your own risk. Your rights from Cisco under the BSD license are not affected by this choice.
9+
As with all AVC/H.264 codecs, you may also obtain your own patent license from MPEG LA or from the individual patent owners, or proceed at your own risk. Your rights from Cisco under the BSD license are not affected by this choice.
1010

11-
For more information on the OpenH264 binary licensing, please see the OpenH264 FAQ found at http://www.openh264.org/faq.html#binary
11+
For more information on the OpenH264 binary licensing, please see the OpenH264 FAQ found at http://www.openh264.org/faq.html#binary
1212

1313
A corresponding source code to this binary program is available under the same BSD terms, which can be found at http://www.openh264.org
1414

@@ -32,7 +32,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
3232
AVC/H.264 Patent Portfolio License Notice
3333
-----------------------------------------
3434

35-
The binary form of this Software is distributed by Cisco under the AVC/H.264 Patent Portfolio License from MPEG LA, and is subject to the following requirements, which may or may not be applicable to your use of this software:
35+
The binary form of this Software is distributed by Cisco under the AVC/H.264 Patent Portfolio License from MPEG LA, and is subject to the following requirements, which may or may not be applicable to your use of this software:
3636

3737
THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL USE OF A CONSUMER OR OTHER USES IN WHICH IT DOES NOT RECEIVE REMUNERATION TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM
3838

@@ -52,8 +52,8 @@ In addition, the Cisco-provided binary of this Software is licensed under Cisco'
5252

5353
"OpenH264 Video Codec provided by Cisco Systems, Inc."
5454

55-
4. Any third-party software that makes use of the Cisco-provided binary must reproduce all of the above text, as well as this last condition, in the EULA and/or in another location where licensing information is to be presented to the end user.
56-
55+
4. Any third-party software that makes use of the Cisco-provided binary must reproduce all of the above text, as well as this last condition, in the EULA and/or in another location where licensing information is to be presented to the end user.
56+
5757

5858

5959
v1.0

desktop/assets/macOSEntitlements.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
<key>com.apple.security.network.client</key>
99
<true/>
1010
</dict>
11-
</plist>
11+
</plist>

desktop/packages/windows/wix/ruffle.wxs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<!--
44
wix extension add -g WixToolset.UI.wixext
5-
wix extension add -g WixToolset.Util.wixext
5+
wix extension add -g WixToolset.Util.wixext
66
RUFFLE_VERSION="xxxxxx" wix build ruffle.wxs -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext -arch x64
7-
-->
7+
-->
88

99
<Wix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
1010
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
@@ -93,11 +93,11 @@ http://wixtoolset.org/schemas/v4/wxs/util https://raw.githubusercontent.com/wixt
9393
</StandardDirectory>
9494

9595
<Component Id='Associations' Guid='2216512a-9c76-412f-ba36-08e703a56f25'>
96-
<!--
96+
<!--
9797
This creates the Ruffle progids and *hints* that Ruffle can be associated with them.
98-
This may or may not cause Windows to make the association, but more likely makes it ask the user
98+
This may or may not cause Windows to make the association, but more likely makes it ask the user
9999
what they want the next time they open a swf.
100-
-->
100+
-->
101101

102102
<ProgId Id='Ruffle.swf' Description='Flash Movie' Icon="DesktopEXE" IconIndex="1">
103103
<Extension Id='swf' ContentType='application/x-shockwave-flash'>
@@ -124,7 +124,7 @@ http://wixtoolset.org/schemas/v4/wxs/util https://raw.githubusercontent.com/wixt
124124
<Component Id='ApplicationInfo' Guid='f7e7c5bb-729c-427e-b913-fd0d2e11a143'>
125125
<!--
126126
Tell windows a few properties about our application, so that it can handle it slightly better in "Open With"
127-
127+
128128
(wondering how Windows matches these to the ruffle.exe that we install at some arbitrary path the user picks?)
129129
(well that's the fun part... it doesn't! Windows SOLELY goes by the filename. Isn't that convenient?!)
130130
(rename an executable and suddenly windows can't associate these things with it anymore whoops)

rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
newline_style = "Unix"
1+
newline_style = "Unix"

stub-report/generate-report.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ mkdir /tmp/ruffle-website-update
1010
cargo run --locked --package stub-report /tmp/ruffle-website-update/implementation.json
1111

1212
git clone https://github.com/ruffle-rs/api-report /tmp/ruffle-website-update/api-report
13-
cargo run --manifest-path /tmp/ruffle-website-update/api-report/Cargo.toml -- -s /tmp/ruffle-website-update/api-report/avm2_specification.json -i /tmp/ruffle-website-update/implementation.json -o avm2_report.json
13+
cargo run --manifest-path /tmp/ruffle-website-update/api-report/Cargo.toml -- -s /tmp/ruffle-website-update/api-report/avm2_specification.json -i /tmp/ruffle-website-update/implementation.json -o avm2_report.json

tests/mocket/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ anyhow = { workspace = true }
1515
clap = { workspace = true }
1616
tracing = { workspace = true}
1717
tracing-subscriber = { workspace = true }
18-
ruffle_socket_format = { path = "../socket-format" }
18+
ruffle_socket_format = { path = "../socket-format" }

0 commit comments

Comments
 (0)