Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

In particular I wanted the change that makes `suspend;` illegal in the
parser.

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/std/atomic/int.zig b/lib/std/atomic/int.zig
index 1a3bead2df..2d1c5f80e9 100644
--- a/lib/std/atomic/int.zig
+++ b/lib/std/atomic/int.zig
@@ -31,7 +31,7 @@ pub fn Int(comptime T: type) type {
             return @atomicRmw(T, &self.unprotected_value, op, operand, ordering);
         }
 
-        pub fn load(self: *Self, comptime ordering: builtin.AtomicOrder) T {
+        pub fn load(self: *const Self, comptime ordering: builtin.AtomicOrder) T {
             switch (ordering) {
                 .Unordered, .Monotonic, .Acquire, .SeqCst => {},
                 else => @compileError("Invalid ordering '" ++ @tagName(ordering) ++ "' for a load operation"),
@@ -59,7 +59,7 @@ pub fn Int(comptime T: type) type {
             return self.rmw(.Sub, 1, .SeqCst);
         }
 
-        pub fn get(self: *Self) T {
+        pub fn get(self: *const Self) T {
             return self.load(.SeqCst);
         }