STRLCPY/alacritty

Update dependencies

This introduces some duplicate dependencies, though they are necessary
to build properly without any warnings.

Fixes #4735.

Christian Duerr committed 3 years ago

284f35db

1 parent 8b4c8e9d

Total 12 files Show one by one

■ ■ ■ ■ ■ ■

CHANGELOG.md

		skipped 11 lines
12	12		- Crash due to assertion failure on 32-bit architectures
13	13		- Segmentation fault on shutdown with Wayland
14	14		- Incorrect estimated DPR with Wayland
	15	+	- Consecutive clipboard stores dropped on Wayland until the application is refocused
15	16
16	17		## 0.7.1
17	18
		skipped 839 lines

■ ■ ■ ■ ■ ■

Cargo.lock

1	1		# This file is automatically @generated by Cargo.
2	2		# It is not intended for manual editing.
	3	+	version = 3
	4	+
3	5		[[package]]
4	6		name = "ab_glyph_rasterizer"
5	7		version = "0.1.4"
		skipped 173 lines
179	181
180	182		[[package]]
181	183		name = "byteorder"
182		-	version = "1.3.4"
	184	+	version = "1.4.2"
183	185		source = "registry+https://github.com/rust-lang/crates.io-index"
184		-	checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
	186	+	checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
185	187
186	188		[[package]]
187	189		name = "calloop"
		skipped 58 lines
246	248		]
247	249
248	250		[[package]]
249		-	name = "cloudabi"
250		-	version = "0.1.0"
251		-	source = "registry+https://github.com/rust-lang/crates.io-index"
252		-	checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
253		-	dependencies = [
254		-	"bitflags",
255		-	]
256		-
257		-	[[package]]
258	251		name = "cmake"
259	252		version = "0.1.45"
260	253		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 165 lines
426	419
427	420		[[package]]
428	421		name = "crc32fast"
429		-	version = "1.2.0"
	422	+	version = "1.2.1"
430	423		source = "registry+https://github.com/rust-lang/crates.io-index"
431		-	checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
	424	+	checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
432	425		dependencies = [
433		-	"cfg-if 0.1.10",
	426	+	"cfg-if 1.0.0",
434	427		]
435	428
436	429		[[package]]
		skipped 65 lines
502	495
503	496		[[package]]
504	497		name = "derivative"
505		-	version = "2.1.1"
	498	+	version = "2.2.0"
506	499		source = "registry+https://github.com/rust-lang/crates.io-index"
507		-	checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
	500	+	checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
508	501		dependencies = [
509	502		"proc-macro2",
510	503		"quote",
		skipped 64 lines
575	568
576	569		[[package]]
577	570		name = "embed-resource"
578		-	version = "1.4.1"
	571	+	version = "1.5.1"
579	572		source = "registry+https://github.com/rust-lang/crates.io-index"
580		-	checksum = "c3b2f39c0462f098c1ca4abc408f7482949bbe2ab19bca5a4419f91f69e5bccc"
	573	+	checksum = "0bd6a41d89e233bcd6978fe7333191a2054d518d105a1165ada1d2ebc445ce98"
581	574		dependencies = [
	575	+	"cc",
582	576		"vswhom",
583	577		"winreg",
584	578		]
		skipped 10 lines
595	589
596	590		[[package]]
597	591		name = "filetime"
598		-	version = "0.2.12"
	592	+	version = "0.2.14"
599	593		source = "registry+https://github.com/rust-lang/crates.io-index"
600		-	checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
	594	+	checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
601	595		dependencies = [
602		-	"cfg-if 0.1.10",
	596	+	"cfg-if 1.0.0",
603	597		"libc",
604		-	"redox_syscall",
	598	+	"redox_syscall 0.2.4",
605	599		"winapi 0.3.9",
606	600		]
607	601
		skipped 104 lines
712	706
713	707		[[package]]
714	708		name = "getrandom"
715		-	version = "0.1.15"
	709	+	version = "0.1.16"
716	710		source = "registry+https://github.com/rust-lang/crates.io-index"
717		-	checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
	711	+	checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
718	712		dependencies = [
719		-	"cfg-if 0.1.10",
	713	+	"cfg-if 1.0.0",
720	714		"libc",
721	715		"wasi 0.9.0+wasi-snapshot-preview1",
722	716		]
		skipped 83 lines
806	800
807	801		[[package]]
808	802		name = "hermit-abi"
809		-	version = "0.1.17"
	803	+	version = "0.1.18"
810	804		source = "registry+https://github.com/rust-lang/crates.io-index"
811		-	checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
	805	+	checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
812	806		dependencies = [
813	807		"libc",
814	808		]
		skipped 17 lines
832	826
833	827		[[package]]
834	828		name = "inotify-sys"
835		-	version = "0.1.4"
	829	+	version = "0.1.5"
836	830		source = "registry+https://github.com/rust-lang/crates.io-index"
837		-	checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55"
	831	+	checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
838	832		dependencies = [
839	833		"libc",
840	834		]
841	835
842	836		[[package]]
843	837		name = "instant"
844		-	version = "0.1.7"
	838	+	version = "0.1.9"
845	839		source = "registry+https://github.com/rust-lang/crates.io-index"
846		-	checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
	840	+	checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
847	841		dependencies = [
848		-	"cfg-if 0.1.10",
	842	+	"cfg-if 1.0.0",
849	843		]
850	844
851	845		[[package]]
		skipped 53 lines
905	899
906	900		[[package]]
907	901		name = "libc"
908		-	version = "0.2.81"
	902	+	version = "0.2.86"
909	903		source = "registry+https://github.com/rust-lang/crates.io-index"
910		-	checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
	904	+	checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
911	905
912	906		[[package]]
913	907		name = "libloading"
914		-	version = "0.6.4"
	908	+	version = "0.6.7"
915	909		source = "registry+https://github.com/rust-lang/crates.io-index"
916		-	checksum = "3557c9384f7f757f6d139cd3a4c62ef4e850696c16bf27924a5538c8a09717a1"
	910	+	checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
917	911		dependencies = [
918		-	"cfg-if 0.1.10",
	912	+	"cfg-if 1.0.0",
919	913		"winapi 0.3.9",
920	914		]
921	915
922	916		[[package]]
923	917		name = "linked-hash-map"
924		-	version = "0.5.3"
	918	+	version = "0.5.4"
925	919		source = "registry+https://github.com/rust-lang/crates.io-index"
926		-	checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
	920	+	checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
927	921
928	922		[[package]]
929	923		name = "lock_api"
		skipped 6 lines
936	930
937	931		[[package]]
938	932		name = "log"
939		-	version = "0.4.11"
	933	+	version = "0.4.14"
940	934		source = "registry+https://github.com/rust-lang/crates.io-index"
941		-	checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
	935	+	checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
942	936		dependencies = [
943		-	"cfg-if 0.1.10",
	937	+	"cfg-if 1.0.0",
944	938		"serde",
945	939		]
946	940
		skipped 171 lines
1118	1112
1119	1113		[[package]]
1120	1114		name = "nom"
1121		-	version = "6.0.1"
	1115	+	version = "6.1.0"
1122	1116		source = "registry+https://github.com/rust-lang/crates.io-index"
1123		-	checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
	1117	+	checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1"
1124	1118		dependencies = [
1125	1119		"memchr",
1126	1120		"version_check",
		skipped 105 lines
1232	1226
1233	1227		[[package]]
1234	1228		name = "parking_lot_core"
1235		-	version = "0.8.0"
	1229	+	version = "0.8.3"
1236	1230		source = "registry+https://github.com/rust-lang/crates.io-index"
1237		-	checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
	1231	+	checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
1238	1232		dependencies = [
1239		-	"cfg-if 0.1.10",
1240		-	"cloudabi",
	1233	+	"cfg-if 1.0.0",
1241	1234		"instant",
1242	1235		"libc",
1243		-	"redox_syscall",
	1236	+	"redox_syscall 0.2.4",
1244	1237		"smallvec",
1245	1238		"winapi 0.3.9",
1246	1239		]
		skipped 41 lines
1288	1281
1289	1282		[[package]]
1290	1283		name = "quote"
1291		-	version = "1.0.8"
	1284	+	version = "1.0.9"
1292	1285		source = "registry+https://github.com/rust-lang/crates.io-index"
1293		-	checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
	1286	+	checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
1294	1287		dependencies = [
1295	1288		"proc-macro2",
1296	1289		]
		skipped 14 lines
1311	1304		checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
1312	1305
1313	1306		[[package]]
	1307	+	name = "redox_syscall"
	1308	+	version = "0.2.4"
	1309	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1310	+	checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
	1311	+	dependencies = [
	1312	+	"bitflags",
	1313	+	]
	1314	+
	1315	+	[[package]]
1314	1316		name = "redox_users"
1315	1317		version = "0.3.5"
1316	1318		source = "registry+https://github.com/rust-lang/crates.io-index"
1317	1319		checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
1318	1320		dependencies = [
1319	1321		"getrandom",
1320		-	"redox_syscall",
	1322	+	"redox_syscall 0.1.57",
1321	1323		"rust-argon2",
1322	1324		]
1323	1325
		skipped 9 lines
1333	1335
1334	1336		[[package]]
1335	1337		name = "regex-syntax"
1336		-	version = "0.6.21"
	1338	+	version = "0.6.22"
1337	1339		source = "registry+https://github.com/rust-lang/crates.io-index"
1338		-	checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
	1340	+	checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
1339	1341
1340	1342		[[package]]
1341	1343		name = "rust-argon2"
		skipped 46 lines
1388	1390
1389	1391		[[package]]
1390	1392		name = "serde"
1391		-	version = "1.0.118"
	1393	+	version = "1.0.123"
1392	1394		source = "registry+https://github.com/rust-lang/crates.io-index"
1393		-	checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
	1395	+	checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
1394	1396		dependencies = [
1395	1397		"serde_derive",
1396	1398		]
1397	1399
1398	1400		[[package]]
1399	1401		name = "serde_derive"
1400		-	version = "1.0.118"
	1402	+	version = "1.0.123"
1401	1403		source = "registry+https://github.com/rust-lang/crates.io-index"
1402		-	checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
	1404	+	checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
1403	1405		dependencies = [
1404	1406		"proc-macro2",
1405	1407		"quote",
		skipped 2 lines
1408	1410
1409	1411		[[package]]
1410	1412		name = "serde_json"
1411		-	version = "1.0.61"
	1413	+	version = "1.0.62"
1412	1414		source = "registry+https://github.com/rust-lang/crates.io-index"
1413		-	checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
	1415	+	checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
1414	1416		dependencies = [
1415	1417		"itoa",
1416	1418		"ryu",
		skipped 2 lines
1419	1421
1420	1422		[[package]]
1421	1423		name = "serde_yaml"
1422		-	version = "0.8.14"
	1424	+	version = "0.8.17"
1423	1425		source = "registry+https://github.com/rust-lang/crates.io-index"
1424		-	checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
	1426	+	checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
1425	1427		dependencies = [
1426	1428		"dtoa",
1427	1429		"linked-hash-map",
		skipped 60 lines
1488	1490
1489	1491		[[package]]
1490	1492		name = "smallvec"
1491		-	version = "1.5.1"
	1493	+	version = "1.6.1"
1492	1494		source = "registry+https://github.com/rust-lang/crates.io-index"
1493		-	checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
	1495	+	checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
1494	1496
1495	1497		[[package]]
1496	1498		name = "smithay-client-toolkit"
		skipped 16 lines
1513	1515
1514	1516		[[package]]
1515	1517		name = "smithay-clipboard"
1516		-	version = "0.6.2"
	1518	+	version = "0.6.3"
1517	1519		source = "registry+https://github.com/rust-lang/crates.io-index"
1518		-	checksum = "ab88b219728cad0697a6c9e75da50bf5220ba01b3485e33e407931539a8ebc91"
	1520	+	checksum = "06384dfaf645908220d976ae24ed39f6cf92efecb0225ea0a948e403014de527"
1519	1521		dependencies = [
1520	1522		"smithay-client-toolkit",
1521	1523		"wayland-client",
		skipped 30 lines
1552	1554
1553	1555		[[package]]
1554	1556		name = "syn"
1555		-	version = "1.0.56"
	1557	+	version = "1.0.60"
1556	1558		source = "registry+https://github.com/rust-lang/crates.io-index"
1557		-	checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72"
	1559	+	checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
1558	1560		dependencies = [
1559	1561		"proc-macro2",
1560	1562		"quote",
		skipped 394 lines
1955	1957
1956	1958		[[package]]
1957	1959		name = "yaml-rust"
1958		-	version = "0.4.4"
	1960	+	version = "0.4.5"
1959	1961		source = "registry+https://github.com/rust-lang/crates.io-index"
1960		-	checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
	1962	+	checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
1961	1963		dependencies = [
1962	1964		"linked-hash-map",
1963	1965		]
		skipped 1 lines

■ ■ ■ ■ ■ ■

alacritty/src/config/mod.rs

1	1		use std::fmt::{self, Display, Formatter};
2		-	use std::path::PathBuf;
	2	+	use std::path::{Path, PathBuf};
3	3		use std::{env, fs, io};
4	4
5	5		use log::{error, info};
		skipped 17 lines
23	23		pub use crate::config::bindings::{Action, Binding, BindingMode, Key, SearchAction, ViAction};
24	24		#[cfg(test)]
25	25		pub use crate::config::mouse::{ClickHandler, Mouse};
26		-	use crate::config::ui_config::UIConfig;
	26	+	use crate::config::ui_config::UiConfig;
27	27
28	28		/// Maximum number of depth for the configuration file imports.
29	29		const IMPORT_RECURSION_LIMIT: usize = 5;
30	30
31		-	pub type Config = TermConfig<UIConfig>;
	31	+	pub type Config = TermConfig<UiConfig>;
32	32
33	33		/// Result from config loading.
34	34		pub type Result<T> = std::result::Result<T, Error>;
		skipped 88 lines
123	123		}
124	124
125	125		/// Attempt to reload the configuration file.
126		-	pub fn reload(config_path: &PathBuf, options: &Options) -> Result<Config> {
	126	+	pub fn reload(config_path: &Path, options: &Options) -> Result<Config> {
127	127		// Load config, propagating errors.
128	128		let config_options = options.config_options().clone();
129	129		let mut config = load_from(&config_path, config_options)?;
		skipped 5 lines
135	135		}
136	136
137	137		/// Load configuration file and log errors.
138		-	fn load_from(path: &PathBuf, cli_config: Value) -> Result<Config> {
	138	+	fn load_from(path: &Path, cli_config: Value) -> Result<Config> {
139	139		match read_config(path, cli_config) {
140	140		Ok(config) => Ok(config),
141	141		Err(err) => {
		skipped 4 lines
146	146		}
147	147
148	148		/// Deserialize configuration file from path.
149		-	fn read_config(path: &PathBuf, cli_config: Value) -> Result<Config> {
	149	+	fn read_config(path: &Path, cli_config: Value) -> Result<Config> {
150	150		let mut config_paths = Vec::new();
151	151		let mut config_value = parse_config(&path, &mut config_paths, IMPORT_RECURSION_LIMIT)?;
152	152
		skipped 9 lines
162	162
163	163		/// Deserialize all configuration files as generic Value.
164	164		fn parse_config(
165		-	path: &PathBuf,
	165	+	path: &Path,
166	166		config_paths: &mut Vec<PathBuf>,
167	167		recursion_limit: usize,
168	168		) -> Result<Value> {
		skipped 135 lines

■ ■ ■ ■ ■ ■

alacritty/src/config/ui_config.rs

		skipped 12 lines
13	13		use crate::config::window::WindowConfig;
14	14
15	15		#[derive(ConfigDeserialize, Debug, PartialEq)]
16		-	pub struct UIConfig {
	16	+	pub struct UiConfig {
17	17		/// Font configuration.
18	18		pub font: Font,
19	19
		skipped 25 lines
45	45		background_opacity: Percentage,
46	46		}
47	47
48		-	impl Default for UIConfig {
	48	+	impl Default for UiConfig {
49	49		fn default() -> Self {
50	50		Self {
51	51		alt_send_esc: true,
		skipped 10 lines
62	62		}
63	63		}
64	64
65		-	impl UIConfig {
	65	+	impl UiConfig {
66	66		#[inline]
67	67		pub fn background_opacity(&self) -> f32 {
68	68		self.background_opacity.as_f32()
		skipped 90 lines

■ ■ ■ ■ ■ ■

alacritty/src/event.rs

		skipped 11 lines
12	12		use std::io::Write;
13	13		use std::mem;
14	14		use std::ops::RangeInclusive;
15		-	use std::path::PathBuf;
	15	+	use std::path::{Path, PathBuf};
16	16		#[cfg(not(any(target_os = "macos", windows)))]
17	17		use std::sync::atomic::Ordering;
18	18		use std::sync::Arc;
		skipped 47 lines
66	66		#[derive(Debug, Clone)]
67	67		pub enum Event {
68	68		TerminalEvent(TerminalEvent),
69		-	DPRChanged(f64, (u32, u32)),
	69	+	DprChanged(f64, (u32, u32)),
70	70		Scroll(Scroll),
71	71		ConfigReload(PathBuf),
72	72		Message(Message),
		skipped 916 lines
989	989		} => {
990	990		*control_flow = ControlFlow::Poll;
991	991		let size = (new_inner_size.width, new_inner_size.height);
992		-	self.event_queue.push(Event::DPRChanged(scale_factor, size).into());
	992	+	self.event_queue.push(Event::DprChanged(scale_factor, size).into());
993	993		return;
994	994		},
995	995		// Transmute to extend lifetime, which exists only for `ScaleFactorChanged` event.
		skipped 88 lines
1084	1084		{
1085	1085		match event {
1086	1086		GlutinEvent::UserEvent(event) => match event {
1087		-	Event::DPRChanged(scale_factor, (width, height)) => {
	1087	+	Event::DprChanged(scale_factor, (width, height)) => {
1088	1088		let display_update_pending = &mut processor.ctx.display_update_pending;
1089	1089
1090	1090		// Push current font to update its DPR.
		skipped 162 lines
1253	1253		}
1254	1254
1255	1255		fn reload_config<T>(
1256		-	path: &PathBuf,
	1256	+	path: &Path,
1257	1257		processor: &mut input::Processor<'_, T, ActionContext<'_, N, T>>,
1258	1258		) where
1259	1259		T: EventListener,
		skipped 151 lines

■ ■ ■ ■ ■ ■

alacritty/src/renderer/mod.rs

		skipped 20 lines
21	21		use alacritty_terminal::term::SizeInfo;
22	22
23	23		use crate::config::font::{Font, FontDescription};
24		-	use crate::config::ui_config::{Delta, UIConfig};
	24	+	use crate::config::ui_config::{Delta, UiConfig};
25	25		use crate::gl;
26	26		use crate::gl::types::*;
27	27		use crate::renderer::rects::{RectRenderer, RenderRect};
		skipped 420 lines
448	448		atlas: &'a mut Vec<Atlas>,
449	449		current_atlas: &'a mut usize,
450	450		program: &'a mut TextShaderProgram,
451		-	config: &'a UIConfig,
	451	+	config: &'a UiConfig,
452	452		}
453	453
454	454		#[derive(Debug)]
		skipped 227 lines
682	682		}
683	683		}
684	684
685		-	pub fn with_api<F, T>(&mut self, config: &UIConfig, props: &SizeInfo, func: F) -> T
	685	+	pub fn with_api<F, T>(&mut self, config: &UiConfig, props: &SizeInfo, func: F) -> T
686	686		where
687	687		F: FnOnce(RenderApi<'_>) -> T,
688	688		{
		skipped 718 lines

■ ■ ■ ■ ■ ■

alacritty/src/wayland_theme.rs

		skipped 68 lines
69	69		}
70	70		}
71	71
72		-	trait IntoARGBColor {
	72	+	trait IntoArgbColor {
73	73		fn into_rgba(self) -> ARGBColor;
74	74		}
75	75
76		-	impl IntoARGBColor for Rgb {
	76	+	impl IntoArgbColor for Rgb {
77	77		fn into_rgba(self) -> ARGBColor {
78	78		ARGBColor { a: 0xff, r: self.r, g: self.g, b: self.b }
79	79		}
		skipped 2 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/ansi.rs

		skipped 371 lines
372	372		pub enum Mode {
373	373		/// ?1
374	374		CursorKeys = 1,
375		-	/// Select 80 or 132 columns per page.
	375	+	/// Select 80 or 132 columns per page (DECCOLM).
376	376		///
377	377		/// CSI ? 3 h -> set 132 column font.
378	378		/// CSI ? 3 l -> reset 80 column font.
		skipped 4 lines
383	383		/// * erases all data in page memory
384	384		/// * resets DECLRMM to unavailable
385	385		/// * clears data from the status line (if set to host-writable)
386		-	DECCOLM = 3,
	386	+	ColumnMode = 3,
387	387		/// IRM Insert Mode.
388	388		///
389	389		/// NB should be part of non-private mode enum.
		skipped 50 lines
440	440		if private {
441	441		Some(match num {
442	442		1 => Mode::CursorKeys,
443		-	3 => Mode::DECCOLM,
	443	+	3 => Mode::ColumnMode,
444	444		6 => Mode::Origin,
445	445		7 => Mode::LineWrap,
446	446		12 => Mode::BlinkingCursor,
		skipped 959 lines
1406	1406		let mut parser = Processor::new();
1407	1407		let mut handler = MockHandler::default();
1408	1408
1409		-	for byte in &BYTES[..] {
	1409	+	for byte in BYTES {
1410	1410		parser.advance(&mut handler, *byte, &mut io::sink());
1411	1411		}
1412	1412
		skipped 7 lines
1420	1420		let mut parser = Processor::new();
1421	1421		let mut handler = MockHandler::default();
1422	1422
1423		-	for byte in &bytes[..] {
	1423	+	for byte in bytes {
1424	1424		parser.advance(&mut handler, *byte, &mut io::sink());
1425	1425		}
1426	1426
		skipped 2 lines
1429	1429
1430	1430		let bytes: &[u8] = &[0x1b, b'[', b'c'];
1431	1431
1432		-	for byte in &bytes[..] {
	1432	+	for byte in bytes {
1433	1433		parser.advance(&mut handler, *byte, &mut io::sink());
1434	1434		}
1435	1435
		skipped 2 lines
1438	1438
1439	1439		let bytes: &[u8] = &[0x1b, b'[', b'0', b'c'];
1440	1440
1441		-	for byte in &bytes[..] {
	1441	+	for byte in bytes {
1442	1442		parser.advance(&mut handler, *byte, &mut io::sink());
1443	1443		}
1444	1444
		skipped 7 lines
1452	1452		let mut parser = Processor::new();
1453	1453		let mut handler = MockHandler::default();
1454	1454
1455		-	for byte in &bytes[..] {
	1455	+	for byte in bytes {
1456	1456		parser.advance(&mut handler, *byte, &mut io::sink());
1457	1457		}
1458	1458
		skipped 5 lines
1464	1464		let mut parser = Processor::new();
1465	1465		let mut handler = MockHandler::default();
1466	1466
1467		-	for byte in &bytes[..] {
	1467	+	for byte in bytes {
1468	1468		parser.advance(&mut handler, *byte, &mut io::sink());
1469	1469		}
1470	1470
		skipped 11 lines
1482	1482		let mut parser = Processor::new();
1483	1483		let mut handler = MockHandler::default();
1484	1484
1485		-	for byte in &BYTES[..] {
	1485	+	for byte in BYTES {
1486	1486		parser.advance(&mut handler, *byte, &mut io::sink());
1487	1487		}
1488	1488
		skipped 24 lines
1513	1513		let mut handler = MockHandler::default();
1514	1514		let mut parser = Processor::new();
1515	1515
1516		-	for byte in &BYTES[..] {
	1516	+	for byte in BYTES {
1517	1517		parser.advance(&mut handler, *byte, &mut io::sink());
1518	1518		}
1519	1519		}
		skipped 4 lines
1524	1524		let mut parser = Processor::new();
1525	1525		let mut handler = MockHandler::default();
1526	1526
1527		-	for byte in &BYTES[..] {
	1527	+	for byte in BYTES {
1528	1528		parser.advance(&mut handler, *byte, &mut io::sink());
1529	1529		}
1530	1530
		skipped 67 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/config/mod.rs

		skipped 126 lines
127	127		}
128	128		}
129	129
130		-	#[serde(untagged)]
131	130		#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq)]
	131	+	#[serde(untagged)]
132	132		pub enum ConfigCursorStyle {
133	133		Shape(CursorShape),
134	134		WithBlinking {
		skipped 55 lines
190	190		}
191	191		}
192	192
193		-	impl Into<bool> for CursorBlinking {
194		-	fn into(self) -> bool {
195		-	self == Self::On \|\| self == Self::Always
	193	+	impl From<CursorBlinking> for bool {
	194	+	fn from(cursor_blinking: CursorBlinking) -> bool {
	195	+	cursor_blinking == CursorBlinking::On \|\| cursor_blinking == CursorBlinking::Always
196	196		}
197	197		}
198	198
199		-	#[serde(untagged)]
200	199		#[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
	200	+	#[serde(untagged)]
201	201		pub enum Program {
202	202		Just(String),
203	203		WithArgs {
		skipped 48 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/event_loop.rs

		skipped 220 lines
221	221		let mut terminal = None;
222	222
223	223		loop {
224		-	match self.pty.reader().read(&mut buf[..]) {
	224	+	match self.pty.reader().read(buf) {
225	225		Ok(0) => break,
226	226		Ok(got) => {
227	227		// Record bytes read; used to limit time spent in pty_read.
		skipped 187 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/term/color.rs

		skipped 116 lines
117	117		where
118	118		E: serde::de::Error,
119	119		{
120		-	Rgb::from_str(&value[..]).map_err(\|_\| {
	120	+	Rgb::from_str(value).map_err(\|_\| {
121	121		E::custom(format!(
122	122		"failed to parse rgb color {}; expected hex color like #ff00ff",
123	123		value
		skipped 97 lines
221	221		_ => (),
222	222		}
223	223
224		-	Rgb::from_str(&value[..]).map(CellRgb::Rgb).map_err(\|_\| {
	224	+	Rgb::from_str(value).map(CellRgb::Rgb).map_err(\|_\| {
225	225		E::custom(format!("failed to parse color {}; expected {}", value, EXPECTING))
226	226		})
227	227		}
		skipped 216 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/term/mod.rs

		skipped 1760 lines
1761	1761		ansi::Mode::LineWrap => self.mode.insert(TermMode::LINE_WRAP),
1762	1762		ansi::Mode::LineFeedNewLine => self.mode.insert(TermMode::LINE_FEED_NEW_LINE),
1763	1763		ansi::Mode::Origin => self.mode.insert(TermMode::ORIGIN),
1764		-	ansi::Mode::DECCOLM => self.deccolm(),
	1764	+	ansi::Mode::ColumnMode => self.deccolm(),
1765	1765		ansi::Mode::Insert => self.mode.insert(TermMode::INSERT),
1766	1766		ansi::Mode::BlinkingCursor => {
1767	1767		let style = self.cursor_style.get_or_insert(self.default_cursor_style);
		skipped 35 lines
1803	1803		ansi::Mode::LineWrap => self.mode.remove(TermMode::LINE_WRAP),
1804	1804		ansi::Mode::LineFeedNewLine => self.mode.remove(TermMode::LINE_FEED_NEW_LINE),
1805	1805		ansi::Mode::Origin => self.mode.remove(TermMode::ORIGIN),
1806		-	ansi::Mode::DECCOLM => self.deccolm(),
	1806	+	ansi::Mode::ColumnMode => self.deccolm(),
1807	1807		ansi::Mode::Insert => self.mode.remove(TermMode::INSERT),
1808	1808		ansi::Mode::BlinkingCursor => {
1809	1809		let style = self.cursor_style.get_or_insert(self.default_cursor_style);
		skipped 619 lines
2429	2429		mem::swap(&mut terminal.grid, &mut grid);
2430	2430
2431	2431		b.iter(\|\| {
2432		-	let iter = terminal.renderable_cells(&config, true);
	2432	+	let iter = terminal.renderable_content(&config, true);
2433	2433		for cell in iter {
2434	2434		test::black_box(cell);
2435	2435		}
		skipped 4 lines