diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2019-02-28 18:51:45 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2019-02-28 18:51:45 +0000 |
commit | 87378368c4cd9d84e237f7da415b7dac422158ae (patch) | |
tree | 692346311e6ea5e3a20aa4de86fc4c034fef9753 /www/firefox-esr/files | |
parent | f8eead936c09b69171b6fdb83823ed3d9973b5af (diff) |
lang/rust: update to 1.33.0
- www/firefox temporarily loses SIMD in charset conversion, see
https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2019/02/28/Rust-1.33.0.html
Tested by: Mikaël Urankar (aarch64, armv6, armv7, powerpc64), Piotr Kubaj (powerpc64)
Approved by: rust (tobik)
Differential Revision: https://reviews.freebsd.org/D19354
Notes
Notes:
svn path=/head/; revision=494176
Diffstat (limited to 'www/firefox-esr/files')
-rw-r--r-- | www/firefox-esr/files/patch-bug1458219 | 26 | ||||
-rw-r--r-- | www/firefox-esr/files/patch-bug1519629 | 35 | ||||
-rw-r--r-- | www/firefox-esr/files/patch-bug1519729 | 131 |
3 files changed, 192 insertions, 0 deletions
diff --git a/www/firefox-esr/files/patch-bug1458219 b/www/firefox-esr/files/patch-bug1458219 new file mode 100644 index 000000000000..0b86d436d050 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1458219 @@ -0,0 +1,26 @@ +commit cfe84bdd1ce1 +Author: Jonathan Watt <jwatt@jwatt.org> +Date: Wed Apr 25 14:54:26 2018 +0100 + + Bug 1458219 - Remove the 'property_name' macro. r=xidorn +--- + servo/components/style/properties/properties.mako.rs | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index a1d2ee9d085a..5e3d8eaeaaf8 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -56,12 +56,6 @@ use style_adjuster::StyleAdjuster; + + pub use self::declaration_block::*; + +-#[cfg(feature = "gecko")] +-#[macro_export] +-macro_rules! property_name { +- ($s: tt) => { atom!($s) } +-} +- + <%! + from data import Method, Keyword, to_rust_ident, to_camel_case, SYSTEM_FONT_LONGHANDS + import os.path diff --git a/www/firefox-esr/files/patch-bug1519629 b/www/firefox-esr/files/patch-bug1519629 new file mode 100644 index 000000000000..f0ceec943602 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1519629 @@ -0,0 +1,35 @@ +commit f8f381bf03b5 +Author: Emilio Cobos Álvarez <emilio@crisal.io> +Date: Sun Jan 13 21:42:38 2019 +0100 + + Bug 1519629 - Document a few more macros. +--- + servo/components/style/gecko/regen_atoms.py | 1 + + servo/components/style/gecko_string_cache/namespace.rs | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py +index dfc2252aa899..b6f68fceb7d5 100755 +--- servo/components/style/gecko/regen_atoms.py ++++ servo/components/style/gecko/regen_atoms.py +@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' + + MACRO = ''' + #[macro_export] ++/// Returns a static atom by passing the literal string it represents. + macro_rules! atom {{ + {} + }} +diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs +index 4aa4accaf1d4..725e1da21692 100644 +--- servo/components/style/gecko_string_cache/namespace.rs ++++ servo/components/style/gecko_string_cache/namespace.rs +@@ -11,6 +11,8 @@ use std::borrow::Borrow; + use std::fmt; + use std::ops::Deref; + ++/// In Gecko namespaces are just regular atoms, so this is a simple macro to ++/// forward one macro to the other. + #[macro_export] + macro_rules! ns { + () => { diff --git a/www/firefox-esr/files/patch-bug1519729 b/www/firefox-esr/files/patch-bug1519729 new file mode 100644 index 000000000000..e91ebcec56fc --- /dev/null +++ b/www/firefox-esr/files/patch-bug1519729 @@ -0,0 +1,131 @@ +commit 9bdfa9fecaf1 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:02:28 2019 +0100 + + Bug 1519729 - Remove unused macro. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style_traits/values.rs | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 6da235c07b64..2851082c22e0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -158,24 +158,6 @@ where + } + } + +-#[macro_export] +-macro_rules! serialize_function { +- ($dest: expr, $name: ident($( $arg: expr, )+)) => { +- serialize_function!($dest, $name($($arg),+)) +- }; +- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { +- { +- $dest.write_str(concat!(stringify!($name), "("))?; +- $first_arg.to_css($dest)?; +- $( +- $dest.write_str(", ")?; +- $arg.to_css($dest)?; +- )* +- $dest.write_char(')') +- } +- } +-} +- + /// Convenience wrapper to serialise CSS values separated by a given string. + pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { + inner: &'a mut CssWriter<'b, W>, + +commit 9d5e559547d0 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:03:44 2019 +0100 + + Bug 1519729 - Document public macros. r=emilio + + Undocumented public macros emit warnings in nightly-2019-01-11, + and we #![deny] that warning. + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- + servo/components/style_traits/values.rs | 2 +- + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index 2d91273be15a..9220c3b1a665 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -3821,7 +3821,14 @@ impl AliasId { + } + } + +-// NOTE(emilio): Callers are responsible to deal with prefs. ++/// Call the given macro with tokens like this for each longhand and shorthand properties ++/// that is enabled in content: ++/// ++/// ``` ++/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], ++/// ``` ++/// ++/// NOTE(emilio): Callers are responsible to deal with prefs. + #[macro_export] + macro_rules! css_properties_accessors { + ($macro_name: ident) => { +@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { + } + } + ++/// Call the given macro with tokens like this for each longhand properties: ++/// ++/// ``` ++/// { snake_case_ident, true } ++/// ``` ++/// ++/// … where the boolean indicates whether the property value type ++/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. + #[macro_export] + macro_rules! longhand_properties_idents { + ($macro_name: ident) => { +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 2851082c22e0..0d7ee3f506ce 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + +-#[macro_export] ++/// Define an enum type with unit variants that each corrsepond to a CSS keyword. + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { + #[allow(missing_docs)] + +commit 2b08ae08b260 +Author: lqd <remy.rakic+github@gmail.com> +Date: Fri Jan 11 16:35:26 2019 +0100 + + Bug 1519729 - Typo fix in new doc-comment. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 + + Co-Authored-By: SimonSapin <simon.sapin@exyr.org> +--- + servo/components/style_traits/values.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 0d7ee3f506ce..582e34eb3db0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + +-/// Define an enum type with unit variants that each corrsepond to a CSS keyword. ++/// Define an enum type with unit variants that each correspond to a CSS keyword. + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { + #[allow(missing_docs)] |