Replaced mapping to rpl::empty_value with rpl::to_empty.

Telegram/SourceFiles/boxes/dictionaries_manager.cpp

@@ -246,22 +246,15 @@ auto AddButtonWithLoader(
 		) | rpl::then(
 			rpl::merge(
 				// Events to toggle on.
-				dictionaryFromGlobalLoader->events(
+				dictionaryFromGlobalLoader->events() | rpl::map_to(true),
-				) | rpl::map([] {
-					return true;
-				}),
 				// Events to toggle off.
 				rpl::merge(
 					dictionaryRemoved->events(),
 					buttonState->value(
 					) | rpl::filter([](const DictState &state) {
 						return state.is<Failed>();
-					}) | rpl::map([] {
+					}) | rpl::to_empty
-						return rpl::empty_value();
+				) | rpl::map_to(false)
-					})
-				) | rpl::map([] {
-					return false;
-				})
 			)
 		)
 	);
@@ -275,10 +268,7 @@ auto AddButtonWithLoader(
 				buttonEnabled
 			) | rpl::then(
 				rpl::merge(
-					dictionaryRemoved->events(
+					dictionaryRemoved->events() | rpl::map_to(false),
-					) | rpl::map([] {
-						return false;
-					}),
 					button->toggledValue()
 				)
 			) | rpl::map([=](auto enabled) {

Telegram/SourceFiles/boxes/local_storage_box.cpp

@@ -206,7 +206,7 @@ void LocalStorageBox::Row::radialAnimationCallback() {
 }
 
 rpl::producer<> LocalStorageBox::Row::clearRequests() const {
-	return _clear->clicks() | rpl::map([] { return rpl::empty_value(); });
+	return _clear->clicks() | rpl::to_empty;
 }
 
 int LocalStorageBox::Row::resizeGetHeight(int newWidth) {

Telegram/SourceFiles/boxes/passcode_box.cpp

@@ -902,9 +902,9 @@ void PasscodeBox::recover() {
 		_cloudFields.notEmptyPassport));
 
 	box->passwordCleared(
-	) | rpl::map([] {
+	) | rpl::map_to(
-		return QByteArray();
+		QByteArray()
-	}) | rpl::start_to_stream(_newPasswordSet, lifetime());
+	) | rpl::start_to_stream(_newPasswordSet, lifetime());
 
 	box->recoveryExpired(
 	) | rpl::start_with_next([=] {

Telegram/SourceFiles/boxes/sessions_box.cpp

@@ -425,9 +425,7 @@ void SessionsBox::Inner::showData(const Full &data) {
 }
 
 rpl::producer<> SessionsBox::Inner::terminateAll() const {
-	return _terminateAll->clicks() | rpl::map([] {
+	return _terminateAll->clicks() | rpl::to_empty;
-		return rpl::empty_value();
-	});
 }
 
 rpl::producer<uint64> SessionsBox::Inner::terminateOne() const {

Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp

@@ -335,16 +335,15 @@ rpl::producer<QString> ButtonManageDictsState(
 			? QString::number(filtered.size())
 			: tr::lng_contacts_loading(tr::now);
 	};
-	const auto emptyValue = [] { return rpl::empty_value(); };
 	return rpl::single(
 		computeString()
 	) | rpl::then(
 		rpl::merge(
 			Spellchecker::SupportedScriptsChanged(),
 			Core::App().settings().dictionariesEnabledChanges(
-			) | rpl::map(emptyValue),
+			) | rpl::to_empty,
 			Core::App().settings().spellcheckerEnabledChanges(
-			) | rpl::map(emptyValue)
+			) | rpl::to_empty
 		) | rpl::map(computeString)
 	);
 }

Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp

@@ -335,7 +335,7 @@ TabbedSelector::TabbedSelector(
 
 	rpl::merge(
 		(full()
-			? stickers()->scrollUpdated() | rpl::map([] { return 0; })
+			? stickers()->scrollUpdated() | rpl::map_to(0)
 			: rpl::never<int>() | rpl::type_erased()),
 		_scroll->scrollTopChanges()
 	) | rpl::start_with_next([=] {

Telegram/SourceFiles/core/ui_integration.cpp

@@ -156,7 +156,7 @@ rpl::producer<> UiIntegration::forcePopupMenuHideRequests() {
 	return rpl::merge(
 		Core::App().passcodeLockChanges(),
 		Core::App().termsLockChanges()
-	) | rpl::map([] { return rpl::empty_value(); });
+	) | rpl::to_empty;
 }
 
 QString UiIntegration::convertTagToMimeTag(const QString &tagId) {

Telegram/SourceFiles/data/data_scheduled_messages.cpp

@@ -316,9 +316,7 @@ rpl::producer<> ScheduledMessages::updates(not_null<History*> history) {
 	return _updates.events(
 	) | rpl::filter([=](not_null<History*> value) {
 		return (value == history);
-	}) | rpl::map([] {
+	}) | rpl::to_empty;
-		return rpl::empty_value();
-	});
 }
 
 Data::MessagesSlice ScheduledMessages::list(not_null<History*> history) {

Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp

@@ -198,8 +198,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	rpl::merge(
-		session().settings().archiveCollapsedChanges(
+		session().settings().archiveCollapsedChanges() | rpl::to_empty,
-		) | rpl::map([] { return rpl::empty_value(); }),
 		session().data().chatsFilters().changed()
 	) | rpl::start_with_next([=] {
 		refreshWithCollapsedRows();

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -197,7 +197,7 @@ Widget::Widget(
 	}, lifetime());
 
 	fullSearchRefreshOn(session().settings().skipArchiveInSearchChanges(
-	) | rpl::map([] { return rpl::empty_value(); }));
+	) | rpl::to_empty);
 
 	connect(_inner, SIGNAL(draggingScrollDelta(int)), this, SLOT(onDraggingScrollDelta(int)));
 	connect(_inner, SIGNAL(mustScrollTo(int,int)), _scroll, SLOT(scrollToY(int,int)));
@@ -422,7 +422,7 @@ void Widget::setupSupportMode() {
 	}
 
 	fullSearchRefreshOn(session().settings().supportAllSearchResultsValue(
-	) | rpl::map([] { return rpl::empty_value(); }));
+	) | rpl::to_empty);
 }
 
 void Widget::fullSearchRefreshOn(rpl::producer<> events) {

Telegram/SourceFiles/export/view/export_view_progress.cpp

@@ -264,7 +264,7 @@ ProgressWidget::ProgressWidget(
 
 rpl::producer<> ProgressWidget::cancelClicks() const {
 	return _cancel
-		? (_cancel->clicks() | rpl::map([] { return rpl::empty_value(); }))
+		? (_cancel->clicks() | rpl::to_empty)
 		: (rpl::never<>() | rpl::type_erased());
 }
 
@@ -326,9 +326,8 @@ void ProgressWidget::showDone() {
 		_done->setFullWidth(desired);
 	}
 	_done->clicks(
-	) | rpl::map([] {
+	) | rpl::to_empty
-		return rpl::empty_value();
+	| rpl::start_to_stream(_doneClicks, _done->lifetime());
-	}) | rpl::start_to_stream(_doneClicks, _done->lifetime());
 	setupBottomButton(_done.get());
 }
 

Telegram/SourceFiles/export/view/export_view_settings.cpp

@@ -742,10 +742,7 @@ void SettingsWidget::refreshButtons(
 		: nullptr;
 	if (start) {
 		start->show();
-		_startClicks = start->clicks(
+		_startClicks = start->clicks() | rpl::to_empty;
-		) | rpl::map([] {
-			return rpl::empty_value();
-		});
 
 		container->sizeValue(
 		) | rpl::start_with_next([=](QSize size) {
@@ -760,10 +757,7 @@ void SettingsWidget::refreshButtons(
 		tr::lng_cancel(),
 		st::defaultBoxButton);
 	cancel->show();
-	_cancelClicks = cancel->clicks(
+	_cancelClicks = cancel->clicks() | rpl::to_empty;
-	) | rpl::map([] {
-		return rpl::empty_value();
-	});
 
 	rpl::combine(
 		container->sizeValue(),

Telegram/SourceFiles/history/history_widget.cpp

@@ -178,18 +178,17 @@ object_ptr<Ui::FlatButton> SetupDiscussButton(
 	-> rpl::producer<std::tuple<int, bool>> {
 		if (chat) {
 			using UpdateFlag = Data::PeerUpdate::Flag;
-			auto to_empty = rpl::map([=] { return rpl::empty_value(); });
 			return rpl::merge(
 				chat->session().changes().historyUpdates(
 					Data::HistoryUpdate::Flag::UnreadView
 				) | rpl::filter([=](const Data::HistoryUpdate &update) {
 					return (update.history->peer == chat);
-				}) | to_empty,
+				}) | rpl::to_empty,
 
 				chat->session().changes().peerFlagsValue(
 					chat,
 					UpdateFlag::Notifications | UpdateFlag::ChannelAmIn
-				) | to_empty
+				) | rpl::to_empty
 			) | rpl::map([=] {
 				const auto history = chat->amIn()
 					? chat->owner().historyLoaded(chat)

Telegram/SourceFiles/history/view/history_view_compose_controls.cpp

@@ -98,20 +98,16 @@ rpl::producer<> ComposeControls::cancelRequests() const {
 }
 
 rpl::producer<> ComposeControls::sendRequests() const {
-	auto toEmpty = rpl::map([] { return rpl::empty_value(); });
 	auto submits = base::qt_signal_producer(
 		_field.get(),
 		&Ui::InputField::submitted);
 	return rpl::merge(
-		_send->clicks() | toEmpty,
+		_send->clicks() | rpl::to_empty,
-		std::move(submits) | toEmpty);
+		std::move(submits) | rpl::to_empty);
 }
 
 rpl::producer<> ComposeControls::attachRequests() const {
-	return _attachToggle->clicks(
+	return _attachToggle->clicks() | rpl::to_empty;
-	) | rpl::map([] {
-		return rpl::empty_value();
-	});
 }
 
 void ComposeControls::setMimeDataHook(MimeDataHook hook) {

Telegram/SourceFiles/history/view/history_view_contact_status.cpp

@@ -53,10 +53,6 @@ bool BarCurrentlyHidden(not_null<PeerData*> peer) {
 	return false;
 }
 
-auto MapToEmpty() {
-	return rpl::map([] { return rpl::empty_value(); });
-}
-
 } // namespace
 
 ContactStatus::Bar::Bar(QWidget *parent, const QString &name)
@@ -94,23 +90,23 @@ void ContactStatus::Bar::showState(State state) {
 }
 
 rpl::producer<> ContactStatus::Bar::addClicks() const {
-	return _add->clicks() | MapToEmpty();
+	return _add->clicks() | rpl::to_empty;
 }
 
 rpl::producer<> ContactStatus::Bar::blockClicks() const {
-	return _block->clicks() | MapToEmpty();
+	return _block->clicks() | rpl::to_empty;
 }
 
 rpl::producer<> ContactStatus::Bar::shareClicks() const {
-	return _share->clicks() | MapToEmpty();
+	return _share->clicks() | rpl::to_empty;
 }
 
 rpl::producer<> ContactStatus::Bar::reportClicks() const {
-	return _report->clicks() | MapToEmpty();
+	return _report->clicks() | rpl::to_empty;
 }
 
 rpl::producer<> ContactStatus::Bar::closeClicks() const {
-	return _close->clicks() | MapToEmpty();
+	return _close->clicks() | rpl::to_empty;
 }
 
 void ContactStatus::Bar::resizeEvent(QResizeEvent *e) {

Telegram/SourceFiles/info/info_top_bar.cpp

@@ -107,9 +107,8 @@ void TopBar::enableBackButton() {
 	_back->setDuration(st::infoTopBarDuration);
 	_back->toggle(!selectionMode(), anim::type::instant);
 	_back->entity()->clicks(
-	) | rpl::map([] {
+	) | rpl::to_empty
-		return rpl::empty_value();
+	| rpl::start_to_stream(_backClicks, _back->lifetime());
-	}) | rpl::start_to_stream(_backClicks, _back->lifetime());
 	registerToggleControlCallback(_back.data(), [=] {
 		return !selectionMode();
 	});
@@ -444,9 +443,8 @@ void TopBar::createSelectionControls() {
 		st::infoTopBarScale));
 	_cancelSelection->setDuration(st::infoTopBarDuration);
 	_cancelSelection->entity()->clicks(
-	) | rpl::map([] {
+	) | rpl::to_empty
-		return rpl::empty_value();
+	| rpl::start_to_stream(
-	}) | rpl::start_to_stream(
 		_cancelSelectionClicks,
 		_cancelSelection->lifetime());
 	_selectionText = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::LabelWithNumbers>>(

Telegram/SourceFiles/info/profile/info_profile_values.cpp

@@ -155,7 +155,7 @@ rpl::producer<bool> NotificationsEnabledValue(not_null<PeerData*> peer) {
 		peer->session().changes().peerFlagsValue(
 			peer,
 			UpdateFlag::Notifications
-		) | rpl::map([] { return rpl::empty_value(); }),
+		) | rpl::to_empty,
 		peer->owner().defaultNotifyUpdates(peer)
 	) | rpl::map([=] {
 		return !peer->owner().notifyIsMuted(peer);

Telegram/SourceFiles/main/main_account.cpp

@@ -392,8 +392,7 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 	const auto writingConfig = _lifetime.make_state<bool>(false);
 	rpl::merge(
 		_mtp->config().updates(),
-		_mtp->dcOptions().changed(
+		_mtp->dcOptions().changed() | rpl::to_empty
-		) | rpl::map([] { return rpl::empty_value(); })
 	) | rpl::filter([=] {
 		return !*writingConfig;
 	}) | rpl::start_with_next([=] {

Telegram/SourceFiles/mainwidget.cpp

@@ -277,10 +277,8 @@ MainWidget::MainWidget(
 		updateDialogsWidthAnimated();
 	});
 	rpl::merge(
-		session().settings().dialogsWidthRatioChanges()
+		session().settings().dialogsWidthRatioChanges() | rpl::to_empty,
-			| rpl::map([] { return rpl::empty_value(); }),
+		session().settings().thirdColumnWidthChanges() | rpl::to_empty
-		session().settings().thirdColumnWidthChanges()
-			| rpl::map([] { return rpl::empty_value(); })
 	) | rpl::start_with_next(
 		[this] { updateControlsGeometry(); },
 		lifetime());
@@ -918,7 +916,7 @@ void MainWidget::createPlayer() {
 			this,
 			object_ptr<Media::Player::Widget>(this, &session()));
 		rpl::merge(
-			_player->heightValue() | rpl::map([] { return true; }),
+			_player->heightValue() | rpl::map_to(true),
 			_player->shownValue()
 		) | rpl::start_with_next(
 			[this] { playerHeightUpdated(); },
@@ -1061,7 +1059,7 @@ void MainWidget::createExportTopBar(Export::View::Content &&data) {
 		updateControlsGeometry();
 	}
 	rpl::merge(
-		_exportTopBar->heightValue() | rpl::map([] { return true; }),
+		_exportTopBar->heightValue() | rpl::map_to(true),
 		_exportTopBar->shownValue()
 	) | rpl::start_with_next([=] {
 		exportTopBarHeightUpdated();

Telegram/SourceFiles/passport/passport_panel_controller.cpp

@@ -633,9 +633,7 @@ void PanelController::fillRows(
 rpl::producer<> PanelController::refillRows() const {
 	return rpl::merge(
 		_submitFailed.events(),
-		_form->valueSaveFinished() | rpl::map([] {
+		_form->valueSaveFinished() | rpl::to_empty);
-			return rpl::empty_value();
-		}));
 }
 
 void PanelController::submitForm() {
@@ -703,7 +701,7 @@ void PanelController::setupPassword() {
 		box->newPasswordSet(
 		) | rpl::filter([=](const QByteArray &password) {
 			return password.isEmpty();
-		}) | rpl::map([] { return rpl::empty_value(); })
+		}) | rpl::to_empty
 	) | rpl::start_with_next([=] {
 		_form->reloadPassword();
 	}, box->lifetime());

Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp

@@ -85,12 +85,10 @@ public:
 	void setError(bool error);
 
 	rpl::producer<> deleteClicks() const {
-		return _delete->entity()->clicks(
+		return _delete->entity()->clicks() | rpl::to_empty;
-		) | rpl::map([] { return rpl::empty_value(); });
 	}
 	rpl::producer<> restoreClicks() const {
-		return _restore->entity()->clicks(
+		return _restore->entity()->clicks() | rpl::to_empty;
-		) | rpl::map([] { return rpl::empty_value(); });
 	}
 
 protected:

Telegram/SourceFiles/settings/settings_chat.cpp

@@ -196,7 +196,7 @@ void ColorsPalette::Button::update(
 }
 
 rpl::producer<> ColorsPalette::Button::clicks() const {
-	return _widget.clicks() | rpl::map([] { return rpl::empty_value(); });
+	return _widget.clicks() | rpl::to_empty;
 }
 
 bool ColorsPalette::Button::selected() const {

Telegram/SourceFiles/settings/settings_folders.cpp

@@ -246,15 +246,15 @@ void FilterRowButton::updateButtonsVisibility() {
 }
 
 rpl::producer<> FilterRowButton::removeRequests() const {
-	return _remove.clicks() | rpl::map([] { return rpl::empty_value(); });
+	return _remove.clicks() | rpl::to_empty;
 }
 
 rpl::producer<> FilterRowButton::restoreRequests() const {
-	return _restore.clicks() | rpl::map([] { return rpl::empty_value(); });
+	return _restore.clicks() | rpl::to_empty;
 }
 
 rpl::producer<> FilterRowButton::addRequests() const {
-	return _add.clicks() | rpl::map([] { return rpl::empty_value(); });
+	return _add.clicks() | rpl::to_empty;
 }
 
 void FilterRowButton::paintEvent(QPaintEvent *e) {

Telegram/SourceFiles/settings/settings_privacy_security.cpp

@@ -556,7 +556,7 @@ object_ptr<Ui::BoxContent> EditCloudPasswordBox(not_null<Main::Session*> session
 	const auto box = result.data();
 
 	rpl::merge(
-		box->newPasswordSet() | rpl::map([] { return rpl::empty_value(); }),
+		box->newPasswordSet() | rpl::to_empty,
 		box->passwordReloadNeeded()
 	) | rpl::start_with_next([=] {
 		session->api().reloadPasswordState();
@@ -583,8 +583,7 @@ void RemoveCloudPassword(not_null<::Main::Session*> session) {
 	const auto box = Ui::show(Box<PasscodeBox>(session, fields));
 
 	rpl::merge(
-		box->newPasswordSet(
+		box->newPasswordSet() | rpl::to_empty,
-		) | rpl::map([] { return rpl::empty_value(); }),
 		box->passwordReloadNeeded()
 	) | rpl::start_with_next([=] {
 		session->api().reloadPasswordState();

Telegram/SourceFiles/ui/widgets/separate_panel.cpp

@@ -93,15 +93,13 @@ void SeparatePanel::updateTitlePosition() {
 
 rpl::producer<> SeparatePanel::backRequests() const {
 	return rpl::merge(
-		_back->entity()->clicks(
+		_back->entity()->clicks() | rpl::to_empty,
-		) | rpl::map([] { return rpl::empty_value(); }),
 		_synteticBackRequests.events());
 }
 
 rpl::producer<> SeparatePanel::closeRequests() const {
 	return rpl::merge(
-		_close->clicks(
+		_close->clicks() | rpl::to_empty,
-		) | rpl::map([] { return rpl::empty_value(); }),
 		_userCloseRequests.events());
 }
 

Telegram/SourceFiles/window/window_filters_menu.cpp

@@ -32,8 +32,7 @@ namespace {
 [[nodiscard]] rpl::producer<Dialogs::UnreadState> MainListUnreadState(
 		not_null<Dialogs::MainList*> list) {
 	return rpl::single(rpl::empty_value()) | rpl::then(
-		list->unreadStateChanges(
+		list->unreadStateChanges() | rpl::to_empty
-			) | rpl::map([] { return rpl::empty_value(); })
 	) | rpl::map([=] {
 		return list->unreadState();
 	});

Telegram/SourceFiles/window/window_lock_widgets.cpp

@@ -313,15 +313,11 @@ void TermsBox::prepare() {
 			return false;
 		}
 		return true;
-	}) | rpl::map([] {
+	}) | rpl::to_empty | rpl::start_to_stream(_agreeClicks, lifetime());
-		return rpl::empty_value();
-	}) | rpl::start_to_stream(_agreeClicks, lifetime());
 
 	if (_cancel) {
-		addButton(std::move(_cancel), [=] {})->clicks(
+		addButton(std::move(_cancel), [] {})->clicks(
-		) | rpl::map([] {
+		) | rpl::to_empty | rpl::start_to_stream(_cancelClicks, lifetime());
-			return rpl::empty_value();
-		}) | rpl::start_to_stream(_cancelClicks, lifetime());
 	}
 
 	if (age) {

Telegram/SourceFiles/window/window_outdated_bar.cpp

@@ -68,9 +68,7 @@ Bar::Bar(not_null<QWidget*> parent, QDate date)
 }
 
 rpl::producer<> Bar::hideClicks() const {
-	return _close->clicks() | rpl::map([] {
+	return _close->clicks() | rpl::to_empty;
-		return rpl::empty_value();
-	});
 }
 
 int Bar::resizeGetHeight(int newWidth) {

Telegram/lib_rpl

@@ -1 +1 @@
-Subproject commit 6d6f692354b1b1d7b3808a01cc3337175ea5213d
+Subproject commit b58d2804acda906119c53c1fa1a2593fa9895878