This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11341

rust: update the minimum version of Rust
ClosedPublic

Authored by Alphare on Aug 25 2021, 11:53 AM.

Download Raw Diff

Details

Reviewers

SimonSapin

Group Reviewers

hg-reviewers

Commits

rHG4ee6b8b40787: rust: update the minimum version of Rust

Summary

Debian Bullseye has just been released, and it carries rustc 1.48.0.

This actually implies a regression that we can't really do anything about in
rhg. See https://github.com/rust-lang/rust/issues/88825. In short, closed (or
bad) standard file descriptors are reopened silently with no way of telling by
the Rust runtime before main is executed. This means that closed fds are not
forwarded to the subprocess we run in case of fallback. This is a bit sad, but
probably not something worth worrying too much about.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Aug 25 2021, 11:53 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 25 2021, 11:53 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

Seeing as how 5.9 still has a known bug and a 5.9.1 is needed (https://bz.mercurial-scm.org/show_bug.cgi?id=6581), I'll wait until 5.9.1 is released to re-push this for stable, otherwise the CI desync will be a pain.

Looks good. This should be merged around the same time as CI is changed to use 1.48.0

Alphare retitled this revision from rust: update README to reflect that the minimum version of Rust has changed to rust: update the minimum version of Rust.Sep 14 2021, 11:07 AM

Alphare edited the summary of this revision. (Show Details)

Alphare updated this revision to Diff 30243.

This should not be taken until the start of the new cycle, because we don't want to break stable in case there is a 5.9.2, and I do not want to deal with a CI desync between stable and default.

In D11341#175244, @Alphare wrote:

This should not be taken until the start of the new cycle, because we don't want to break stable in case there is a 5.9.2, and I do not want to deal with a CI desync between stable and default.

Is it good to go now?

Do you want to also update the rustfmt version used by test-check-format-rust.t?

This is ready indeed and should be taken for 6.0. I've sent D11733 to address @martinvonz's request.

Alphare added a commit: rHG4ee6b8b40787: rust: update the minimum version of Rust.Nov 3 2021, 12:30 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG4ee6b8b40787: rust: update the minimum version of Rust (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			rust/README.rst (4 lines)
M			tests/test-basic.t (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30037		Aug 25 2021, 11:53 AM	★	★
Diff 2	30243		Sep 14 2021, 11:07 AM	★	★
Diff 3	31015	rHG4ee6b8b407871a524de3af15d3b68311c35bcd06	Aug 25 2021, 11:53 AM	★	★

Diff 31015

rust/README.rst

	Example usage:			Example usage:

	$ make PURE=--rust local # Don't forget to recompile after a code change			$ make PURE=--rust local # Don't forget to recompile after a code change
	$ py-spy record --native --output /tmp/profile.svg -- ./hg ...			$ py-spy record --native --output /tmp/profile.svg -- ./hg ...

	Developing Rust			Developing Rust
	===============			===============

	The current version of Rust in use is ``1.41.1``, because it's what Debian			The current version of Rust in use is ``1.48.0``, because it's what Debian
	stable has. You can use ``rustup override set 1.41.1`` at the root of the repo			stable has. You can use ``rustup override set 1.48.0`` at the root of the repo
	to make it easier on you.			to make it easier on you.

	Go to the ``hg-cpython`` folder::			Go to the ``hg-cpython`` folder::

	$ cd rust/hg-cpython			$ cd rust/hg-cpython

	Or, only the ``hg-core`` folder. Be careful not to break compatibility::			Or, only the ``hg-core`` folder. Be careful not to break compatibility::

tests/test-basic.t


	$ hg status ENOENT 2>/dev/full			$ hg status ENOENT 2>/dev/full
	[255]			[255]
	#endif			#endif

	On Python 3, stdio may be None:			On Python 3, stdio may be None:

	$ hg debuguiprompt --config ui.interactive=true 0<&-			$ hg debuguiprompt --config ui.interactive=true 0<&-
	abort: Bad file descriptor			abort: Bad file descriptor (no-rhg !)
				abort: response expected (rhg !)
	[255]			[255]
	$ hg version -q 0<&-			$ hg version -q 0<&-
	Mercurial Distributed SCM * (glob)			Mercurial Distributed SCM * (glob)

	#if py3			#if py3 no-rhg
	$ hg version -q 1>&-			$ hg version -q 1>&-
	abort: Bad file descriptor			abort: Bad file descriptor
	[255]			[255]
	#else			#else
	$ hg version -q 1>&-			$ hg version -q 1>&-
	#endif			#endif
	$ hg unknown -q 1>&-			$ hg unknown -q 1>&-
	hg: unknown command 'unknown'			hg: unknown command 'unknown'