diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig index ea9eec3afa..423a887b34 100644 --- a/lib/std/Thread.zig +++ b/lib/std/Thread.zig @@ -165,18 +165,10 @@ pub fn setName(self: Thread, name: []const u8) SetNameError!void { const path = try std.fmt.bufPrint(&buf, "/proc/self/task/{d}/comm", .{self.getHandle()}); const file = try std.fs.cwd().openFile(path, .{ .mode = .write_only }); defer file.close(); -<<<<<<< HEAD var fw = file.writer(&.{}); fw.interface.writeAll(name) catch |err| switch (err) { error.WriteFailed => return fw.err.?, }; -||||||| edf785db0f - - try file.writer().writeAll(name); -======= - - try file.deprecatedWriter().writeAll(name); ->>>>>>> origin/master return; }, .windows => { @@ -288,23 +280,11 @@ pub fn getName(self: Thread, buffer_ptr: *[max_name_len:0]u8) GetNameError!?[]co const path = try std.fmt.bufPrint(&buf, "/proc/self/task/{d}/comm", .{self.getHandle()}); const file = try std.fs.cwd().openFile(path, .{}); defer file.close(); -<<<<<<< HEAD var fr = file.reader(&.{}); const n = fr.interface.readSliceShort(buffer_ptr[0 .. max_name_len + 1]) catch |err| switch (err) { error.ReadFailed => return fr.err.?, }; return if (n == 0) null else buffer[0 .. n - 1]; -||||||| edf785db0f - - const data_len = try file.reader().readAll(buffer_ptr[0 .. max_name_len + 1]); - - return if (data_len >= 1) buffer[0 .. data_len - 1] else null; -======= - - const data_len = try file.deprecatedReader().readAll(buffer_ptr[0 .. max_name_len + 1]); - - return if (data_len >= 1) buffer[0 .. data_len - 1] else null; ->>>>>>> origin/master }, .windows => { const buf_capacity = @sizeOf(windows.UNICODE_STRING) + (@sizeOf(u16) * max_name_len); diff --git a/lib/std/crypto/sha2.zig b/lib/std/crypto/sha2.zig index 7c2d5434fb..8e74fe7899 100644 --- a/lib/std/crypto/sha2.zig +++ b/lib/std/crypto/sha2.zig @@ -383,28 +383,12 @@ fn Sha2x32(comptime iv: Iv32, digest_bits: comptime_int) type { for (&d.s, v) |*dv, vv| dv.* +%= vv; } -<<<<<<< HEAD pub fn writer(this: *@This(), buffer: []u8) Writer { return .{ .context = this, .vtable = &.{ .drain = drain }, .buffer = buffer, }; -||||||| edf785db0f - pub const Error = error{}; - pub const Writer = std.io.Writer(*Self, Error, write); - - fn write(self: *Self, bytes: []const u8) Error!usize { - self.update(bytes); - return bytes.len; -======= - pub const Error = error{}; - pub const Writer = std.io.GenericWriter(*Self, Error, write); - - fn write(self: *Self, bytes: []const u8) Error!usize { - self.update(bytes); - return bytes.len; ->>>>>>> origin/master } fn drain(w: *Writer, data: []const []const u8, splat: usize) Writer.Error!usize { diff --git a/lib/std/elf.zig b/lib/std/elf.zig index eb08f5b409..b7be0a3e81 100644 --- a/lib/std/elf.zig +++ b/lib/std/elf.zig @@ -508,7 +508,6 @@ pub const Header = struct { }; } -<<<<<<< HEAD pub const ReadError = std.io.Reader.Error || ParseError; pub fn read(r: *std.io.Reader) ReadError!Header { @@ -516,19 +515,6 @@ pub const Header = struct { const result = try parse(@ptrCast(buf)); r.toss(if (result.is_64) @sizeOf(Elf64_Ehdr) else @sizeOf(Elf32_Ehdr)); return result; -||||||| edf785db0f - pub fn read(parse_source: anytype) !Header { - var hdr_buf: [@sizeOf(Elf64_Ehdr)]u8 align(@alignOf(Elf64_Ehdr)) = undefined; - try parse_source.seekableStream().seekTo(0); - try parse_source.reader().readNoEof(&hdr_buf); - return Header.parse(&hdr_buf); -======= - pub fn read(parse_source: anytype) !Header { - var hdr_buf: [@sizeOf(Elf64_Ehdr)]u8 align(@alignOf(Elf64_Ehdr)) = undefined; - try parse_source.seekableStream().seekTo(0); - try parse_source.deprecatedReader().readNoEof(&hdr_buf); - return Header.parse(&hdr_buf); ->>>>>>> origin/master } pub const ParseError = error{ @@ -604,92 +590,14 @@ pub const ProgramHeaderIterator = struct { if (it.index >= it.elf_header.phnum) return null; defer it.index += 1; -<<<<<<< HEAD if (it.elf_header.is_64) { var phdr: Elf64_Phdr = undefined; const offset = it.elf_header.phoff + @sizeOf(@TypeOf(phdr)) * it.index; try it.file_reader.seekTo(offset); try it.file_reader.interface.readSlice(@ptrCast(&phdr)); if (it.elf_header.endian != native_endian) -||||||| edf785db0f - if (self.elf_header.is_64) { - var phdr: Elf64_Phdr = undefined; - const offset = self.elf_header.phoff + @sizeOf(@TypeOf(phdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.reader().readNoEof(mem.asBytes(&phdr)); - - // ELF endianness matches native endianness. - if (self.elf_header.endian == native_endian) return phdr; - - // Convert fields to native endianness. -======= - if (self.elf_header.is_64) { - var phdr: Elf64_Phdr = undefined; - const offset = self.elf_header.phoff + @sizeOf(@TypeOf(phdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.deprecatedReader().readNoEof(mem.asBytes(&phdr)); - - // ELF endianness matches native endianness. - if (self.elf_header.endian == native_endian) return phdr; - - // Convert fields to native endianness. ->>>>>>> origin/master mem.byteSwapAllFields(Elf64_Phdr, &phdr); -<<<<<<< HEAD return phdr; -||||||| edf785db0f - return phdr; - } - - var phdr: Elf32_Phdr = undefined; - const offset = self.elf_header.phoff + @sizeOf(@TypeOf(phdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.reader().readNoEof(mem.asBytes(&phdr)); - - // ELF endianness does NOT match native endianness. - if (self.elf_header.endian != native_endian) { - // Convert fields to native endianness. - mem.byteSwapAllFields(Elf32_Phdr, &phdr); - } - - // Convert 32-bit header to 64-bit. - return Elf64_Phdr{ - .p_type = phdr.p_type, - .p_offset = phdr.p_offset, - .p_vaddr = phdr.p_vaddr, - .p_paddr = phdr.p_paddr, - .p_filesz = phdr.p_filesz, - .p_memsz = phdr.p_memsz, - .p_flags = phdr.p_flags, - .p_align = phdr.p_align, - }; -======= - return phdr; - } - - var phdr: Elf32_Phdr = undefined; - const offset = self.elf_header.phoff + @sizeOf(@TypeOf(phdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.deprecatedReader().readNoEof(mem.asBytes(&phdr)); - - // ELF endianness does NOT match native endianness. - if (self.elf_header.endian != native_endian) { - // Convert fields to native endianness. - mem.byteSwapAllFields(Elf32_Phdr, &phdr); - } - - // Convert 32-bit header to 64-bit. - return Elf64_Phdr{ - .p_type = phdr.p_type, - .p_offset = phdr.p_offset, - .p_vaddr = phdr.p_vaddr, - .p_paddr = phdr.p_paddr, - .p_filesz = phdr.p_filesz, - .p_memsz = phdr.p_memsz, - .p_flags = phdr.p_flags, - .p_align = phdr.p_align, - }; ->>>>>>> origin/master } var phdr: Elf32_Phdr = undefined; @@ -716,23 +624,9 @@ pub const SectionHeaderIterator = struct { file_reader: *std.fs.File.Reader, index: usize = 0, -<<<<<<< HEAD pub fn next(it: *SectionHeaderIterator) !?Elf64_Shdr { if (it.index >= it.elf_header.shnum) return null; defer it.index += 1; -||||||| edf785db0f - if (self.elf_header.is_64) { - var shdr: Elf64_Shdr = undefined; - const offset = self.elf_header.shoff + @sizeOf(@TypeOf(shdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.reader().readNoEof(mem.asBytes(&shdr)); -======= - if (self.elf_header.is_64) { - var shdr: Elf64_Shdr = undefined; - const offset = self.elf_header.shoff + @sizeOf(@TypeOf(shdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.deprecatedReader().readNoEof(mem.asBytes(&shdr)); ->>>>>>> origin/master if (it.elf_header.is_64) { var shdr: Elf64_Shdr = undefined; @@ -741,65 +635,7 @@ pub const SectionHeaderIterator = struct { try it.file_reader.interface.readSlice(@ptrCast(&shdr)); if (it.elf_header.endian != native_endian) mem.byteSwapAllFields(Elf64_Shdr, &shdr); -<<<<<<< HEAD return shdr; -||||||| edf785db0f - return shdr; - } - - var shdr: Elf32_Shdr = undefined; - const offset = self.elf_header.shoff + @sizeOf(@TypeOf(shdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.reader().readNoEof(mem.asBytes(&shdr)); - - // ELF endianness does NOT match native endianness. - if (self.elf_header.endian != native_endian) { - // Convert fields to native endianness. - mem.byteSwapAllFields(Elf32_Shdr, &shdr); - } - - // Convert 32-bit header to 64-bit. - return Elf64_Shdr{ - .sh_name = shdr.sh_name, - .sh_type = shdr.sh_type, - .sh_flags = shdr.sh_flags, - .sh_addr = shdr.sh_addr, - .sh_offset = shdr.sh_offset, - .sh_size = shdr.sh_size, - .sh_link = shdr.sh_link, - .sh_info = shdr.sh_info, - .sh_addralign = shdr.sh_addralign, - .sh_entsize = shdr.sh_entsize, - }; -======= - return shdr; - } - - var shdr: Elf32_Shdr = undefined; - const offset = self.elf_header.shoff + @sizeOf(@TypeOf(shdr)) * self.index; - try self.parse_source.seekableStream().seekTo(offset); - try self.parse_source.deprecatedReader().readNoEof(mem.asBytes(&shdr)); - - // ELF endianness does NOT match native endianness. - if (self.elf_header.endian != native_endian) { - // Convert fields to native endianness. - mem.byteSwapAllFields(Elf32_Shdr, &shdr); - } - - // Convert 32-bit header to 64-bit. - return Elf64_Shdr{ - .sh_name = shdr.sh_name, - .sh_type = shdr.sh_type, - .sh_flags = shdr.sh_flags, - .sh_addr = shdr.sh_addr, - .sh_offset = shdr.sh_offset, - .sh_size = shdr.sh_size, - .sh_link = shdr.sh_link, - .sh_info = shdr.sh_info, - .sh_addralign = shdr.sh_addralign, - .sh_entsize = shdr.sh_entsize, - }; ->>>>>>> origin/master } var shdr: Elf32_Shdr = undefined; diff --git a/src/deprecated.zig b/src/deprecated.zig index 91c9ede27f..07efa84eee 100644 --- a/src/deprecated.zig +++ b/src/deprecated.zig @@ -15,14 +15,6 @@ pub fn LinearFifo(comptime T: type) type { count: usize, const Self = @This(); -<<<<<<<< HEAD:src/deprecated.zig -|||||||| edf785db0f:lib/std/fifo.zig - pub const Reader = std.io.Reader(*Self, error{}, readFn); - pub const Writer = std.io.Writer(*Self, error{OutOfMemory}, appendWrite); -======== - pub const Reader = std.io.GenericReader(*Self, error{}, readFn); - pub const Writer = std.io.GenericWriter(*Self, error{OutOfMemory}, appendWrite); ->>>>>>>> origin/master:lib/std/fifo.zig pub fn init(allocator: Allocator) Self { return .{