Commit 65997f816bd7aa48f585c61e4d966253d9947ec5 | zig | Meg's Mirrors

author	Andrew Kelley <andrew@ziglang.org> 2019-06-22 01:19:06-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-06-22 01:19:06-04:00
log	65997f816bd7aa48f585c61e4d966253d9947ec5
tree	9d684e2a3bae616b1eb4841fb5dc8072cae738b2
parent	726674b2bd0ac8159c961a944012b096d08e5615
parent	be51511d295269851ea4128f0fd3db49fe96a661
signature	Commit is signed but in an unrecognized format.

Merge remote-tracking branch 'origin/master' into copy-elision-3

3 files changed, 12 insertions(+), 3 deletions(-)

doc
- langref.html.in
std
- c
  - darwin.zig
- math.zig

doc/langref.html.in+1-1

...	...	@@ -3787,7 +3787,7 @@ test "fn reflection" {
3787	3787	However right now it is hard coded to be a {#syntax#}u16{#endsyntax#}. See <a href="https://github.com/ziglang/zig/issues/786">#768</a>.
3788	3788	</p>
3789	3789	<p>
3790		You can {#link\|implicitly cast\|Implicit Casts#} an error from a subset to its superset:
	3790	You can {#link\|implicitly cast\|Implicit Casts#} an error from a subset to a superset:
3791	3791	</p>
3792	3792	{#code_begin\|test#}
3793	3793	const std = @import("std");

std/c/darwin.zig+1-1

...	...	@@ -37,7 +37,7 @@ const mach_hdr = if (@sizeOf(usize) == 8) mach_header_64 else mach_header;
37	37	pub extern "c" var _mh_execute_header: mach_hdr = undefined;
38	38	comptime {
39	39	if (std.os.darwin.is_the_target) {
40		@export("__mh_execute_header", _mh_execute_header, .Weak);
	40	@export("_mh_execute_header", _mh_execute_header, .Weak);
41	41	}
42	42	}
43	43

std/math.zig+10-1

...	...	@@ -482,7 +482,16 @@ fn testAbsInt() void {
482	482	testing.expect((absInt(i32(10)) catch unreachable) == 10);
483	483	}
484	484
485		pub const absFloat = @import("fabs.zig").fabs;
	485	pub const absFloat = fabs;
	486
	487	test "math.absFloat" {
	488	testAbsFloat();
	489	comptime testAbsFloat();
	490	}
	491	fn testAbsFloat() void {
	492	testing.expect(absFloat(f32(-10.05)) == 10.05);
	493	testing.expect(absFloat(f32(10.05)) == 10.05);
	494	}
486	495
487	496	pub fn divTrunc(comptime T: type, numerator: T, denominator: T) !T {
488	497	@setRuntimeSafety(false);