From 9944bcc92805644c8b0479d8f543c6615e271c03 Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Tue, 30 Aug 2016 15:27:35 -0700 Subject: [PATCH] Fix settings_size vs byte_size confusion in gen_settings.py. --- meta/gen_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/gen_settings.py b/meta/gen_settings.py index 65bb7c428a..c5c48ad4b7 100644 --- a/meta/gen_settings.py +++ b/meta/gen_settings.py @@ -231,7 +231,7 @@ def gen_constructor(sgrp, settings_size, byte_size, parent, fmt): 'pub fn new({}) -> Flags {{'.format(args), '}'): fmt.line('let bvec = builder.finish("{}");'.format(sgrp.name)) fmt.line('let mut bytes = [0; {}];'.format(byte_size)) - fmt.line('assert_eq!(bytes.len(), {});'.format(settings_size)) + fmt.line('assert_eq!(bvec.len(), {});'.format(settings_size)) with fmt.indented( 'for (i, b) in bvec.into_iter().enumerate() {', '}'): fmt.line('bytes[i] = b;') @@ -268,7 +268,7 @@ def gen_group(sgrp, fmt): fmt.line('#[derive(Clone)]') fmt.doc_comment('Flags group `{}`.'.format(sgrp.name)) with fmt.indented('pub struct Flags {', '}'): - fmt.line('bytes: [u8; {}],'.format(settings_size)) + fmt.line('bytes: [u8; {}],'.format(byte_size)) gen_constructor(sgrp, settings_size, byte_size, None, fmt) gen_enum_types(sgrp, fmt)