D9471.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9471.diff
View Options

	diff --git a/keyserver/addons/rust-node-addon/build.rs b/keyserver/addons/rust-node-addon/build.rs
	--- a/keyserver/addons/rust-node-addon/build.rs
	+++ b/keyserver/addons/rust-node-addon/build.rs
	@@ -13,8 +13,7 @@
	println!("cargo:rerun-if-changed={}", VERSIONS_JS_PATH);
	let js_path = Path::new(VERSIONS_JS_PATH);

	- let content =
	- fs::read_to_string(&js_path).expect("Failed to read version.js");
	+ let content = fs::read_to_string(js_path).expect("Failed to read version.js");

	let version_line = content
	.lines()
	@@ -28,7 +27,7 @@
	// semicolon.
	let re = Regex::new(r"webAndKeyserverCodeVersion\s=\s(\d+);").unwrap();
	let version: u64 = re
	- .captures(&version_line)
	+ .captures(version_line)
	.and_then(\|cap\| cap.get(1))
	.map_or_else(
	\|\| panic!("Failed to capture version number"),
	@@ -43,7 +42,7 @@
	let rust_path = Path::new(&out_dir).join("version.rs");

	fs::write(
	- &rust_path,
	+ rust_path,
	format!("pub const CODE_VERSION: u64 = {};", version),
	)
	.expect("Failed to write version.rs");
	diff --git a/keyserver/addons/rust-node-addon/src/identity_client/login.rs b/keyserver/addons/rust-node-addon/src/identity_client/login.rs
	--- a/keyserver/addons/rust-node-addon/src/identity_client/login.rs
	+++ b/keyserver/addons/rust-node-addon/src/identity_client/login.rs
	@@ -32,7 +32,7 @@

	let login_start_request = OpaqueLoginStartRequest {
	opaque_login_request,
	- username: username,
	+ username,
	device_key_upload: Some(DeviceKeyUpload {
	device_key_info: Some(IdentityKeyInfo {
	payload: signed_identity_keys_blob.payload,