diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs index 3ace7dbbf168..246a630648ba 100644 --- a/components/plugins/jstraceable.rs +++ b/components/plugins/jstraceable.rs @@ -50,7 +50,7 @@ pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: args: vec!(ty::Ptr(box ty::Literal(ty::Path::new(vec!("js","jsapi","JSTracer"))), ty::Raw(ast::MutMutable))), ret_ty: ty::nil_ty(), - attributes: vec![quote_attr!(cx, #[inline(always)])], + attributes: vec![quote_attr!(cx, #[inline])], is_unsafe: false, combine_substructure: combine_substructure(box jstraceable_substructure) } diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 9f965a9c7e83..5d80ad366c35 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1887,7 +1887,7 @@ def _template(self): def _decorators(self): decorators = [] if self.alwaysInline: - decorators.append('#[inline(always)]') + decorators.append('#[inline]') if self.extern: decorators.append('unsafe') @@ -5478,7 +5478,7 @@ def InheritTypes(config): cast = [CGGeneric(string.Template("""\ pub struct ${name}Cast; impl ${name}Cast { - #[inline(always)] + #[inline] pub fn to_ref<'a, T: ${toBound}+Reflectable>(base: JSRef<'a, T>) -> Option> { match base.${checkFn}() { true => Some(unsafe { mem::transmute(base) }), @@ -5486,7 +5486,7 @@ def InheritTypes(config): } } - #[inline(always)] + #[inline] pub fn to_borrowed_ref<'a, 'b, T: ${toBound}+Reflectable>(base: &'a JSRef<'b, T>) -> Option<&'a JSRef<'b, ${name}>> { match base.${checkFn}() { true => Some(unsafe { mem::transmute(base) }), @@ -5494,7 +5494,7 @@ def InheritTypes(config): } } - #[inline(always)] + #[inline] #[allow(unrooted_must_root)] pub fn to_layout_js(base: &LayoutJS) -> Option> { unsafe { @@ -5505,7 +5505,7 @@ def InheritTypes(config): } } - #[inline(always)] + #[inline] pub fn to_temporary(base: Temporary) -> Option> { match base.root().r().${checkFn}() { true => Some(unsafe { mem::transmute(base) }), @@ -5513,28 +5513,28 @@ def InheritTypes(config): } } - #[inline(always)] + #[inline] pub fn from_ref<'a, T: ${fromBound}+Reflectable>(derived: JSRef<'a, T>) -> JSRef<'a, ${name}> { unsafe { mem::transmute(derived) } } - #[inline(always)] + #[inline] pub fn from_borrowed_ref<'a, 'b, T: ${fromBound}+Reflectable>(derived: &'a JSRef<'b, T>) -> &'a JSRef<'b, ${name}> { unsafe { mem::transmute(derived) } } - #[inline(always)] + #[inline] #[allow(unrooted_must_root)] pub fn from_layout_js(derived: &LayoutJS) -> LayoutJS<${name}> { unsafe { mem::transmute_copy(derived) } } - #[inline(always)] + #[inline] pub fn from_temporary(derived: Temporary) -> Temporary<${name}> { unsafe { mem::transmute(derived) } } - #[inline(always)] + #[inline] pub fn from_actual<'a, T: ${fromBound}+Reflectable>(derived: &'a T) -> &'a ${name} { unsafe { mem::transmute(derived) } }