Skip to content

[beta] Rollup backports #51857

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 11 commits into from
Jun 28, 2018
Merged

[beta] Rollup backports #51857

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a6a2a1
Do not build LLVM tools for any of the tools
Mark-Simulacrum Jun 23, 2018
d3edfb1
Don't use `ParamEnv::reveal_all()` if there is a real one available
oli-obk Jun 27, 2018
b81250f
rename `pat_ty` to `pat_ty_adjusted` for clarity
nikomatsakis Jun 21, 2018
279a95f
use `pat_ty_adjusted` from `expr_use_visitor` to type of arguments
nikomatsakis Jun 21, 2018
5b172eb
Remove process::id from 'Stabilized APIs' in 1.27
Lireer Jun 28, 2018
103a4d8
Attempt to fix hygiene for global_allocator
mark-i-m Apr 13, 2018
9e65155
Prohibit global_allocator in submodules for now
mark-i-m May 20, 2018
0f8f238
enable fold_mac
mark-i-m Jun 6, 2018
48bbbb0
fix test
mark-i-m Jun 19, 2018
fc709c6
actually fix test
mark-i-m Jun 19, 2018
6164c69
used debug, not info
mark-i-m Jun 23, 2018
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
actually fix test
  • Loading branch information
@mark-i-m @pietroalbini
mark-i-m authored and pietroalbini committed Jun 28, 2018
commit fc709c6b2ac37ed8d6c63da1b671f82a16412d4b
2 changes: 1 addition & 1 deletion src/test/ui/allocator-submodule.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `global_allocator` cannot be used in submodules
--> $DIR/allocator-submodule.rs:34:5
--> $DIR/allocator-submodule.rs:37:5
|
LL | static MY_HEAP: MyAlloc = MyAlloc; //~ ERROR global_allocator
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down