Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport Rust 1.38 to 19.09 #70735

Merged
merged 6 commits into from Oct 9, 2019
Merged

Backport Rust 1.38 to 19.09 #70735

merged 6 commits into from Oct 9, 2019

Conversation

edolstra
Copy link
Member

@edolstra edolstra commented Oct 8, 2019

It might be too late for this, but it would be nice to ship NixOS 19.09 with an up-to-date Rust compiler.

edolstra and others added 4 commits October 8, 2019 12:23
@edolstra
Revert "rustc: Provide compiler-rt sources"
962a6c0 
This reverts commit b7a8280. It's no
longer needed with Rust 1.38.

(cherry picked from commit adb15c3)
@edolstra
rustc: 1.37.0 -> 1.38.0
2c0963f 
(cherry picked from commit 9c0968f)
@Mic92 @edolstra
rustc: remove test related patches/code
0426d8f 
Tests have been disabled since over a year and now the
code starts to bit-rot. As it seems unlikely that they
will come back in near future, let's just remove it.

(cherry picked from commit 173d5a4)
@Mic92 @edolstra
thunderbird: fix build with rustc 1.38
fd15379 
(cherry picked from commit fca2e1c)
@edolstra edolstra added this to the 19.09 milestone Oct 8, 2019
LnL7
LnL7 approved these changes Oct 8, 2019
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've had to update rust on stable before for firefox IIRC so unless we start keeping multiple versions it probably makes sense to also keep it updated. Some fixes like #70313 should also be backported if this goes through.

@hedning
Copy link
Contributor

hedning commented Oct 8, 2019

This, 02585db, is probably needed too, as librsvg 2.44.14 broke with the rust update.

hedning and others added 2 commits October 9, 2019 10:11
@hedning @edolstra
librsvg: 2.44.14 → 2.46.0
2714c28 
rsvg-view was removed so GTK is not needed anymore

(cherry picked from commit 02585db)
@jonringer @edolstra
racerd: 2019-03-20 -> 2019-09-02
b6347cb 
(cherry picked from commit 02795b4)
Mic92
Mic92 approved these changes Oct 9, 2019
View reviewed changes
Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also think we should backport rustc because of firefox: cc @andir

@Mic92
Copy link
Member

Mic92 commented Oct 9, 2019

I was able to build thunderbird on x86_64-linux

@Mic92 Mic92 merged commit d529175 into NixOS:release-19.09 Oct 9, 2019
@andir
Copy link
Member

andir commented Oct 9, 2019

As far as I can see Firefox 70 will still be fine with 1.36: https://hg.mozilla.org/mozilla-central/rev/f82b4a26b4e46d2586972b71e25439470e14117a
That being said I am usually lost in the mercurial interface of mozilla and might likely have missed a bump.

@edolstra edolstra deleted the rust-1.38 branch October 9, 2019 18:05
@Mic92
Copy link
Member

Mic92 commented Oct 10, 2019

This might have broke tor-browser: cc @oxij

@YorikSar
Copy link
Contributor

@Mic92 just took a look at Firefox failures (ESR 60 and 68, Tor browser and Icecat) in Hydra and it seems all of them fail with

error[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
   --> /build/firefox-68.1.0/third_party/rust/cssparser/src/parser.rs:584:17
    |
559 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
    |                                                   - let's call the lifetime of this reference `'1`
...
572 |             Some(ref cached_token)
    |                  ---------------- borrow of `self.input.cached_token` occurs here
...
584 |                 self.input.cached_token = Some(CachedToken {
    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
...
596 |         Ok(token)
    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`

that was fixed in servo/rust-cssparser@3c98d22 (probably along with other warnings from 1.37 that became errors in 1.38 in servo/rust-cssparser#245)

I didn't dig deeper and don't know if patching cssparser separately would fix it.

Mic92 added a commit that referenced this pull request Oct 11, 2019
@Mic92
Revert "Backport Rust 1.38 to 19.09 (#70735)"
ab5877b 
This reverts commit d529175, reversing
changes made to 43dabca.

This broke firefox esr and the torbrowser.
@Mic92
Copy link
Member

Mic92 commented Oct 11, 2019

I reverted the backport for now: 3becc5bb5634b4bc4333ca474a523f47657d334e
Once we fixed this we can have a look again.

@taku0 taku0 mentioned this pull request Oct 11, 2019
Closed
10 tasks
@Mic92
Copy link
Member

Mic92 commented Oct 14, 2019

This one also needs to be backported: #70506

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 approved these changes

@wizeman wizeman wizeman approved these changes

@LnL7 LnL7 LnL7 approved these changes

@nbp nbp Awaiting requested review from nbp

@madjar madjar Awaiting requested review from madjar

@globin globin Awaiting requested review from globin

@cstrahan cstrahan Awaiting requested review from cstrahan

Assignees
No one assigned
Labels
6.topic: rust 8.has: documentation 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@edolstra @hedning @Mic92 @andir @YorikSar @wizeman @LnL7 @jonringer