Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump to 1.22.0 and update boostrap compiler #44154

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 1, 2017
Merged

Bump to 1.22.0 and update boostrap compiler #44154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2972687
Update bootstrap compiler
alexcrichton Aug 25, 2017
9b9de27
Bump to 1.22.0
alexcrichton Aug 28, 2017
7a2a8d7
Update Cargo to 0.23.0 and our lockfile
alexcrichton Aug 28, 2017
9e5a7e9
Bring back stage0 allocator logic on MSVC
alexcrichton Aug 31, 2017
271c63c
Update git2-rs to fix cross compiles
alexcrichton Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bring back stage0 allocator logic on MSVC 
I think there may still be bugs preventing its removal..
  • Loading branch information
@alexcrichton
alexcrichton committed Sep 1, 2017
commit 9e5a7e94725529fd8cbe1883238d7c22d9faca3e
7 changes: 5 additions & 2 deletions src/libstd/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,12 @@
// if the user has disabled jemalloc in `./configure`).
// `force_alloc_system` is *only* intended as a workaround for local rebuilds
// with a rustc without jemalloc.
Copy link
Contributor

Choose a reason for hiding this comment

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

Please leave this comment in! Though if you feel like it, it could be corrected to "...for local rebuilds using a rustc with jemalloc to create a rustc without jemalloc."

Copy link
Member

Choose a reason for hiding this comment

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

Just to clarify my previous comment, only the // The not(stage0+msvc) gates will only last until the next stage0 bump line should be deleted 🙂

#![cfg_attr(any(stage0, feature = "force_alloc_system"),
// FIXME(#44236) shouldn't need MSVC logic
#![cfg_attr(all(not(target_env = "msvc"),
any(stage0, feature = "force_alloc_system")),
feature(global_allocator))]
#[cfg(any(stage0, feature = "force_alloc_system"))]
#[cfg(all(not(target_env = "msvc"),
any(stage0, feature = "force_alloc_system")))]
#[global_allocator]
static ALLOC: alloc_system::System = alloc_system::System;

Expand Down
1 change: 1 addition & 0 deletions src/tools/tidy/src/pal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
"src/rtstartup", // Not sure what to do about this. magic stuff for mingw

// temporary exceptions
"src/libstd/lib.rs", // FIXME(#44217)
"src/libstd/path.rs",
"src/libstd/f32.rs",
"src/libstd/f64.rs",
Expand Down